mirror of
https://github.com/google/blockly.git
synced 2026-01-08 17:40:09 +01:00
* fix: convert files to typescript * fix: add alias for AnyDuringMigration so that tsc will run * chore: format * chore: enable ts for the clang-format workflow (#6233) * chore: Restore @fileoverview comment locations (#6237) * chore: add declareModuleId (#6238) * fix: Revert comment change to app_controller.js (#6241) * fix: Add missing import goog statements (#6240) I've added the import statement immediately before the goog.declareModuleId calls that depend on it. There is an argument to be made that we should put the import statement in their normal place amongst any other imports, and move the declareModuleId statement to below the double blank line below the imports, but as these are so tightly coupled, replace the previous goog.module calls, and will both be deleted at the same time once the transition to TypeScript is fully complete I think it's fine (and certainly much easier) to do it this way. * chore: Fix whitespace (#6243) * fix: Remove spurious blank lines Remove extraneous blank lines introduced by deletion of 'use strict'; pragmas. Also fix the location of the goog.declareModuleId call in core/utils/array.ts. * fix: Add missing double-blank-line before body of modules Our convention is to have two blank lines between the imports (or module ID, if there are no imports) and the beginning of the body of the module. Enforce this. * fix: one addition format error for PR #6243 * fix(build): Skip npm prepare when running in CI (#6244) Have npm prepare do nothing when running in CI. We don't need to do any building, because npm test will build everything needed in the workflows in which it is run, and we don't want to build anything in other workflows because a tsc error would prevent those workflows from completing. * fix: re-add `@package` annotations as `@internal` annotations (#6232) * fix: add ~70% of internal attributes * fix: work on manually adding more @internal annotations * fix: add more manual internal annotations * fix: rename package typos to internal * fix: final manual fixes for internal annotations * chore: format * chore: make unnecessary multiline jsdoc a single line * fix: fix internal tags in serialization exceptions * fix: tsc errors picked up from develop (#6224) * fix: relative path for deprecation utils * fix: checking if properties exist in svg_math * fix: set all timeout PIDs to AnyDuringMigration * fix: make nullability errors explicity in block drag surface * fix: make null check in events_block_change explicit * fix: make getEventWorkspace_ internal so we can access it from CommentCreateDeleteHelper * fix: rename DIV -> containerDiv in tooltip * fix: ignore backwards compat check in category * fix: set block styles to AnyDuringMigration * fix: type typo in KeyboardShortcut * fix: constants name in row measurables * fix: typecast in mutator * fix: populateProcedures type of flattened array * fix: ignore errors related to workspace comment deserialization * chore: format files * fix: renaming imports missing file extensions * fix: remove check for sound.play * fix: temporarily remove bad requireType. All `export type` statements are stripped when tsc is run. This means that when we attempt to require BlockDefinition from the block files, we get an error because it does not exist. We decided to temporarily remove the require, because this will no longer be a problem when we conver the blocks to typescript, and everything gets compiled together. * fix: bad jsdoc in array * fix: silence missing property errors Closure was complaining about inexistant properties, but they actually do exist, they're just not being transpiled by tsc in a way that closure understands. I.E. if things are initialized in a function called by the constructor, rather than in a class field or in the custructor itself, closure would error. It would also error on enums, because they are transpiled to a weird IIFE. * fix: context menu action handler not knowing the type of this. this: TypeX information gets stripped when tsc is run, so closure could not know that this was not global. Fixed this by reorganizing to use the option object directly instead of passing it to onAction to be bound to this. * fix: readd getDeveloperVars checks (should not be part of migration) This was found because ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE was no longer being accessed. * fix: silence closure errors about overriding supertype props We propertly define the overrides in typescript, but these get removed from the compiled output, so closure doesn't know they exist. * fix: silence globalThis errors this: TypeX annotations get stripped from the compiled output, so closure can't know that we're accessing the correct things. However, typescript makes sure that this always has the correct properties, so silencing this should be fine. * fix: bad jsdoc name * chore: attempt compiling with blockly.js * fix: attempt moving the import statement above the namespace line * chore: add todo comments to block def files * chore: remove todo from context menu * chore: add comments abotu disabled errors * chore: move comments back to their correct positions (#6249) * fix: work on fixing comments * chore: finish moving all comments * chore: format * chore: move some other messed up comments * chore: format * fix: Correct enum formatting, use merged `namespace`s for types that are class static members (#6246) * fix: formatting of enum KeyCodes * fix: Use merged namespace for ContextMenuRegistry static types - Create a namespace to be merged with the ContextMenuRegistry class containing the types that were formerly declared as static properties on that class. - Use type aliases to export them individually as well, for compatibility with the changes made by MigranTS (and/or @gonfunko) to how other modules in core/ now import these types. - Update renamings.json5 to reflect the availability of the direct exports for modules that import this module directly (though they are not available to, and will not be used by, code that imports only via blockly.js/blockly.ts.) * fix: Use merged namespace for Input.Align - Create a merged namespace for the Input.Align enum. - Use type/const aliases to export it as Input too. - Update renamings.json5 to reflect the availability of the direct export. * fix: Use merged namespace for Names.NameType - Create a merged namespace for the Names.NameType enum. - Use type/const aliases to export it as NameType too. - Update renamings.json5 to reflect the availability of the direct export. (This ought to have happened in an earlier version as it was already available by both routes.) * chore: Fix minor issues for PR #6246 - Use `Align` instead of `Input.Align` where possible. * fix(build): Suppress irrelevant JSC_UNUSED_LOCAL_ASSIGNMENT errors tsc generates code for merged namespaces that looks like: (function (ClassName) { let EnumName; (function (EnumName) { EnumName[EnumNameAlign["v1"] = 0] = "v1"; // etc. })(EnumName = ClassName.EnumName || (ClassName.EnumName = {})); })(ClassName || (ClassName = {})); and Closure Compiler complains about the fact that the EnumName let binding is initialised but never used. (It exists so that any other code that was in the namespace could see the enum.) Suppress this message, since it is not actionable and lint and/or tsc should tell us if we have actual unused variables in our .ts files. * chore(build): Suppress spurious warnings from closure-make-deps (#6253) A little bit of an ugly hack, but it works: pipe stderr through grep -v to suppress error output starting with "WARNING in". * fix: remaining enums that weren't properly exported (#6251) * fix: remaining enums that weren't properly exported * chore: format * fix: add enum value exports * chore: format * fix: properly export interfaces that were typedefs (#6250) * fix: properly export interfaces that were typedefs * fix: allowCollsion -> allowCollision * fix: convert unconverted enums * fix: enums that were/are instance properties * fix: revert changes to property enums * fix: renamed protected parameter properties (#6252) * fix: bad protected parameter properties * chore:format * fix: gesture constructor * fix: overridden properties that were renamed * refactor: Migrate `blockly.js` to TypeScript (#6261) * chore: Apply changes to blockly.js to blockly.ts * fix: Build using core/blockly.ts instead of .js Compiles and runs in compressed mode correctly! * fix(build): Don't depend on execSync running bash (#6262) For some reason on Github CI servers execSync uses /bin/sh, which is (on Ubuntu) dash rather than bash, and does not understand the pipefail option. So remove the grep pipe on stderr and just discard all error output at all. This is not ideal as errors in test deps will go unreported AND not even cause test failure, but it's not clear that it's worth investing more time to fix this at the moment. * chore: use `import type` where possible (#6279) * chore: automatically change imports to import types * chore: revert changes that actually need to be imports * chore: format * chore: add more import type statements based on importsNotUsedAsValues * chore: fix tsconfig * chore: add link to compiler issue * fix: add type information to blockly options (#6283) * fix: add type information to blockly options * chore: format * chore: remove erroneous comment * fix: bugs revealed by getting the built output working (#6282) * fix: types of compose and decompose in block * fix: workspace naming in toolbox * chore: add jsdoc * chore: restore registry comments to better positions * chore: pr comments' * fix(variables): Revert inadvertent change to allDeveloperVariables (#6290) It appears that a function call got modified incorrectly (probably in an effort to fix a typing issue). This fix trivially reverts the line in question to match the original JS version from develop. This causes the generator tests to pass. * fix: circular dependencies (#6281) * chore: fix circular dependencies w/ static workspace funcs * remove preserved imports that aren't currently necessary (probably) * fix circular dependency with workspaces and block using stub * fix dependency between variables and xml by moving function to utils * add stub for trashcan as well * fix line endings from rebase * fix goog/base order * add trashcan patch * fix: types of compose and decompose in block * fix: workspace naming in toolbox * chore: add jsdoc * chore: restore registry comments to better positions * chore: remove implementations in goog.js * chore: fix types of stubs * chore: remove added AnyDuringMigration casts * chore: remove modifications to xml and variables * chore: format * chore: remove event requirements in workspace comments * chore: fix circular dependency with xml and workspace comments * fixup remove ContextMenu import * chore: fix dependency between mutator and workspace * chore: break circular dependency between names and procedures * chore: get tests to run? * chore: pr comments' * chore: fix stubbing field registry fromJson * chore: fix spying on fire * chore: fix stubbing parts of connection checker * chore: fix stubbing dialog * chore: fix stubbing style * chore: fix spying on duplicate * chore: fix stubbing variables * chore: fix stubbing copy * chore: fix stubbing in workspace * chore: remove unnecessary stubs * chore: fix formatting * chore: fix other formatting * chore: add backwards compatible static properties to workspace * chore: move static type properties * chore: move and comment stubs * chore: add newlines at EOF * chore: improve errors for monkey patched functions * chore: update comment with a pointer to the doc * chore: update comment with a pointer to the doc * chore: format * chore: revert changes to playground used for testing (#6292) * chore: get mocha tests to pass. (#6291) * chore: fix undo and empty code blocks * chore: skip IE test * chore: fix gesture test * chore: fix replace message references test * chore: fix string table interpolation * chore: skip getById tests * chore: fix field tests * chore: fix console errors by making workspace nullable * chore: format * chore: fix definition overwrite warning * chore: update metadata * chore: temporarily modify the the advanced compile test * chore: fix gestures by fixing test instead Co-authored-by: Neil Fraser <fraser@google.com> Co-authored-by: Christopher Allen <cpcallen+git@google.com>
561 lines
19 KiB
TypeScript
561 lines
19 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2012 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Object representing a mutator dialog. A mutator allows the
|
|
* user to change the shape of a block using a nested blocks editor.
|
|
*/
|
|
|
|
/**
|
|
* Object representing a mutator dialog. A mutator allows the
|
|
* user to change the shape of a block using a nested blocks editor.
|
|
* @class
|
|
*/
|
|
import * as goog from '../closure/goog/goog.js';
|
|
goog.declareModuleId('Blockly.Mutator');
|
|
|
|
// Unused import preserved for side-effects. Remove if unneeded.
|
|
import './events/events_bubble_open.js';
|
|
|
|
import type {Block} from './block.js';
|
|
import type {BlockSvg} from './block_svg.js';
|
|
import type {BlocklyOptions} from './blockly_options.js';
|
|
import {Bubble} from './bubble.js';
|
|
import {config} from './config.js';
|
|
import type {Connection} from './connection.js';
|
|
import type {Abstract} from './events/events_abstract.js';
|
|
import {BlockChange} from './events/events_block_change.js';
|
|
import * as eventUtils from './events/utils.js';
|
|
import {Icon} from './icon.js';
|
|
import {Options} from './options.js';
|
|
import type {Coordinate} from './utils/coordinate.js';
|
|
import * as dom from './utils/dom.js';
|
|
import {Svg} from './utils/svg.js';
|
|
import * as toolbox from './utils/toolbox.js';
|
|
import * as xml from './utils/xml.js';
|
|
import type {WorkspaceSvg} from './workspace_svg.js';
|
|
|
|
|
|
/**
|
|
* Class for a mutator dialog.
|
|
* @alias Blockly.Mutator
|
|
*/
|
|
export class Mutator extends Icon {
|
|
quarkNames_: AnyDuringMigration;
|
|
|
|
/** Workspace in the mutator's bubble. */
|
|
private workspace_: WorkspaceSvg|null = null;
|
|
|
|
/** Width of workspace. */
|
|
private workspaceWidth_ = 0;
|
|
|
|
/** Height of workspace. */
|
|
private workspaceHeight_ = 0;
|
|
|
|
/**
|
|
* The SVG element that is the parent of the mutator workspace, or null if
|
|
* not created.
|
|
*/
|
|
private svgDialog_: SVGSVGElement|null = null;
|
|
|
|
/**
|
|
* The root block of the mutator workspace, created by decomposing the
|
|
* source block.
|
|
*/
|
|
private rootBlock_: BlockSvg|null = null;
|
|
|
|
/**
|
|
* Function registered on the main workspace to update the mutator contents
|
|
* when the main workspace changes.
|
|
*/
|
|
private sourceListener_: Function|null = null;
|
|
|
|
/**
|
|
* The PID associated with the updateWorkpace_ timeout, or 0 if no timeout
|
|
* is currently running.
|
|
*/
|
|
private updateWorkspacePid_: AnyDuringMigration = 0;
|
|
|
|
/** @param quarkNames List of names of sub-blocks for flyout. */
|
|
constructor(block: BlockSvg, quarkNames: string[]) {
|
|
super(block);
|
|
this.quarkNames_ = quarkNames;
|
|
}
|
|
|
|
/**
|
|
* Set the block this mutator is associated with.
|
|
* @param block The block associated with this mutator.
|
|
* @internal
|
|
*/
|
|
setBlock(block: BlockSvg) {
|
|
this.block_ = block;
|
|
}
|
|
|
|
/**
|
|
* Returns the workspace inside this mutator icon's bubble.
|
|
* @return The workspace inside this mutator icon's bubble or null if the
|
|
* mutator isn't open.
|
|
* @internal
|
|
*/
|
|
getWorkspace(): WorkspaceSvg|null {
|
|
return this.workspace_;
|
|
}
|
|
|
|
/**
|
|
* Draw the mutator icon.
|
|
* @param group The icon group.
|
|
*/
|
|
protected override drawIcon_(group: Element) {
|
|
// Square with rounded corners.
|
|
dom.createSvgElement(
|
|
Svg.RECT, {
|
|
'class': 'blocklyIconShape',
|
|
'rx': '4',
|
|
'ry': '4',
|
|
'height': '16',
|
|
'width': '16',
|
|
},
|
|
group);
|
|
// Gear teeth.
|
|
dom.createSvgElement(
|
|
Svg.PATH, {
|
|
'class': 'blocklyIconSymbol',
|
|
'd': 'm4.203,7.296 0,1.368 -0.92,0.677 -0.11,0.41 0.9,1.559 0.41,' +
|
|
'0.11 1.043,-0.457 1.187,0.683 0.127,1.134 0.3,0.3 1.8,0 0.3,' +
|
|
'-0.299 0.127,-1.138 1.185,-0.682 1.046,0.458 0.409,-0.11 0.9,' +
|
|
'-1.559 -0.11,-0.41 -0.92,-0.677 0,-1.366 0.92,-0.677 0.11,' +
|
|
'-0.41 -0.9,-1.559 -0.409,-0.109 -1.046,0.458 -1.185,-0.682 ' +
|
|
'-0.127,-1.138 -0.3,-0.299 -1.8,0 -0.3,0.3 -0.126,1.135 -1.187,' +
|
|
'0.682 -1.043,-0.457 -0.41,0.11 -0.899,1.559 0.108,0.409z',
|
|
},
|
|
group);
|
|
// Axle hole.
|
|
dom.createSvgElement(
|
|
Svg.CIRCLE,
|
|
{'class': 'blocklyIconShape', 'r': '2.7', 'cx': '8', 'cy': '8'}, group);
|
|
}
|
|
|
|
/**
|
|
* Clicking on the icon toggles if the mutator bubble is visible.
|
|
* Disable if block is uneditable.
|
|
* @param e Mouse click event.
|
|
*/
|
|
protected override iconClick_(e: Event) {
|
|
if (this.block_.isEditable()) {
|
|
super.iconClick_(e);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Create the editor for the mutator's bubble.
|
|
* @return The top-level node of the editor.
|
|
*/
|
|
private createEditor_(): SVGElement {
|
|
/* Create the editor. Here's the markup that will be generated:
|
|
<svg>
|
|
[Workspace]
|
|
</svg>
|
|
*/
|
|
this.svgDialog_ = dom.createSvgElement(
|
|
Svg.SVG, {'x': Bubble.BORDER_WIDTH, 'y': Bubble.BORDER_WIDTH});
|
|
// Convert the list of names into a list of XML objects for the flyout.
|
|
let quarkXml;
|
|
if (this.quarkNames_.length) {
|
|
quarkXml = xml.createElement('xml');
|
|
for (let i = 0, quarkName; quarkName = this.quarkNames_[i]; i++) {
|
|
const element = xml.createElement('block');
|
|
element.setAttribute('type', quarkName);
|
|
quarkXml.appendChild(element);
|
|
}
|
|
} else {
|
|
quarkXml = null;
|
|
}
|
|
const workspaceOptions = new Options(({
|
|
// If you want to enable disabling, also remove the
|
|
// event filter from workspaceChanged_ .
|
|
'disable': false,
|
|
'parentWorkspace': this.block_.workspace,
|
|
'media': this.block_.workspace!.options.pathToMedia,
|
|
'rtl': this.block_.RTL,
|
|
'horizontalLayout': false,
|
|
'renderer': this.block_.workspace!.options.renderer,
|
|
'rendererOverrides': this.block_.workspace!.options.rendererOverrides,
|
|
} as BlocklyOptions));
|
|
workspaceOptions.toolboxPosition =
|
|
this.block_.RTL ? toolbox.Position.RIGHT : toolbox.Position.LEFT;
|
|
const hasFlyout = !!quarkXml;
|
|
if (hasFlyout) {
|
|
workspaceOptions.languageTree = toolbox.convertToolboxDefToJson(quarkXml);
|
|
}
|
|
this.workspace_ = this.newWorkspaceSvg(workspaceOptions);
|
|
this.workspace_.isMutator = true;
|
|
this.workspace_.addChangeListener(eventUtils.disableOrphans);
|
|
|
|
// Mutator flyouts go inside the mutator workspace's <g> rather than in
|
|
// a top level SVG. Instead of handling scale themselves, mutators
|
|
// inherit scale from the parent workspace.
|
|
// To fix this, scale needs to be applied at a different level in the DOM.
|
|
const flyoutSvg = hasFlyout ? this.workspace_.addFlyout(Svg.G) : null;
|
|
const background = this.workspace_.createDom('blocklyMutatorBackground');
|
|
|
|
if (flyoutSvg) {
|
|
// Insert the flyout after the <rect> but before the block canvas so that
|
|
// the flyout is underneath in z-order. This makes blocks layering during
|
|
// dragging work properly.
|
|
background.insertBefore(flyoutSvg, this.workspace_.svgBlockCanvas_);
|
|
}
|
|
this.svgDialog_!.appendChild(background);
|
|
|
|
// AnyDuringMigration because: Type 'SVGSVGElement | null' is not
|
|
// assignable to type 'SVGElement'.
|
|
return this.svgDialog_ as AnyDuringMigration;
|
|
}
|
|
|
|
/**
|
|
* @internal
|
|
*/
|
|
newWorkspaceSvg(options: Options): WorkspaceSvg {
|
|
throw new Error(
|
|
'The implementation of newWorkspaceSvg should be ' +
|
|
'monkey-patched in by blockly.ts');
|
|
}
|
|
|
|
/** Add or remove the UI indicating if this icon may be clicked or not. */
|
|
override updateEditable() {
|
|
super.updateEditable();
|
|
if (!this.block_.isInFlyout) {
|
|
if (this.block_.isEditable()) {
|
|
if (this.iconGroup_) {
|
|
dom.removeClass(
|
|
this.iconGroup_ as Element, 'blocklyIconGroupReadonly');
|
|
}
|
|
} else {
|
|
// Close any mutator bubble. Icon is not clickable.
|
|
this.setVisible(false);
|
|
if (this.iconGroup_) {
|
|
dom.addClass(this.iconGroup_ as Element, 'blocklyIconGroupReadonly');
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/** Resize the bubble to match the size of the workspace. */
|
|
private resizeBubble_() {
|
|
const doubleBorderWidth = 2 * Bubble.BORDER_WIDTH;
|
|
const workspaceSize = this.workspace_!.getCanvas().getBBox();
|
|
let width = workspaceSize.width + workspaceSize.x;
|
|
let height = workspaceSize.height + doubleBorderWidth * 3;
|
|
const flyout = this.workspace_!.getFlyout();
|
|
if (flyout) {
|
|
const flyoutScrollMetrics =
|
|
flyout.getWorkspace().getMetricsManager().getScrollMetrics();
|
|
height = Math.max(height, flyoutScrollMetrics.height + 20);
|
|
width += flyout.getWidth();
|
|
}
|
|
if (this.block_.RTL) {
|
|
width = -workspaceSize.x;
|
|
}
|
|
width += doubleBorderWidth * 3;
|
|
// Only resize if the size difference is significant. Eliminates
|
|
// shuddering.
|
|
if (Math.abs(this.workspaceWidth_ - width) > doubleBorderWidth ||
|
|
Math.abs(this.workspaceHeight_ - height) > doubleBorderWidth) {
|
|
// Record some layout information for workspace metrics.
|
|
this.workspaceWidth_ = width;
|
|
this.workspaceHeight_ = height;
|
|
// Resize the bubble.
|
|
this.bubble_!.setBubbleSize(
|
|
width + doubleBorderWidth, height + doubleBorderWidth);
|
|
// AnyDuringMigration because: Argument of type 'number' is not
|
|
// assignable to parameter of type 'string'.
|
|
this.svgDialog_!.setAttribute(
|
|
'width', this.workspaceWidth_ as AnyDuringMigration);
|
|
// AnyDuringMigration because: Argument of type 'number' is not
|
|
// assignable to parameter of type 'string'.
|
|
this.svgDialog_!.setAttribute(
|
|
'height', this.workspaceHeight_ as AnyDuringMigration);
|
|
this.workspace_!.setCachedParentSvgSize(
|
|
this.workspaceWidth_, this.workspaceHeight_);
|
|
}
|
|
|
|
if (this.block_.RTL) {
|
|
// Scroll the workspace to always left-align.
|
|
const translation = 'translate(' + this.workspaceWidth_ + ',0)';
|
|
this.workspace_!.getCanvas().setAttribute('transform', translation);
|
|
}
|
|
this.workspace_!.resize();
|
|
}
|
|
|
|
/** A method handler for when the bubble is moved. */
|
|
private onBubbleMove_() {
|
|
if (this.workspace_) {
|
|
this.workspace_.recordDragTargets();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Show or hide the mutator bubble.
|
|
* @param visible True if the bubble should be visible.
|
|
*/
|
|
override setVisible(visible: boolean) {
|
|
if (visible === this.isVisible()) {
|
|
// No change.
|
|
return;
|
|
}
|
|
eventUtils.fire(new (eventUtils.get(eventUtils.BUBBLE_OPEN))!
|
|
(this.block_, visible, 'mutator'));
|
|
if (visible) {
|
|
// Create the bubble.
|
|
this.bubble_ = new Bubble(
|
|
(this.block_.workspace as WorkspaceSvg), this.createEditor_(),
|
|
this.block_.pathObject.svgPath, (this.iconXY_ as Coordinate), null,
|
|
null);
|
|
// Expose this mutator's block's ID on its top-level SVG group.
|
|
this.bubble_.setSvgId(this.block_.id);
|
|
this.bubble_.registerMoveEvent(this.onBubbleMove_.bind(this));
|
|
const tree = this.workspace_!.options.languageTree;
|
|
const flyout = this.workspace_!.getFlyout();
|
|
if (tree) {
|
|
flyout!.init(this.workspace_);
|
|
flyout!.show(tree);
|
|
}
|
|
|
|
this.rootBlock_ = this.block_!.decompose!(this.workspace_!)!;
|
|
const blocks = this.rootBlock_!.getDescendants(false);
|
|
for (let i = 0, child; child = blocks[i]; i++) {
|
|
child.render();
|
|
}
|
|
// The root block should not be draggable or deletable.
|
|
this.rootBlock_!.setMovable(false);
|
|
this.rootBlock_!.setDeletable(false);
|
|
let margin;
|
|
let x;
|
|
if (flyout) {
|
|
margin = flyout.CORNER_RADIUS * 2;
|
|
x = this.rootBlock_!.RTL ? flyout.getWidth() + margin : margin;
|
|
} else {
|
|
margin = 16;
|
|
x = margin;
|
|
}
|
|
if (this.block_.RTL) {
|
|
x = -x;
|
|
}
|
|
this.rootBlock_!.moveBy(x, margin);
|
|
// Save the initial connections, then listen for further changes.
|
|
if (this.block_.saveConnections) {
|
|
const thisRootBlock = this.rootBlock_;
|
|
this.block_.saveConnections(thisRootBlock);
|
|
this.sourceListener_ = () => {
|
|
if (this.block_ && this.block_.saveConnections) {
|
|
this.block_.saveConnections(thisRootBlock);
|
|
}
|
|
};
|
|
this.block_.workspace!.addChangeListener(this.sourceListener_);
|
|
}
|
|
this.resizeBubble_();
|
|
// When the mutator's workspace changes, update the source block.
|
|
this.workspace_!.addChangeListener(this.workspaceChanged_.bind(this));
|
|
// Update the source block immediately after the bubble becomes visible.
|
|
this.updateWorkspace_();
|
|
this.applyColour();
|
|
} else {
|
|
// Dispose of the bubble.
|
|
this.svgDialog_ = null;
|
|
this.workspace_!.dispose();
|
|
this.workspace_ = null;
|
|
this.rootBlock_ = null;
|
|
this.bubble_?.dispose();
|
|
this.bubble_ = null;
|
|
this.workspaceWidth_ = 0;
|
|
this.workspaceHeight_ = 0;
|
|
if (this.sourceListener_) {
|
|
this.block_.workspace!.removeChangeListener(this.sourceListener_);
|
|
this.sourceListener_ = null;
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Fired whenever a change is made to the mutator's workspace.
|
|
* @param e Custom data for event.
|
|
*/
|
|
private workspaceChanged_(e: Abstract) {
|
|
if (!this.shouldIgnoreMutatorEvent_(e) && !this.updateWorkspacePid_) {
|
|
this.updateWorkspacePid_ = setTimeout(() => {
|
|
this.updateWorkspacePid_ = 0;
|
|
this.updateWorkspace_();
|
|
}, 0);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns whether the given event in the mutator workspace should be ignored
|
|
* when deciding whether to update the workspace and compose the block or not.
|
|
* @param e The event.
|
|
* @return Whether to ignore the event or not.
|
|
*/
|
|
shouldIgnoreMutatorEvent_(e: Abstract) {
|
|
return e.isUiEvent || e.type === eventUtils.CREATE ||
|
|
e.type === eventUtils.CHANGE &&
|
|
(e as BlockChange).element === 'disabled';
|
|
}
|
|
|
|
/**
|
|
* Updates the source block when the mutator's blocks are changed.
|
|
* Bump down any block that's too high.
|
|
*/
|
|
private updateWorkspace_() {
|
|
if (!this.workspace_!.isDragging()) {
|
|
const blocks = this.workspace_!.getTopBlocks(false);
|
|
const MARGIN = 20;
|
|
|
|
for (let b = 0, block; block = blocks[b]; b++) {
|
|
const blockXY = block.getRelativeToSurfaceXY();
|
|
|
|
// Bump any block that's above the top back inside.
|
|
if (blockXY.y < MARGIN) {
|
|
block.moveBy(0, MARGIN - blockXY.y);
|
|
}
|
|
// Bump any block overlapping the flyout back inside.
|
|
if (block.RTL) {
|
|
let right = -MARGIN;
|
|
const flyout = this.workspace_!.getFlyout();
|
|
if (flyout) {
|
|
right -= flyout.getWidth();
|
|
}
|
|
if (blockXY.x > right) {
|
|
block.moveBy(right - blockXY.x, 0);
|
|
}
|
|
} else if (blockXY.x < MARGIN) {
|
|
block.moveBy(MARGIN - blockXY.x, 0);
|
|
}
|
|
}
|
|
}
|
|
|
|
// When the mutator's workspace changes, update the source block.
|
|
if (this.rootBlock_ && this.rootBlock_.workspace === this.workspace_) {
|
|
const existingGroup = eventUtils.getGroup();
|
|
if (!existingGroup) {
|
|
eventUtils.setGroup(true);
|
|
}
|
|
const block = this.block_ as BlockSvg;
|
|
const oldExtraState = BlockChange.getExtraBlockState_(block);
|
|
|
|
// Switch off rendering while the source block is rebuilt.
|
|
const savedRendered = block.rendered;
|
|
// TODO(#4288): We should not be setting the rendered property to false.
|
|
block.rendered = false;
|
|
|
|
// Allow the source block to rebuild itself.
|
|
block.compose!(this.rootBlock_);
|
|
// Restore rendering and show the changes.
|
|
block.rendered = savedRendered;
|
|
// Mutation may have added some elements that need initializing.
|
|
block.initSvg();
|
|
|
|
if (block.rendered) {
|
|
block.render();
|
|
}
|
|
|
|
const newExtraState = BlockChange.getExtraBlockState_(block);
|
|
if (oldExtraState !== newExtraState) {
|
|
eventUtils.fire(new (eventUtils.get(eventUtils.BLOCK_CHANGE))!(
|
|
block, 'mutation', null, oldExtraState, newExtraState));
|
|
// Ensure that any bump is part of this mutation's event group.
|
|
const mutationGroup = eventUtils.getGroup();
|
|
setTimeout(function() {
|
|
const oldGroup = eventUtils.getGroup();
|
|
eventUtils.setGroup(mutationGroup);
|
|
block.bumpNeighbours();
|
|
eventUtils.setGroup(oldGroup);
|
|
}, config.bumpDelay);
|
|
}
|
|
|
|
// Don't update the bubble until the drag has ended, to avoid moving
|
|
// blocks under the cursor.
|
|
if (!this.workspace_!.isDragging()) {
|
|
setTimeout(() => this.resizeBubble_(), 0);
|
|
}
|
|
eventUtils.setGroup(existingGroup);
|
|
}
|
|
}
|
|
|
|
/** Dispose of this mutator. */
|
|
override dispose() {
|
|
this.block_.mutator = null;
|
|
super.dispose();
|
|
}
|
|
|
|
/** Update the styles on all blocks in the mutator. */
|
|
updateBlockStyle() {
|
|
const ws = this.workspace_;
|
|
|
|
if (ws && ws.getAllBlocks(false)) {
|
|
const workspaceBlocks = ws.getAllBlocks(false);
|
|
for (let i = 0, block; block = workspaceBlocks[i]; i++) {
|
|
block.setStyle(block.getStyleName());
|
|
}
|
|
|
|
const flyout = ws.getFlyout();
|
|
if (flyout) {
|
|
const flyoutBlocks = flyout.getWorkspace().getAllBlocks(false);
|
|
for (let i = 0, block; block = flyoutBlocks[i]; i++) {
|
|
block.setStyle(block.getStyleName());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Reconnect an block to a mutated input.
|
|
* @param connectionChild Connection on child block.
|
|
* @param block Parent block.
|
|
* @param inputName Name of input on parent block.
|
|
* @return True iff a reconnection was made, false otherwise.
|
|
*/
|
|
static reconnect(
|
|
connectionChild: Connection, block: Block, inputName: string): boolean {
|
|
if (!connectionChild || !connectionChild.getSourceBlock().workspace) {
|
|
return false; // No connection or block has been deleted.
|
|
}
|
|
const connectionParent = block.getInput(inputName)!.connection;
|
|
const currentParent = connectionChild.targetBlock();
|
|
if ((!currentParent || currentParent === block) && connectionParent &&
|
|
connectionParent.targetConnection !== connectionChild) {
|
|
if (connectionParent.isConnected()) {
|
|
// There's already something connected here. Get rid of it.
|
|
connectionParent.disconnect();
|
|
}
|
|
connectionParent.connect(connectionChild);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Get the parent workspace of a workspace that is inside a mutator, taking
|
|
* into account whether it is a flyout.
|
|
* @param workspace The workspace that is inside a mutator.
|
|
* @return The mutator's parent workspace or null.
|
|
*/
|
|
static findParentWs(workspace: WorkspaceSvg): WorkspaceSvg|null {
|
|
let outerWs = null;
|
|
if (workspace && workspace.options) {
|
|
const parent = workspace.options.parentWorkspace;
|
|
// If we were in a flyout in a mutator, need to go up two levels to find
|
|
// the actual parent.
|
|
if (workspace.isFlyout) {
|
|
if (parent && parent.options) {
|
|
outerWs = parent.options.parentWorkspace;
|
|
}
|
|
} else if (parent) {
|
|
outerWs = parent;
|
|
}
|
|
}
|
|
return outerWs;
|
|
}
|
|
}
|