blockly 7.20211209.3 → 8.0.1-beta.0

package/core/renderers/measurables/input_connection.js

@@ -14,49 +14,62 @@
  */
 goog.module('Blockly.blockRendering.InputConnection');
 
-const object = goog.require('Blockly.utils.object');
+/* 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
- * @param {!ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Input} input The input to measure and store information for.
  * @package
- * @constructor
  * @extends {Connection}
  * @alias Blockly.blockRendering.InputConnection
  */
-const InputConnection = function(constants, input) {
-  InputConnection.superClass_.constructor.call(
-      this, constants, input.connection);
-
-  this.type |= Types.INPUT;
-  this.input = input;
-  this.align = input.align;
-  this.connectedBlock = input.connection && input.connection.targetBlock() ?
-      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;
-  }
+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;
 
-  this.connectionOffsetX = 0;
-  this.connectionOffsetY = 0;
-};
-object.inherits(InputConnection, Connection);
+    /** @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/input_row.js

@@ -16,68 +16,74 @@
  */
 goog.module('Blockly.blockRendering.InputRow');
 
-const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
 const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const {InputConnection} = goog.require('Blockly.blockRendering.InputConnection');
+const {ExternalValueInput} = goog.require('Blockly.blockRendering.ExternalValueInput');
 const {Row} = goog.require('Blockly.blockRendering.Row');
+const {StatementInput} = goog.require('Blockly.blockRendering.StatementInput');
 const {Types} = goog.require('Blockly.blockRendering.Types');
 
 
 /**
  * An object containing information about a row that holds one or more inputs.
- * @param {!ConstantProvider} constants The rendering
- *   constants provider.
- * @package
- * @constructor
  * @extends {Row}
+ * @struct
  * @alias Blockly.blockRendering.InputRow
  */
-const InputRow = function(constants) {
-  InputRow.superClass_.constructor.call(this, constants);
-  this.type |= Types.INPUT_ROW;
-
+class InputRow extends Row {
   /**
-   * The total width of all blocks connected to this row.
-   * @type {number}
+   * @param {!ConstantProvider} constants The rendering
+   *   constants provider.
    * @package
    */
-  this.connectedBlockWidths = 0;
-};
-object.inherits(InputRow, Row);
+  constructor(constants) {
+    super(constants);
+    this.type |= Types.INPUT_ROW;
 
-/**
- * Inspect all subcomponents and populate all size properties on the row.
- * @package
- */
-InputRow.prototype.measure = function() {
-  this.width = this.minWidth;
-  this.height = this.minHeight;
-  let connectedBlockWidths = 0;
-  for (let i = 0; i < this.elements.length; i++) {
-    const elem = this.elements[i];
-    this.width += elem.width;
-    if (Types.isInput(elem)) {
-      if (Types.isStatementInput(elem)) {
-        connectedBlockWidths += elem.connectedBlockWidth;
-      } else if (
-          Types.isExternalInput(elem) && elem.connectedBlockWidth !== 0) {
-        connectedBlockWidths +=
-            (elem.connectedBlockWidth - elem.connectionWidth);
+    /**
+     * The total width of all blocks connected to this row.
+     * @type {number}
+     * @package
+     */
+    this.connectedBlockWidths = 0;
+  }
+
+  /**
+   * Inspect all subcomponents and populate all size properties on the row.
+   * @package
+   */
+  measure() {
+    this.width = this.minWidth;
+    this.height = this.minHeight;
+    let connectedBlockWidths = 0;
+    for (let i = 0; i < this.elements.length; i++) {
+      const elem = this.elements[i];
+      this.width += elem.width;
+      if (Types.isInput(elem) && elem instanceof InputConnection) {
+        if (Types.isStatementInput(elem) && elem instanceof StatementInput) {
+          connectedBlockWidths += elem.connectedBlockWidth;
+        } else if (
+            Types.isExternalInput(elem) && elem instanceof ExternalValueInput &&
+            elem.connectedBlockWidth !== 0) {
+          connectedBlockWidths +=
+              (elem.connectedBlockWidth - elem.connectionWidth);
+        }
+      }
+      if (!(Types.isSpacer(elem))) {
+        this.height = Math.max(this.height, elem.height);
       }
     }
-    if (!(Types.isSpacer(elem))) {
-      this.height = Math.max(this.height, elem.height);
-    }
+    this.connectedBlockWidths = connectedBlockWidths;
+    this.widthWithConnectedBlocks = this.width + connectedBlockWidths;
   }
-  this.connectedBlockWidths = connectedBlockWidths;
-  this.widthWithConnectedBlocks = this.width + connectedBlockWidths;
-};
 
-/**
- * @override
- */
-InputRow.prototype.endsWithElemSpacer = function() {
-  return !this.hasExternalInput && !this.hasStatement;
-};
+  /**
+   * @override
+   */
+  endsWithElemSpacer() {
+    return !this.hasExternalInput && !this.hasStatement;
+  }
+}
 
 exports.InputRow = InputRow;

package/core/renderers/measurables/jagged_edge.js

@@ -16,7 +16,6 @@
  */
 goog.module('Blockly.blockRendering.JaggedEdge');
 
-const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
 const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
 const {Measurable} = goog.require('Blockly.blockRendering.Measurable');
@@ -26,19 +25,22 @@ const {Types} = goog.require('Blockly.blockRendering.Types');
 /**
  * An object containing information about the jagged edge of a collapsed block
  * takes up during rendering
- * @param {!ConstantProvider} constants The rendering
- *   constants provider.
- * @package
- * @constructor
  * @extends {Measurable}
+ * @struct
  * @alias Blockly.blockRendering.JaggedEdge
  */
-const JaggedEdge = function(constants) {
-  JaggedEdge.superClass_.constructor.call(this, constants);
-  this.type |= Types.JAGGED_EDGE;
-  this.height = this.constants_.JAGGED_TEETH.height;
-  this.width = this.constants_.JAGGED_TEETH.width;
-};
-object.inherits(JaggedEdge, Measurable);
+class JaggedEdge extends Measurable {
+  /**
+   * @param {!ConstantProvider} constants The rendering
+   *   constants provider.
+   * @package
+   */
+  constructor(constants) {
+    super(constants);
+    this.type |= Types.JAGGED_EDGE;
+    this.height = this.constants_.JAGGED_TEETH.height;
+    this.width = this.constants_.JAGGED_TEETH.width;
+  }
+}
 
 exports.JaggedEdge = JaggedEdge;

package/core/renderers/measurables/next_connection.js

@@ -16,7 +16,6 @@
  */
 goog.module('Blockly.blockRendering.NextConnection');
 
-const object = goog.require('Blockly.utils.object');
 const {Connection} = goog.require('Blockly.blockRendering.Connection');
 /* eslint-disable-next-line no-unused-vars */
 const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
@@ -28,21 +27,24 @@ const {Types} = goog.require('Blockly.blockRendering.Types');
 /**
  * An object containing information about the space a next connection takes
  * up during rendering.
- * @param {!ConstantProvider} constants The rendering
- *   constants provider.
- * @param {RenderedConnection} connectionModel The connection object on
- *     the block that this represents.
- * @package
- * @constructor
  * @extends {Connection}
+ * @struct
  * @alias Blockly.blockRendering.NextConnection
  */
-const NextConnection = function(constants, connectionModel) {
-  NextConnection.superClass_.constructor.call(this, constants, connectionModel);
-  this.type |= Types.NEXT_CONNECTION;
-  this.height = this.shape.height;
-  this.width = this.shape.width;
-};
-object.inherits(NextConnection, Connection);
+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

@@ -17,7 +17,6 @@
  */
 goog.module('Blockly.blockRendering.OutputConnection');
 
-const object = goog.require('Blockly.utils.object');
 const {Connection} = goog.require('Blockly.blockRendering.Connection');
 /* eslint-disable-next-line no-unused-vars */
 const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
@@ -29,27 +28,34 @@ const {Types} = goog.require('Blockly.blockRendering.Types');
 /**
  * An object containing information about the space an output connection takes
  * up during rendering.
- * @param {!ConstantProvider} constants The rendering
- *   constants provider.
- * @param {RenderedConnection} connectionModel The connection object on
- *     the block that this represents.
- * @package
- * @constructor
  * @extends {Connection}
+ * @struct
  * @alias Blockly.blockRendering.OutputConnection
  */
-const OutputConnection = function(constants, connectionModel) {
-  OutputConnection.superClass_.constructor.call(
-      this, constants, connectionModel);
-  this.type |= Types.OUTPUT_CONNECTION;
-
-  this.height = !this.isDynamicShape ? this.shape.height : 0;
-  this.width = !this.isDynamicShape ? this.shape.width : 0;
-  this.startX = this.width;
-
-  this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
-  this.connectionOffsetX = 0;
-};
-object.inherits(OutputConnection, Connection);
+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

@@ -16,7 +16,6 @@
  */
 goog.module('Blockly.blockRendering.PreviousConnection');
 
-const object = goog.require('Blockly.utils.object');
 const {Connection} = goog.require('Blockly.blockRendering.Connection');
 /* eslint-disable-next-line no-unused-vars */
 const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
@@ -28,22 +27,24 @@ const {Types} = goog.require('Blockly.blockRendering.Types');
 /**
  * An object containing information about the space a previous connection takes
  * up during rendering.
- * @param {!ConstantProvider} constants The rendering
- *   constants provider.
- * @param {RenderedConnection} connectionModel The connection object on
- *     the block that this represents.
- * @package
- * @constructor
  * @extends {Connection}
+ * @struct
  * @alias Blockly.blockRendering.PreviousConnection
  */
-const PreviousConnection = function(constants, connectionModel) {
-  PreviousConnection.superClass_.constructor.call(
-      this, constants, connectionModel);
-  this.type |= Types.PREVIOUS_CONNECTION;
-  this.height = this.shape.height;
-  this.width = this.shape.width;
-};
-object.inherits(PreviousConnection, Connection);
+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

@@ -16,7 +16,6 @@
  */
 goog.module('Blockly.blockRendering.RoundCorner');
 
-const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
 const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
 const {Measurable} = goog.require('Blockly.blockRendering.Measurable');
@@ -26,25 +25,28 @@ const {Types} = goog.require('Blockly.blockRendering.Types');
 /**
  * An object containing information about the space a rounded corner takes up
  * during rendering.
- * @param {!ConstantProvider} constants The rendering
- *   constants provider.
- * @param {string=} opt_position The position of this corner.
- * @package
- * @constructor
  * @extends {Measurable}
+ * @struct
  * @alias Blockly.blockRendering.RoundCorner
  */
-const RoundCorner = function(constants, opt_position) {
-  RoundCorner.superClass_.constructor.call(this, 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;
-};
-object.inherits(RoundCorner, Measurable);
+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;