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

package/core/renderers/geras/measurables/inline_input.js

@@ -1,58 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Objects representing inline inputs with connections on a
- * rendered block.
- */
-'use strict';
-
-/**
- * Objects representing inline inputs with connections on a
- * rendered block.
- * @class
- */
-goog.module('Blockly.geras.InlineInput');
-
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider: BaseConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider: GerasConstantProvider} = goog.requireType('Blockly.geras.ConstantProvider');
-const {InlineInput: BaseInlineInput} = goog.require('Blockly.blockRendering.InlineInput');
-/* eslint-disable-next-line no-unused-vars */
-const {Input} = goog.requireType('Blockly.Input');
-
-
-/**
- * An object containing information about the space an inline input takes up
- * during rendering.
- * @extends {BaseInlineInput}
- * @alias Blockly.geras.InlineInput
- */
-class InlineInput extends BaseInlineInput {
-  /**
-   * @param {!BaseConstantProvider} constants The rendering
-   *   constants provider.
-   * @param {!Input} input The inline input to measure and store
-   *     information for.
-   * @package
-   */
-  constructor(constants, input) {
-    super(constants, input);
-
-    /** @type {!GerasConstantProvider} */
-    this.constants_;
-
-    if (this.connectedBlock) {
-      // We allow the dark path to show on the parent block so that the child
-      // block looks embossed.  This takes up an extra pixel in both x and y.
-      this.width += this.constants_.DARK_PATH_OFFSET;
-      this.height += this.constants_.DARK_PATH_OFFSET;
-    }
-  }
-}
-
-exports.InlineInput = InlineInput;

package/core/renderers/geras/measurables/statement_input.js

@@ -1,57 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Objects representing statement inputs with connections on a
- * rendered block.
- */
-'use strict';
-
-/**
- * Objects representing statement inputs with connections on a
- * rendered block.
- * @class
- */
-goog.module('Blockly.geras.StatementInput');
-
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider: BaseConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider: GerasConstantProvider} = goog.requireType('Blockly.geras.ConstantProvider');
-/* eslint-disable-next-line no-unused-vars */
-const {Input} = goog.requireType('Blockly.Input');
-const {StatementInput: BaseStatementInput} = goog.require('Blockly.blockRendering.StatementInput');
-
-
-/**
- * An object containing information about the space a statement input takes up
- * during rendering.
- * @extends {BaseStatementInput}
- * @alias Blockly.geras.StatementInput
- */
-class StatementInput extends BaseStatementInput {
-  /**
-   * @param {!BaseConstantProvider} constants The rendering
-   *   constants provider.
-   * @param {!Input} input The statement input to measure and store
-   *     information for.
-   * @package
-   */
-  constructor(constants, input) {
-    super(constants, input);
-
-    /** @type {!GerasConstantProvider} */
-    this.constants_;
-
-    if (this.connectedBlock) {
-      // We allow the dark path to show on the parent block so that the child
-      // block looks embossed.  This takes up an extra pixel in both x and y.
-      this.height += this.constants_.DARK_PATH_OFFSET;
-    }
-  }
-}
-
-exports.StatementInput = StatementInput;

package/core/renderers/geras/renderer.js

@@ -1,149 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Geras renderer.
- */
-'use strict';
-
-/**
- * Geras renderer.
- * @class
- */
-goog.module('Blockly.geras.Renderer');
-
-const blockRendering = goog.require('Blockly.blockRendering');
-/* eslint-disable-next-line no-unused-vars */
-const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider: BaseConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-const {ConstantProvider} = goog.require('Blockly.geras.ConstantProvider');
-const {Drawer} = goog.require('Blockly.geras.Drawer');
-const {HighlightConstantProvider} = goog.require('Blockly.geras.HighlightConstantProvider');
-const {PathObject} = goog.require('Blockly.geras.PathObject');
-/* eslint-disable-next-line no-unused-vars */
-const {RenderInfo: BaseRenderInfo} = goog.requireType('Blockly.blockRendering.RenderInfo');
-const {RenderInfo} = goog.require('Blockly.geras.RenderInfo');
-const {Renderer: BaseRenderer} = goog.require('Blockly.blockRendering.Renderer');
-/* eslint-disable-next-line no-unused-vars */
-const {Theme} = goog.requireType('Blockly.Theme');
-
-
-/**
- * The geras renderer.
- * @extends {BaseRenderer}
- * @alias Blockly.geras.Renderer
- */
-class Renderer extends BaseRenderer {
-  /**
-   * @param {string} name The renderer name.
-   * @package
-   */
-  constructor(name) {
-    super(name);
-
-    /**
-     * The renderer's highlight constant provider.
-     * @type {HighlightConstantProvider}
-     * @private
-     */
-    this.highlightConstants_ = null;
-  }
-
-  /**
-   * Initialize the renderer.  Geras has a highlight provider in addition to
-   * the normal constant provider.
-   * @package
-   * @override
-   */
-  init(theme, opt_rendererOverrides) {
-    super.init(theme, opt_rendererOverrides);
-    this.highlightConstants_ = this.makeHighlightConstants_();
-    this.highlightConstants_.init();
-  }
-
-  /**
-   * @override
-   */
-  refreshDom(svg, theme) {
-    super.refreshDom(svg, theme);
-    this.getHighlightConstants().init();
-  }
-
-  /**
-   * @override
-   */
-  makeConstants_() {
-    return new ConstantProvider();
-  }
-
-  /**
-   * Create a new instance of the renderer's render info object.
-   * @param {!BlockSvg} block The block to measure.
-   * @return {!RenderInfo} The render info object.
-   * @protected
-   * @override
-   */
-  makeRenderInfo_(block) {
-    return new RenderInfo(this, block);
-  }
-
-  /**
-   * Create a new instance of the renderer's drawer.
-   * @param {!BlockSvg} block The block to render.
-   * @param {!BaseRenderInfo} info An object containing all information needed
-   *     to render this block.
-   * @return {!Drawer} The drawer.
-   * @protected
-   * @override
-   */
-  makeDrawer_(block, info) {
-    return new Drawer(
-        block,
-        /** @type {!RenderInfo} */ (info));
-  }
-
-  /**
-   * Create a new instance of a renderer path object.
-   * @param {!SVGElement} root The root SVG element.
-   * @param {!Theme.BlockStyle} style The style object to use for colouring.
-   * @return {!PathObject} The renderer path object.
-   * @package
-   * @override
-   */
-  makePathObject(root, style) {
-    return new PathObject(
-        root, style,
-        /** @type {!ConstantProvider} */ (this.getConstants()));
-  }
-
-  /**
-   * Create a new instance of the renderer's highlight constant provider.
-   * @return {!HighlightConstantProvider} The highlight constant provider.
-   * @protected
-   */
-  makeHighlightConstants_() {
-    return new HighlightConstantProvider(
-        /** @type {!BaseConstantProvider} */
-        (this.getConstants()));
-  }
-
-  /**
-   * Get the renderer's highlight constant provider.  We assume that when this
-   * is called, the renderer has already been initialized.
-   * @return {!HighlightConstantProvider} The highlight constant provider.
-   * @package
-   */
-  getHighlightConstants() {
-    return (
-        /** @type {!HighlightConstantProvider} */
-        (this.highlightConstants_));
-  }
-}
-
-blockRendering.register('geras', Renderer);
-
-exports.Renderer = Renderer;

package/core/renderers/measurables/base.js

@@ -1,64 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Methods for graphically rendering a block as SVG.
- */
-
-'use strict';
-
-/**
- * Methods for graphically rendering a block as SVG.
- * @class
- */
-goog.module('Blockly.blockRendering.Measurable');
-
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-const {Types} = goog.require('Blockly.blockRendering.Types');
-
-
-/**
- * The base class to represent a part of a block that takes up space during
- * rendering.  The constructor for each non-spacer Measurable records the size
- * of the block element (e.g. field, statement input).
- * @alias Blockly.blockRendering.Measurable
- */
-class Measurable {
-  /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @package
-   */
-  constructor(constants) {
-    /** @type {number} */
-    this.width = 0;
-
-    /** @type {number} */
-    this.height = 0;
-
-    /** @type {number} */
-    this.type = Types.NONE;
-
-    /** @type {number} */
-    this.xPos = 0;
-
-    /** @type {number} */
-    this.centerline = 0;
-
-    /**
-     * The renderer's constant provider.
-     * @type {!ConstantProvider}
-     * @protected
-     */
-    this.constants_ = constants;
-
-    /** @type {number} */
-    this.notchOffset = this.constants_.NOTCH_OFFSET_LEFT;
-  }
-}
-
-exports.Measurable = Measurable;

package/core/renderers/measurables/bottom_row.js

@@ -1,138 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Object representing a bottom row on a rendered block.
- * of its subcomponents.
- */
-
-/**
- * Object representing a bottom row on a rendered block.
- * of its subcomponents.
- * @class
- */
-goog.module('Blockly.blockRendering.BottomRow');
-
-/* eslint-disable-next-line no-unused-vars */
-const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-/* eslint-disable-next-line no-unused-vars */
-const {NextConnection} = goog.requireType('Blockly.blockRendering.NextConnection');
-const {Row} = goog.require('Blockly.blockRendering.Row');
-const {Types} = goog.require('Blockly.blockRendering.Types');
-
-
-/**
- * An object containing information about what elements are in the bottom row of
- * a block as well as spacing information for the bottom row.
- * Elements in a bottom row can consist of corners, spacers and next
- * connections.
- * @extends {Row}
- * @struct
- * @alias Blockly.blockRendering.BottomRow
- */
-class BottomRow extends Row {
-  /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @package
-   */
-  constructor(constants) {
-    super(constants);
-    this.type |= Types.BOTTOM_ROW;
-
-    /**
-     * Whether this row has a next connection.
-     * @package
-     * @type {boolean}
-     */
-    this.hasNextConnection = false;
-
-    /**
-     * The next connection on the row, if any.
-     * @package
-     * @type {NextConnection}
-     */
-    this.connection = null;
-
-    /**
-     * The amount that the bottom of the block extends below the horizontal
-     * edge, e.g. because of a next connection.  Must be non-negative (see
-     * #2820).
-     * @package
-     * @type {number}
-     */
-    this.descenderHeight = 0;
-
-    /**
-     * The Y position of the bottom edge of the block, relative to the origin
-     * of the block rendering.
-     * @type {number}
-     */
-    this.baseline = 0;
-  }
-
-  /**
-   * Returns whether or not the bottom row has a left square corner.
-   * @param {!BlockSvg} block The block whose bottom row this represents.
-   * @return {boolean} Whether or not the bottom row has a left square corner.
-   */
-  hasLeftSquareCorner(block) {
-    return !!block.outputConnection || !!block.getNextBlock();
-  }
-
-  /**
-   * Returns whether or not the bottom row has a right square corner.
-   * @param {!BlockSvg} _block The block whose bottom row this represents.
-   * @return {boolean} Whether or not the bottom row has a right square corner.
-   */
-  hasRightSquareCorner(_block) {
-    return true;
-  }
-
-  /**
-   * @override
-   */
-  measure() {
-    let height = 0;
-    let width = 0;
-    let descenderHeight = 0;
-    for (let i = 0; i < this.elements.length; i++) {
-      const elem = this.elements[i];
-      width += elem.width;
-      if (!(Types.isSpacer(elem))) {
-        // Note: this assumes that next connections have *only* descenderHeight,
-        // with no height above the baseline.
-        if (Types.isNextConnection(elem)) {
-          descenderHeight = Math.max(descenderHeight, elem.height);
-        } else {
-          height = Math.max(height, elem.height);
-        }
-      }
-    }
-    this.width = Math.max(this.minWidth, width);
-    this.height = Math.max(this.minHeight, height) + descenderHeight;
-    this.descenderHeight = descenderHeight;
-    this.widthWithConnectedBlocks = this.width;
-  }
-
-  /**
-   * @override
-   */
-  startsWithElemSpacer() {
-    return false;
-  }
-
-  /**
-   * @override
-   */
-  endsWithElemSpacer() {
-    return false;
-  }
-}
-
-exports.BottomRow = BottomRow;

package/core/renderers/measurables/connection.js

@@ -1,56 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Base class representing the space a connection takes up during
- * rendering.
- */
-
-/**
- * Base class representing the space a connection takes up during
- * rendering.
- * @class
- */
-goog.module('Blockly.blockRendering.Connection');
-
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-const {Measurable} = goog.require('Blockly.blockRendering.Measurable');
-/* 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 a connection and the space that it takes up on
- * the block.
- * @extends {Measurable}
- * @alias Blockly.blockRendering.Connection
- */
-class Connection extends Measurable {
-  /**
-   * @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);
-
-    /** @type {!RenderedConnection} */
-    this.connectionModel = connectionModel;
-
-    /** @type {!Object} */
-    this.shape = this.constants_.shapeFor(connectionModel);
-
-    /** @type {boolean} */
-    this.isDynamicShape = !!this.shape['isDynamic'];
-    this.type |= Types.CONNECTION;
-  }
-}
-
-exports.Connection = Connection;

package/core/renderers/measurables/external_value_input.js

@@ -1,70 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Class representing external value inputs with connections on a
- * rendered block.
- */
-
-/**
- * Class representing external value inputs with connections on a
- * rendered block.
- * @class
- */
-goog.module('Blockly.blockRendering.ExternalValueInput');
-
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-const {InputConnection} = goog.require('Blockly.blockRendering.InputConnection');
-/* eslint-disable-next-line no-unused-vars */
-const {Input} = goog.requireType('Blockly.Input');
-const {Types} = goog.require('Blockly.blockRendering.Types');
-
-
-/**
- * An object containing information about the space an external value input
- * takes up during rendering
- * @struct
- * @extends {InputConnection}
- * @alias Blockly.blockRendering.ExternalValueInput
- */
-class ExternalValueInput extends InputConnection {
-  /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @param {!Input} input The external value input to measure and store
-   *     information for.
-   * @package
-   */
-  constructor(constants, input) {
-    super(constants, input);
-    this.type |= Types.EXTERNAL_VALUE_INPUT;
-
-    /** @type {number} */
-    this.height = 0;
-    if (!this.connectedBlock) {
-      this.height = this.shape.height;
-    } else {
-      this.height = this.connectedBlockHeight -
-          this.constants_.TAB_OFFSET_FROM_TOP - this.constants_.MEDIUM_PADDING;
-    }
-
-    /** @type {number} */
-    this.width =
-        this.shape.width + this.constants_.EXTERNAL_VALUE_INPUT_PADDING;
-
-    /** @type {number} */
-    this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
-
-    /** @type {number} */
-    this.connectionHeight = this.shape.height;
-
-    /** @type {number} */
-    this.connectionWidth = this.shape.width;
-  }
-}
-
-exports.ExternalValueInput = ExternalValueInput;

package/core/renderers/measurables/field.js

@@ -1,71 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Objects representing a field in a row of a rendered
- * block.
- */
-
-/**
- * Objects representing a field in a row of a rendered
- * block.
- * @class
- */
-goog.module('Blockly.blockRendering.Field');
-
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-/* eslint-disable-next-line no-unused-vars */
-const {Field: BlocklyField} = goog.requireType('Blockly.Field');
-/* eslint-disable-next-line no-unused-vars */
-const {Input} = goog.requireType('Blockly.Input');
-const {Measurable} = goog.require('Blockly.blockRendering.Measurable');
-const {Types} = goog.require('Blockly.blockRendering.Types');
-
-
-/**
- * An object containing information about the space a field takes up during
- * rendering
- * @struct
- * @extends {Measurable}
- * @alias Blockly.blockRendering.Field
- */
-class Field extends Measurable {
-  /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @param {!BlocklyField} field The field to measure and store information
-   *     for.
-   * @param {!Input} parentInput The parent input for the field.
-   * @package
-   */
-  constructor(constants, field, parentInput) {
-    super(constants);
-
-    /** @type {!BlocklyField} */
-    this.field = field;
-
-    /** @type {boolean} */
-    this.isEditable = field.EDITABLE;
-
-    /** @type {boolean} */
-    this.flipRtl = field.getFlipRtl();
-    this.type |= Types.FIELD;
-
-    const size = this.field.getSize();
-
-    /** @type {number} */
-    this.height = size.height;
-
-    /** @type {number} */
-    this.width = size.width;
-
-    /** @type {!Input} */
-    this.parentInput = parentInput;
-  }
-}
-
-exports.Field = Field;