blockly 8.0.4-beta.0 → 8.0.5-beta.0

package/core/renderers/measurables/in_row_spacer.js

@@ -1,47 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Objects representing a spacer in a row of a rendered
- * block.
- */
-
-/**
- * Objects representing a spacer in a row of a rendered
- * block.
- * @class
- */
-goog.module('Blockly.blockRendering.InRowSpacer');
-
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-const {Measurable} = goog.require('Blockly.blockRendering.Measurable');
-const {Types} = goog.require('Blockly.blockRendering.Types');
-
-
-/**
- * An object containing information about a spacer between two elements on a
- * row.
- * @extends {Measurable}
- * @struct
- * @alias Blockly.blockRendering.InRowSpacer
- */
-class InRowSpacer extends Measurable {
-  /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @param {number} width The width of the spacer.
-   * @package
-   */
-  constructor(constants, width) {
-    super(constants);
-    this.type |= Types.SPACER | Types.IN_ROW_SPACER;
-    this.width = width;
-    this.height = this.constants_.SPACER_DEFAULT_HEIGHT;
-  }
-}
-
-exports.InRowSpacer = InRowSpacer;

package/core/renderers/measurables/input_connection.js

@@ -1,75 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Class representing inputs with connections on a rendered block.
- */
-
-/**
- * Class representing inputs with connections on a rendered block.
- * @class
- */
-goog.module('Blockly.blockRendering.InputConnection');
-
-/* eslint-disable-next-line no-unused-vars */
-const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
-const {Connection} = goog.require('Blockly.blockRendering.Connection');
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-/* eslint-disable-next-line no-unused-vars */
-const {Input} = goog.requireType('Blockly.Input');
-/* eslint-disable-next-line no-unused-vars */
-const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection');
-const {Types} = goog.require('Blockly.blockRendering.Types');
-
-
-/**
- * The base class to represent an input that takes up space on a block
- * during rendering
- * @package
- * @extends {Connection}
- * @alias Blockly.blockRendering.InputConnection
- */
-class InputConnection extends Connection {
-  /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @param {!Input} input The input to measure and store information for.
-   */
-  constructor(constants, input) {
-    super(constants, /** @type {!RenderedConnection} */ (input.connection));
-
-    this.type |= Types.INPUT;
-
-    /** @type {!Input} */
-    this.input = input;
-
-    /** @type {number} */
-    this.align = input.align;
-
-    /** @type {BlockSvg} */
-    this.connectedBlock = input.connection && input.connection.targetBlock() ?
-        /** @type {BlockSvg} */ (input.connection.targetBlock()) :
-        null;
-
-    if (this.connectedBlock) {
-      const bBox = this.connectedBlock.getHeightWidth();
-      this.connectedBlockWidth = bBox.width;
-      this.connectedBlockHeight = bBox.height;
-    } else {
-      this.connectedBlockWidth = 0;
-      this.connectedBlockHeight = 0;
-    }
-
-    /** @type {number} */
-    this.connectionOffsetX = 0;
-
-    /** @type {number} */
-    this.connectionOffsetY = 0;
-  }
-}
-
-exports.InputConnection = InputConnection;

package/core/renderers/measurables/next_connection.js

@@ -1,50 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Class representing the space a next connection takes up during
- * rendering.
- */
-
-/**
- * Class representing the space a next connection takes up during
- * rendering.
- * @class
- */
-goog.module('Blockly.blockRendering.NextConnection');
-
-const {Connection} = goog.require('Blockly.blockRendering.Connection');
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-/* eslint-disable-next-line no-unused-vars */
-const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection');
-const {Types} = goog.require('Blockly.blockRendering.Types');
-
-
-/**
- * An object containing information about the space a next connection takes
- * up during rendering.
- * @extends {Connection}
- * @struct
- * @alias Blockly.blockRendering.NextConnection
- */
-class NextConnection extends Connection {
-  /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @param {!RenderedConnection} connectionModel The connection object on
-   *     the block that this represents.
-   * @package
-   */
-  constructor(constants, connectionModel) {
-    super(constants, connectionModel);
-    this.type |= Types.NEXT_CONNECTION;
-    this.height = this.shape.height;
-    this.width = this.shape.width;
-  }
-}
-
-exports.NextConnection = NextConnection;

package/core/renderers/measurables/output_connection.js

@@ -1,61 +0,0 @@
-
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Class representing the space a output connection takes up
- * during rendering.
- */
-
-/**
- * Class representing the space a output connection takes up
- * during rendering.
- * @class
- */
-goog.module('Blockly.blockRendering.OutputConnection');
-
-const {Connection} = goog.require('Blockly.blockRendering.Connection');
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-/* eslint-disable-next-line no-unused-vars */
-const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection');
-const {Types} = goog.require('Blockly.blockRendering.Types');
-
-
-/**
- * An object containing information about the space an output connection takes
- * up during rendering.
- * @extends {Connection}
- * @struct
- * @alias Blockly.blockRendering.OutputConnection
- */
-class OutputConnection extends Connection {
-  /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @param {!RenderedConnection} connectionModel The connection object on
-   *     the block that this represents.
-   * @package
-   */
-  constructor(constants, connectionModel) {
-    super(constants, connectionModel);
-    this.type |= Types.OUTPUT_CONNECTION;
-
-    this.height = !this.isDynamicShape ? this.shape.height : 0;
-    this.width = !this.isDynamicShape ? this.shape.width : 0;
-
-    /** @type {number} */
-    this.startX = this.width;
-
-    /** @type {number} */
-    this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
-
-    /** @type {number} */
-    this.connectionOffsetX = 0;
-  }
-}
-
-exports.OutputConnection = OutputConnection;

package/core/renderers/measurables/previous_connection.js

@@ -1,50 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Class representing the space a previous connection takes up
- * during rendering.
- */
-
-/**
- * Class representing the space a previous connection takes up
- * during rendering.
- * @class
- */
-goog.module('Blockly.blockRendering.PreviousConnection');
-
-const {Connection} = goog.require('Blockly.blockRendering.Connection');
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-/* eslint-disable-next-line no-unused-vars */
-const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection');
-const {Types} = goog.require('Blockly.blockRendering.Types');
-
-
-/**
- * An object containing information about the space a previous connection takes
- * up during rendering.
- * @extends {Connection}
- * @struct
- * @alias Blockly.blockRendering.PreviousConnection
- */
-class PreviousConnection extends Connection {
-  /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @param {!RenderedConnection} connectionModel The connection object on
-   *     the block that this represents.
-   * @package
-   */
-  constructor(constants, connectionModel) {
-    super(constants, connectionModel);
-    this.type |= Types.PREVIOUS_CONNECTION;
-    this.height = this.shape.height;
-    this.width = this.shape.width;
-  }
-}
-
-exports.PreviousConnection = PreviousConnection;

package/core/renderers/measurables/round_corner.js

@@ -1,52 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Objects representing a round corner in a row of a rendered
- * block.
- */
-
-/**
- * Objects representing a round corner in a row of a rendered
- * block.
- * @class
- */
-goog.module('Blockly.blockRendering.RoundCorner');
-
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-const {Measurable} = goog.require('Blockly.blockRendering.Measurable');
-const {Types} = goog.require('Blockly.blockRendering.Types');
-
-
-/**
- * An object containing information about the space a rounded corner takes up
- * during rendering.
- * @extends {Measurable}
- * @struct
- * @alias Blockly.blockRendering.RoundCorner
- */
-class RoundCorner extends Measurable {
-  /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @param {string=} opt_position The position of this corner.
-   * @package
-   */
-  constructor(constants, opt_position) {
-    super(constants);
-    this.type = ((!opt_position || opt_position === 'left') ?
-                     Types.LEFT_ROUND_CORNER :
-                     Types.RIGHT_ROUND_CORNER) |
-        Types.CORNER;
-    this.width = this.constants_.CORNER_RADIUS;
-    // The rounded corner extends into the next row by 4 so we only take the
-    // height that is aligned with this row.
-    this.height = this.constants_.CORNER_RADIUS / 2;
-  }
-}
-
-exports.RoundCorner = RoundCorner;

package/core/renderers/measurables/row.js

@@ -1,247 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Object representing a single row on a rendered block.
- */
-
-/**
- * Object representing a single row on a rendered block.
- * @class
- */
-goog.module('Blockly.blockRendering.Row');
-
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-/* eslint-disable-next-line no-unused-vars */
-const {InRowSpacer} = goog.requireType('Blockly.blockRendering.InRowSpacer');
-/* eslint-disable-next-line no-unused-vars */
-const {InputConnection} = goog.requireType('Blockly.blockRendering.InputConnection');
-/* eslint-disable-next-line no-unused-vars */
-const {Measurable} = goog.requireType('Blockly.blockRendering.Measurable');
-const {Types} = goog.require('Blockly.blockRendering.Types');
-
-
-/**
- * An object representing a single row on a rendered block and all of its
- * subcomponents.
- * @alias Blockly.blockRendering.Row
- */
-class Row {
-  /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @package
-   */
-  constructor(constants) {
-    /**
-     * The type of this rendering object.
-     * @package
-     * @type {number}
-     */
-    this.type = Types.ROW;
-
-    /**
-     * An array of elements contained in this row.
-     * @package
-     * @type {!Array<!Measurable>}
-     */
-    this.elements = [];
-
-    /**
-     * The height of the row.
-     * @package
-     * @type {number}
-     */
-    this.height = 0;
-
-    /**
-     * The width of the row, from the left edge of the block to the right.
-     * Does not include child blocks unless they are inline.
-     * @package
-     * @type {number}
-     */
-    this.width = 0;
-
-    /**
-     * The minimum height of the row.
-     * @package
-     * @type {number}
-     */
-    this.minHeight = 0;
-
-    /**
-     * The minimum width of the row, from the left edge of the block to the
-     * right. Does not include child blocks unless they are inline.
-     * @package
-     * @type {number}
-     */
-    this.minWidth = 0;
-
-    /**
-     * The width of the row, from the left edge of the block to the edge of the
-     * block or any connected child blocks.
-     * @package
-     * @type {number}
-     */
-    this.widthWithConnectedBlocks = 0;
-
-    /**
-     * The Y position of the row relative to the origin of the block's svg
-     * group.
-     * @package
-     * @type {number}
-     */
-    this.yPos = 0;
-
-    /**
-     * The X position of the row relative to the origin of the block's svg
-     * group.
-     * @package
-     * @type {number}
-     */
-    this.xPos = 0;
-
-    /**
-     * Whether the row has any external inputs.
-     * @package
-     * @type {boolean}
-     */
-    this.hasExternalInput = false;
-
-    /**
-     * Whether the row has any statement inputs.
-     * @package
-     * @type {boolean}
-     */
-    this.hasStatement = false;
-
-    /**
-     * Where the left edge of all of the statement inputs on the block should
-     * be. This makes sure that statement inputs which are proceded by fields
-     * of varius widths are all aligned.
-     * @type {number}
-     */
-    this.statementEdge = 0;
-
-    /**
-     * Whether the row has any inline inputs.
-     * @package
-     * @type {boolean}
-     */
-    this.hasInlineInput = false;
-
-    /**
-     * Whether the row has any dummy inputs.
-     * @package
-     * @type {boolean}
-     */
-    this.hasDummyInput = false;
-
-    /**
-     * Whether the row has a jagged edge.
-     * @package
-     * @type {boolean}
-     */
-    this.hasJaggedEdge = false;
-
-    /**
-     * The renderer's constant provider.
-     * @type {!ConstantProvider}
-     * @protected
-     */
-    this.constants_ = constants;
-
-    /**
-     * @type {number}
-     */
-    this.notchOffset = this.constants_.NOTCH_OFFSET_LEFT;
-
-    /**
-     * Alignment of the row.
-     * @package
-     * @type {?number}
-     */
-    this.align = null;
-  }
-
-  /**
-   * Get the last input on this row, if it has one.
-   * @return {InputConnection} The last input on the row,
-   *     or null.
-   * @package
-   */
-  getLastInput() {
-    // TODO: Consider moving this to InputRow, if possible.
-    for (let i = this.elements.length - 1; i >= 0; i--) {
-      const elem = this.elements[i];
-      if (Types.isInput(elem)) {
-        return /** @type {InputConnection} */ (elem);
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Inspect all subcomponents and populate all size properties on the row.
-   * @package
-   */
-  measure() {
-    throw Error('Unexpected attempt to measure a base Row.');
-  }
-
-  /**
-   * Determines whether this row should start with an element spacer.
-   * @return {boolean} Whether the row should start with a spacer.
-   * @package
-   */
-  startsWithElemSpacer() {
-    return true;
-  }
-
-  /**
-   * Determines whether this row should end with an element spacer.
-   * @return {boolean} Whether the row should end with a spacer.
-   * @package
-   */
-  endsWithElemSpacer() {
-    return true;
-  }
-
-  /**
-   * Convenience method to get the first spacer element on this row.
-   * @return {InRowSpacer} The first spacer element on
-   *   this row.
-   * @package
-   */
-  getFirstSpacer() {
-    for (let i = 0; i < this.elements.length; i++) {
-      const elem = this.elements[i];
-      if (Types.isSpacer(elem)) {
-        return /** @type {InRowSpacer} */ (elem);
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Convenience method to get the last spacer element on this row.
-   * @return {InRowSpacer} The last spacer element on
-   *   this row.
-   * @package
-   */
-  getLastSpacer() {
-    for (let i = this.elements.length - 1; i >= 0; i--) {
-      const elem = this.elements[i];
-      if (Types.isSpacer(elem)) {
-        return /** @type {InRowSpacer} */ (elem);
-      }
-    }
-    return null;
-  }
-}
-
-exports.Row = Row;

package/core/renderers/measurables/spacer_row.js

@@ -1,69 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Object representing a spacer between two rows.
- */
-
-/**
- * Object representing a spacer between two rows.
- * @class
- */
-goog.module('Blockly.blockRendering.SpacerRow');
-
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-const {InRowSpacer} = goog.require('Blockly.blockRendering.InRowSpacer');
-const {Row} = goog.require('Blockly.blockRendering.Row');
-const {Types} = goog.require('Blockly.blockRendering.Types');
-
-
-/**
- * An object containing information about a spacer between two rows.
- * @extends {Row}
- * @struct
- * @alias Blockly.blockRendering.SpacerRow
- */
-class SpacerRow extends Row {
-  /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @param {number} height The height of the spacer.
-   * @param {number} width The width of the spacer.
-   * @package
-   */
-  constructor(constants, height, width) {
-    super(constants);
-    this.type |= Types.SPACER | Types.BETWEEN_ROW_SPACER;
-
-    /** @type {number} */
-    this.width = width;
-
-    /** @type {number} */
-    this.height = height;
-
-    /** @type {boolean} */
-    this.followsStatement = false;
-
-    /** @type {boolean} */
-    this.precedesStatement = false;
-
-    /** @type {number} */
-    this.widthWithConnectedBlocks = 0;
-
-    /** @type {!Array.<!InRowSpacer>} */
-    this.elements = [new InRowSpacer(this.constants_, width)];
-  }
-
-  /**
-   * @override
-   */
-  measure() {
-    // NOP.  Width and height were set at creation.
-  }
-}
-
-exports.SpacerRow = SpacerRow;

package/core/renderers/measurables/square_corner.js

@@ -1,50 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Objects representing a square corner in a row of a rendered
- * block.
- */
-
-/**
- * Objects representing a square corner in a row of a rendered
- * block.
- * @class
- */
-goog.module('Blockly.blockRendering.SquareCorner');
-
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-const {Measurable} = goog.require('Blockly.blockRendering.Measurable');
-const {Types} = goog.require('Blockly.blockRendering.Types');
-
-
-/**
- * An object containing information about the space a square corner takes up
- * during rendering.
- * @extends {Measurable}
- * @struct
- * @alias Blockly.blockRendering.SquareCorner
- */
-class SquareCorner extends Measurable {
-  /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @param {string=} opt_position The position of this corner.
-   * @package
-   */
-  constructor(constants, opt_position) {
-    super(constants);
-    this.type = ((!opt_position || opt_position === 'left') ?
-                     Types.LEFT_SQUARE_CORNER :
-                     Types.RIGHT_SQUARE_CORNER) |
-        Types.CORNER;
-    this.height = this.constants_.NO_PADDING;
-    this.width = this.constants_.NO_PADDING;
-  }
-}
-
-exports.SquareCorner = SquareCorner;