blockly 7.20211209.4 → 8.0.1

package/core/renderers/measurables/bottom_row.js

@@ -16,7 +16,6 @@
  */
 goog.module('Blockly.blockRendering.BottomRow');
 
-const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 /* eslint-disable-next-line no-unused-vars */
@@ -32,104 +31,108 @@ const {Types} = goog.require('Blockly.blockRendering.Types');
  * a block as well as spacing information for the bottom row.
  * Elements in a bottom row can consist of corners, spacers and next
  * connections.
- * @param {!ConstantProvider} constants The rendering
- *   constants provider.
- * @package
- * @constructor
  * @extends {Row}
+ * @struct
  * @alias Blockly.blockRendering.BottomRow
  */
-const BottomRow = function(constants) {
-  BottomRow.superClass_.constructor.call(this, constants);
-  this.type |= Types.BOTTOM_ROW;
-
+class BottomRow extends Row {
   /**
-   * Whether this row has a next connection.
+   * @param {!ConstantProvider} constants The rendering
+   *   constants provider.
    * @package
-   * @type {boolean}
    */
-  this.hasNextConnection = false;
+  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;
+  }
 
   /**
-   * The next connection on the row, if any.
-   * @package
-   * @type {NextConnection}
+   * 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.
    */
-  this.connection = null;
+  hasLeftSquareCorner(block) {
+    return !!block.outputConnection || !!block.getNextBlock();
+  }
 
   /**
-   * 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}
+   * 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.
    */
-  this.descenderHeight = 0;
+  hasRightSquareCorner(_block) {
+    return true;
+  }
 
   /**
-   * The Y position of the bottom edge of the block, relative to the origin
-   * of the block rendering.
-   * @type {number}
+   * @override
    */
-  this.baseline = 0;
-};
-object.inherits(BottomRow, Row);
-
-/**
- * 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.
- */
-BottomRow.prototype.hasLeftSquareCorner = function(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.
- */
-BottomRow.prototype.hasRightSquareCorner = function(_block) {
-  return true;
-};
-
-/**
- * @override
- */
-BottomRow.prototype.measure = function() {
-  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);
+  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;
   }
-  this.width = Math.max(this.minWidth, width);
-  this.height = Math.max(this.minHeight, height) + descenderHeight;
-  this.descenderHeight = descenderHeight;
-  this.widthWithConnectedBlocks = this.width;
-};
 
-/**
- * @override
- */
-BottomRow.prototype.startsWithElemSpacer = function() {
-  return false;
-};
+  /**
+   * @override
+   */
+  startsWithElemSpacer() {
+    return false;
+  }
 
-/**
- * @override
- */
-BottomRow.prototype.endsWithElemSpacer = function() {
-  return false;
-};
+  /**
+   * @override
+   */
+  endsWithElemSpacer() {
+    return false;
+  }
+}
 
 exports.BottomRow = BottomRow;

package/core/renderers/measurables/connection.js

@@ -16,7 +16,6 @@
  */
 goog.module('Blockly.blockRendering.Connection');
 
-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');
@@ -28,22 +27,30 @@ const {Types} = goog.require('Blockly.blockRendering.Types');
 /**
  * The base class to represent a connection and the space that it takes up on
  * the block.
- * @param {!ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!RenderedConnection} connectionModel The connection object on
- *     the block that this represents.
- * @package
- * @constructor
  * @extends {Measurable}
  * @alias Blockly.blockRendering.Connection
  */
-const Connection = function(constants, connectionModel) {
-  Connection.superClass_.constructor.call(this, constants);
-  this.connectionModel = connectionModel;
-  this.shape = this.constants_.shapeFor(connectionModel);
-  this.isDynamicShape = !!this.shape['isDynamic'];
-  this.type |= Types.CONNECTION;
-};
-object.inherits(Connection, Measurable);
+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

@@ -16,7 +16,6 @@
  */
 goog.module('Blockly.blockRendering.ExternalValueInput');
 
-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');
@@ -28,30 +27,44 @@ const {Types} = goog.require('Blockly.blockRendering.Types');
 /**
  * An object containing information about the space an external value input
  * takes up during rendering
- * @param {!ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Input} input The external value input to measure and store
- *     information for.
- * @package
- * @constructor
+ * @struct
  * @extends {InputConnection}
  * @alias Blockly.blockRendering.ExternalValueInput
  */
-const ExternalValueInput = function(constants, input) {
-  ExternalValueInput.superClass_.constructor.call(this, constants, input);
-  this.type |= Types.EXTERNAL_VALUE_INPUT;
-  if (!this.connectedBlock) {
-    this.height = this.shape.height;
-  } else {
-    this.height = this.connectedBlockHeight -
-        this.constants_.TAB_OFFSET_FROM_TOP - this.constants_.MEDIUM_PADDING;
-  }
-  this.width = this.shape.width + this.constants_.EXTERNAL_VALUE_INPUT_PADDING;
+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;
 
-  this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
-  this.connectionHeight = this.shape.height;
-  this.connectionWidth = this.shape.width;
-};
-object.inherits(ExternalValueInput, InputConnection);
+    /** @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

@@ -16,7 +16,6 @@
  */
 goog.module('Blockly.blockRendering.Field');
 
-const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
 const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
 /* eslint-disable-next-line no-unused-vars */
@@ -30,27 +29,43 @@ const {Types} = goog.require('Blockly.blockRendering.Types');
 /**
  * An object containing information about the space a field takes up during
  * rendering
- * @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
+ * @struct
  * @extends {Measurable}
  * @alias Blockly.blockRendering.Field
  */
-const Field = function(constants, field, parentInput) {
-  Field.superClass_.constructor.call(this, constants);
-  this.field = field;
-  this.isEditable = field.EDITABLE;
-  this.flipRtl = field.getFlipRtl();
-  this.type |= Types.FIELD;
-
-  const size = this.field.getSize();
-  this.height = size.height;
-  this.width = size.width;
-  this.parentInput = parentInput;
-};
-object.inherits(Field, Measurable);
+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;

package/core/renderers/measurables/hat.js

@@ -16,7 +16,6 @@
  */
 goog.module('Blockly.blockRendering.Hat');
 
-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,20 +25,26 @@ const {Types} = goog.require('Blockly.blockRendering.Types');
 /**
  * An object containing information about the space a hat takes up during
  * rendering.
- * @param {!ConstantProvider} constants The rendering
- *   constants provider.
- * @package
- * @constructor
+ * @struct
  * @extends {Measurable}
  * @alias Blockly.blockRendering.Hat
  */
-const Hat = function(constants) {
-  Hat.superClass_.constructor.call(this, constants);
-  this.type |= Types.HAT;
-  this.height = this.constants_.START_HAT.height;
-  this.width = this.constants_.START_HAT.width;
-  this.ascenderHeight = this.height;
-};
-object.inherits(Hat, Measurable);
+class Hat extends Measurable {
+  /**
+   * @param {!ConstantProvider} constants The rendering
+   *   constants provider.
+   * @package
+   */
+  constructor(constants) {
+    super(constants);
+    this.type |= Types.HAT;
+
+    this.height = this.constants_.START_HAT.height;
+    this.width = this.constants_.START_HAT.width;
+
+    /** @type {number} */
+    this.ascenderHeight = this.height;
+  }
+}
 
 exports.Hat = Hat;

package/core/renderers/measurables/icon.js

@@ -16,7 +16,6 @@
  */
 goog.module('Blockly.blockRendering.Icon');
 
-const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
 const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
 /* eslint-disable-next-line no-unused-vars */
@@ -28,24 +27,32 @@ const {Types} = goog.require('Blockly.blockRendering.Types');
 /**
  * An object containing information about the space an icon takes up during
  * rendering
- * @param {!ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!BlocklyIcon} icon The icon to measure and store information for.
- * @package
- * @constructor
  * @extends {Measurable}
+ * @struct
  * @alias Blockly.blockRendering.Icon
  */
-const Icon = function(constants, icon) {
-  Icon.superClass_.constructor.call(this, constants);
-  this.icon = icon;
-  this.isVisible = icon.isVisible();
-  this.type |= Types.ICON;
-
-  const size = icon.getCorrectedSize();
-  this.height = size.height;
-  this.width = size.width;
-};
-object.inherits(Icon, Measurable);
+class Icon extends Measurable {
+  /**
+   * An object containing information about the space an icon takes up during
+   * rendering
+   * @param {!ConstantProvider} constants The rendering
+   *   constants provider.
+   * @param {!BlocklyIcon} icon The icon to measure and store information for.
+   * @package
+   */
+  constructor(constants, icon) {
+    super(constants);
 
+    /** @type {!BlocklyIcon} */
+    this.icon = icon;
+
+    /** @type {boolean} */
+    this.isVisible = icon.isVisible();
+    this.type |= Types.ICON;
+
+    const size = icon.getCorrectedSize();
+    this.height = size.height;
+    this.width = size.width;
+  }
+}
 exports.Icon = Icon;

package/core/renderers/measurables/in_row_spacer.js

@@ -16,7 +16,6 @@
  */
 goog.module('Blockly.blockRendering.InRowSpacer');
 
-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,20 +25,23 @@ const {Types} = goog.require('Blockly.blockRendering.Types');
 /**
  * An object containing information about a spacer between two elements on a
  * row.
- * @param {!ConstantProvider} constants The rendering
- *   constants provider.
- * @param {number} width The width of the spacer.
- * @package
- * @constructor
  * @extends {Measurable}
+ * @struct
  * @alias Blockly.blockRendering.InRowSpacer
  */
-const InRowSpacer = function(constants, width) {
-  InRowSpacer.superClass_.constructor.call(this, constants);
-  this.type |= Types.SPACER | Types.IN_ROW_SPACER;
-  this.width = width;
-  this.height = this.constants_.SPACER_DEFAULT_HEIGHT;
-};
-object.inherits(InRowSpacer, Measurable);
+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/inline_input.js

@@ -16,7 +16,6 @@
  */
 goog.module('Blockly.blockRendering.InlineInput');
 
-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');
@@ -28,43 +27,54 @@ const {Types} = goog.require('Blockly.blockRendering.Types');
 /**
  * An object containing information about the space an inline input takes up
  * during rendering
- * @param {!ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Input} input The inline input to measure and store
- *     information for.
- * @package
- * @constructor
  * @extends {InputConnection}
+ * @struct
  * @alias Blockly.blockRendering.InlineInput
  */
-const InlineInput = function(constants, input) {
-  InlineInput.superClass_.constructor.call(this, constants, input);
-  this.type |= Types.INLINE_INPUT;
+class InlineInput extends InputConnection {
+  /**
+   * @param {!ConstantProvider} constants The rendering
+   *   constants provider.
+   * @param {!Input} input The inline input to measure and store
+   *     information for.
+   * @package
+   */
+  constructor(constants, input) {
+    super(constants, input);
+    this.type |= Types.INLINE_INPUT;
 
-  if (!this.connectedBlock) {
-    this.height = this.constants_.EMPTY_INLINE_INPUT_HEIGHT;
-    this.width = this.constants_.EMPTY_INLINE_INPUT_PADDING;
-  } else {
-    // 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.connectedBlockWidth;
-    this.height = this.connectedBlockHeight;
-  }
+    if (!this.connectedBlock) {
+      this.height = this.constants_.EMPTY_INLINE_INPUT_HEIGHT;
+      this.width = this.constants_.EMPTY_INLINE_INPUT_PADDING;
+    } else {
+      // 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.connectedBlockWidth;
+      this.height = this.connectedBlockHeight;
+    }
+
+    /** @type {number} */
+    this.connectionHeight = !this.isDynamicShape ?
+        this.shape.height :
+        this.shape.height(this.height);
+
+    /** @type {number} */
+    this.connectionWidth =
+        !this.isDynamicShape ? this.shape.width : this.shape.width(this.height);
+    if (!this.connectedBlock) {
+      this.width += this.connectionWidth * (this.isDynamicShape ? 2 : 1);
+    }
+
+    /** @type {number} */
+    this.connectionOffsetY = this.isDynamicShape ?
+        this.shape.connectionOffsetY(this.connectionHeight) :
+        this.constants_.TAB_OFFSET_FROM_TOP;
 
-  this.connectionHeight =
-      !this.isDynamicShape ? this.shape.height : this.shape.height(this.height);
-  this.connectionWidth =
-      !this.isDynamicShape ? this.shape.width : this.shape.width(this.height);
-  if (!this.connectedBlock) {
-    this.width += this.connectionWidth * (this.isDynamicShape ? 2 : 1);
+    /** @type {number} */
+    this.connectionOffsetX = this.isDynamicShape ?
+        this.shape.connectionOffsetX(this.connectionWidth) :
+        0;
   }
-  this.connectionOffsetY = this.isDynamicShape ?
-      this.shape.connectionOffsetY(this.connectionHeight) :
-      this.constants_.TAB_OFFSET_FROM_TOP;
-  this.connectionOffsetX = this.isDynamicShape ?
-      this.shape.connectionOffsetX(this.connectionWidth) :
-      0;
-};
-object.inherits(InlineInput, InputConnection);
+}
 
 exports.InlineInput = InlineInput;