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

package/core/renderers/thrasos/renderer.js

@@ -1,53 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Thrasos renderer.
- */
-'use strict';
-
-/**
- * Thrasos renderer.
- * @class
- */
-goog.module('Blockly.thrasos.Renderer');
-
-const blockRendering = goog.require('Blockly.blockRendering');
-/* eslint-disable-next-line no-unused-vars */
-const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
-const {RenderInfo} = goog.require('Blockly.thrasos.RenderInfo');
-const {Renderer: BaseRenderer} = goog.require('Blockly.blockRendering.Renderer');
-
-
-/**
- * The thrasos renderer.
- * @extends {BaseRenderer}
- * @alias Blockly.thrasos.Renderer
- */
-class Renderer extends BaseRenderer {
-  /**
-   * @param {string} name The renderer name.
-   * @package
-   */
-  constructor(name) {
-    super(name);
-  }
-
-  /**
-   * 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);
-  }
-}
-
-blockRendering.register('thrasos', Renderer);
-
-exports.Renderer = Renderer;

package/core/renderers/thrasos/thrasos.js

@@ -1,22 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Re-exports of Blockly.thrasos.* modules.
- */
-'use strict';
-
-/**
- * Re-exports of Blockly.thrasos.* modules.
- * @namespace Blockly.thrasos
- */
-goog.module('Blockly.thrasos');
-
-const {RenderInfo} = goog.require('Blockly.thrasos.RenderInfo');
-const {Renderer} = goog.require('Blockly.thrasos.Renderer');
-
-exports.RenderInfo = RenderInfo;
-exports.Renderer = Renderer;

package/core/renderers/zelos/marker_svg.js

@@ -1,179 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Methods for graphically rendering a marker as SVG.
- */
-'use strict';
-
-/**
- * Methods for graphically rendering a marker as SVG.
- * @class
- */
-goog.module('Blockly.zelos.MarkerSvg');
-
-const dom = goog.require('Blockly.utils.dom');
-/* eslint-disable-next-line no-unused-vars */
-const {ASTNode} = goog.requireType('Blockly.ASTNode');
-/* 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 {MarkerSvg: BaseMarkerSvg} = goog.require('Blockly.blockRendering.MarkerSvg');
-/* eslint-disable-next-line no-unused-vars */
-const {Marker} = goog.requireType('Blockly.Marker');
-/* eslint-disable-next-line no-unused-vars */
-const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection');
-const {Svg} = goog.require('Blockly.utils.Svg');
-/* eslint-disable-next-line no-unused-vars */
-const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider: ZelosConstantProvider} = goog.requireType('Blockly.zelos.ConstantProvider');
-
-
-/**
- * Class to draw a marker.
- * @extends {BaseMarkerSvg}
- * @alias Blockly.zelos.MarkerSvg
- */
-class MarkerSvg extends BaseMarkerSvg {
-  /**
-   * @param {!WorkspaceSvg} workspace The workspace the marker belongs to.
-   * @param {!BaseConstantProvider} constants The constants for
-   *     the renderer.
-   * @param {!Marker} marker The marker to draw.
-   */
-  constructor(workspace, constants, marker) {
-    super(workspace, constants, marker);
-
-    /** @type {!ZelosConstantProvider} */
-    this.constants_;
-
-    /**
-     * @type {SVGCircleElement}
-     * @private
-     */
-    this.markerCircle_ = null;
-  }
-
-  /**
-   * Position and display the marker for an input or an output connection.
-   * @param {!ASTNode} curNode The node to draw the marker for.
-   * @private
-   */
-  showWithInputOutput_(curNode) {
-    const block = /** @type {!BlockSvg} */ (curNode.getSourceBlock());
-    const connection =
-        /** @type {!RenderedConnection} */ (curNode.getLocation());
-    const offsetInBlock = connection.getOffsetInBlock();
-
-    this.positionCircle_(offsetInBlock.x, offsetInBlock.y);
-    this.setParent_(block);
-    this.showCurrent_();
-  }
-
-  /**
-   * @override
-   */
-  showWithOutput_(curNode) {
-    this.showWithInputOutput_(curNode);
-  }
-
-  /**
-   * @override
-   */
-  showWithInput_(curNode) {
-    this.showWithInputOutput_(curNode);
-  }
-
-  /**
-   * Draw a rectangle around the block.
-   * @param {!ASTNode} curNode The current node of the marker.
-   */
-  showWithBlock_(curNode) {
-    const block = /** @type {!BlockSvg} */ (curNode.getLocation());
-
-    // Gets the height and width of entire stack.
-    const heightWidth = block.getHeightWidth();
-
-    // Add padding so that being on a stack looks different than being on a
-    // block.
-    this.positionRect_(0, 0, heightWidth.width, heightWidth.height);
-    this.setParent_(block);
-    this.showCurrent_();
-  }
-
-  /**
-   * Position the circle we use for input and output connections.
-   * @param {number} x The x position of the circle.
-   * @param {number} y The y position of the circle.
-   * @private
-   */
-  positionCircle_(x, y) {
-    this.markerCircle_.setAttribute('cx', x);
-    this.markerCircle_.setAttribute('cy', y);
-    this.currentMarkerSvg = this.markerCircle_;
-  }
-
-  /**
-   * @override
-   */
-  hide() {
-    super.hide();
-    this.markerCircle_.style.display = 'none';
-  }
-
-  /**
-   * @override
-   */
-  createDomInternal_() {
-    /* clang-format off */
-    /* This markup will be generated and added to the .svgGroup_:
-    <g>
-      <rect width="100" height="5">
-        <animate attributeType="XML" attributeName="fill" dur="1s"
-          values="transparent;transparent;#fff;transparent" repeatCount="indefinite" />
-      </rect>
-    </g>
-    */
-    /* clang-format on */
-
-    super.createDomInternal_();
-
-    this.markerCircle_ = dom.createSvgElement(
-        Svg.CIRCLE, {
-          'r': this.constants_.CURSOR_RADIUS,
-          'style': 'display: none',
-          'stroke-width': this.constants_.CURSOR_STROKE_WIDTH,
-        },
-        this.markerSvg_);
-
-    // Markers and stack cursors don't blink.
-    if (this.isCursor()) {
-      const blinkProperties = this.getBlinkProperties_();
-      dom.createSvgElement(Svg.ANIMATE, blinkProperties, this.markerCircle_);
-    }
-
-    return this.markerSvg_;
-  }
-
-  /**
-   * @override
-   */
-  applyColour_(curNode) {
-    super.applyColour_(curNode);
-
-    this.markerCircle_.setAttribute('fill', this.colour_);
-    this.markerCircle_.setAttribute('stroke', this.colour_);
-
-    if (this.isCursor()) {
-      const values = this.colour_ + ';transparent;transparent;';
-      this.markerCircle_.firstChild.setAttribute('values', values);
-    }
-  }
-}
-
-exports.MarkerSvg = MarkerSvg;

package/core/renderers/zelos/measurables/bottom_row.js

@@ -1,66 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview An object representing the bottom row of a rendered block.
- */
-'use strict';
-
-/**
- * An object representing the bottom row of a rendered block.
- * @class
- */
-goog.module('Blockly.zelos.BottomRow');
-
-const {BottomRow: BaseBottomRow} = goog.require('Blockly.blockRendering.BottomRow');
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-
-
-/**
- * An object containing information about what elements are in the bottom row of
- * a block as well as spacing information for the top row.
- * Elements in a bottom row can consist of corners, spacers and next
- * connections.
- * @extends {BaseBottomRow}
- * @alias Blockly.zelos.BottomRow
- */
-class BottomRow extends BaseBottomRow {
-  /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @package
-   */
-  constructor(constants) {
-    super(constants);
-  }
-
-  /**
-   * @override
-   */
-  endsWithElemSpacer() {
-    return false;
-  }
-
-  /**
-   * Render a round corner unless the block has an output connection.
-   * @override
-   */
-  hasLeftSquareCorner(block) {
-    return !!block.outputConnection;
-  }
-
-  /**
-   * Render a round corner unless the block has an output connection.
-   * @override
-   */
-  hasRightSquareCorner(block) {
-    return !!block.outputConnection && !block.statementInputCount &&
-        !block.nextConnection;
-  }
-}
-
-exports.BottomRow = BottomRow;

package/core/renderers/zelos/measurables/row_elements.js

@@ -1,46 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Zelos specific objects representing elements in a row of a
- * rendered block.
- */
-
-/**
- * Zelos specific objects representing elements in a row of a
- * rendered block.
- * @class
- */
-goog.module('Blockly.zelos.RightConnectionShape');
-
-/* 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 right connection shape
- * takes up during rendering.
- * @extends {Measurable}
- * @alias Blockly.zelos.RightConnectionShape
- */
-class RightConnectionShape extends Measurable {
-  /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @package
-   */
-  constructor(constants) {
-    super(constants);
-    this.type |= Types.getType('RIGHT_CONNECTION');
-    // Size is dynamic
-    this.height = 0;
-    this.width = 0;
-  }
-}
-
-exports.RightConnectionShape = RightConnectionShape;

package/core/renderers/zelos/path_object.js

@@ -1,247 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview An object that owns a block's rendering SVG elements.
- */
-
-'use strict';
-
-/**
- * An object that owns a block's rendering SVG elements.
- * @class
- */
-goog.module('Blockly.zelos.PathObject');
-
-const dom = goog.require('Blockly.utils.dom');
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.zelos.ConstantProvider');
-const {PathObject: BasePathObject} = goog.require('Blockly.blockRendering.PathObject');
-const {Svg} = goog.require('Blockly.utils.Svg');
-/* eslint-disable-next-line no-unused-vars */
-const {Theme} = goog.requireType('Blockly.Theme');
-
-
-/**
- * An object that handles creating and setting each of the SVG elements
- * used by the renderer.
- * @alias Blockly.zelos.PathObject
- */
-class PathObject extends BasePathObject {
-  /**
-   * @param {!SVGElement} root The root SVG element.
-   * @param {!Theme.BlockStyle} style The style object to use for
-   *     colouring.
-   * @param {!ConstantProvider} constants The renderer's constants.
-   * @package
-   */
-  constructor(root, style, constants) {
-    super(root, style, constants);
-
-    /**
-     * The renderer's constant provider.
-     * @type {!ConstantProvider}
-     */
-    this.constants = constants;
-
-    /**
-     * The selected path of the block.
-     * @type {?SVGElement}
-     * @private
-     */
-    this.svgPathSelected_ = null;
-
-    /**
-     * The outline paths on the block.
-     * @type {!Object<string, !SVGElement>}
-     * @private
-     */
-    this.outlines_ = Object.create(null);
-
-    /**
-     * A set used to determine which outlines were used during a draw pass.  The
-     * set is initialized with a reference to all the outlines in
-     * `this.outlines_`. Every time we use an outline during the draw pass, the
-     * reference is removed from this set.
-     * @type {Object<string, number>}
-     * @private
-     */
-    this.remainingOutlines_ = null;
-
-    /**
-     * The type of block's output connection shape.  This is set when a block
-     * with an output connection is drawn.
-     * @package
-     */
-    this.outputShapeType = null;
-  }
-
-  /**
-   * @override
-   */
-  setPath(pathString) {
-    super.setPath(pathString);
-    if (this.svgPathSelected_) {
-      this.svgPathSelected_.setAttribute('d', pathString);
-    }
-  }
-
-  /**
-   * @override
-   */
-  applyColour(block) {
-    super.applyColour(block);
-    // Set shadow stroke colour.
-    if (block.isShadow() && block.getParent()) {
-      this.svgPath.setAttribute(
-          'stroke', block.getParent().style.colourTertiary);
-    }
-
-    // Apply colour to outlines.
-    for (const key in this.outlines_) {
-      this.outlines_[key].setAttribute('fill', this.style.colourTertiary);
-    }
-  }
-
-  /**
-   * @override
-   */
-  flipRTL() {
-    super.flipRTL();
-    // Mirror each input outline path.
-    for (const key in this.outlines_) {
-      this.outlines_[key].setAttribute('transform', 'scale(-1 1)');
-    }
-  }
-
-  /**
-   * @override
-   */
-  updateSelected(enable) {
-    this.setClass_('blocklySelected', enable);
-    if (enable) {
-      if (!this.svgPathSelected_) {
-        this.svgPathSelected_ =
-            /** @type {!SVGElement} */ (this.svgPath.cloneNode(true));
-        this.svgPathSelected_.setAttribute('fill', 'none');
-        this.svgPathSelected_.setAttribute(
-            'filter', 'url(#' + this.constants.selectedGlowFilterId + ')');
-        this.svgRoot.appendChild(this.svgPathSelected_);
-      }
-    } else {
-      if (this.svgPathSelected_) {
-        this.svgRoot.removeChild(this.svgPathSelected_);
-        this.svgPathSelected_ = null;
-      }
-    }
-  }
-
-  /**
-   * @override
-   */
-  updateReplacementFade(enable) {
-    this.setClass_('blocklyReplaceable', enable);
-    if (enable) {
-      this.svgPath.setAttribute(
-          'filter', 'url(#' + this.constants.replacementGlowFilterId + ')');
-    } else {
-      this.svgPath.removeAttribute('filter');
-    }
-  }
-
-  /**
-   * @override
-   */
-  updateShapeForInputHighlight(conn, enable) {
-    const name = conn.getParentInput().name;
-    const outlinePath = this.getOutlinePath_(name);
-    if (!outlinePath) {
-      return;
-    }
-    if (enable) {
-      outlinePath.setAttribute(
-          'filter', 'url(#' + this.constants.replacementGlowFilterId + ')');
-    } else {
-      outlinePath.removeAttribute('filter');
-    }
-  }
-
-  /**
-   * Method that's called when the drawer is about to draw the block.
-   * @package
-   */
-  beginDrawing() {
-    this.remainingOutlines_ = Object.create(null);
-    for (const key in this.outlines_) {
-      // The value set here isn't used anywhere, we are just using the
-      // object as a Set data structure.
-      this.remainingOutlines_[key] = 1;
-    }
-  }
-
-  /**
-   * Method that's called when the drawer is done drawing.
-   * @package
-   */
-  endDrawing() {
-    // Go through all remaining outlines that were not used this draw pass, and
-    // remove them.
-    if (this.remainingOutlines_) {
-      for (const key in this.remainingOutlines_) {
-        this.removeOutlinePath_(key);
-      }
-    }
-    this.remainingOutlines_ = null;
-  }
-
-  /**
-   * Set the path generated by the renderer for an outline path on the
-   * respective outline path SVG element.
-   * @param {string} name The input name.
-   * @param {string} pathString The path.
-   * @package
-   */
-  setOutlinePath(name, pathString) {
-    const outline = this.getOutlinePath_(name);
-    outline.setAttribute('d', pathString);
-    outline.setAttribute('fill', this.style.colourTertiary);
-  }
-
-  /**
-   * Create's an outline path for the specified input.
-   * @param {string} name The input name.
-   * @return {!SVGElement} The SVG outline path.
-   * @private
-   */
-  getOutlinePath_(name) {
-    if (!this.outlines_[name]) {
-      this.outlines_[name] = dom.createSvgElement(
-          Svg.PATH, {
-            'class': 'blocklyOutlinePath',
-            // IE doesn't like paths without the data definition, set empty
-            // default
-            'd': '',
-          },
-          this.svgRoot);
-    }
-    if (this.remainingOutlines_) {
-      delete this.remainingOutlines_[name];
-    }
-    return this.outlines_[name];
-  }
-
-  /**
-   * Remove an outline path that is associated with the specified input.
-   * @param {string} name The input name.
-   * @private
-   */
-  removeOutlinePath_(name) {
-    this.outlines_[name].parentNode.removeChild(this.outlines_[name]);
-    delete this.outlines_[name];
-  }
-}
-
-exports.PathObject = PathObject;