blockly 7.20211209.2 → 8.0.0

package/core/renderers/measurables/top_row.js

@@ -14,11 +14,11 @@
  */
 goog.module('Blockly.blockRendering.TopRow');
 
-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 */
 const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const {Hat} = goog.require('Blockly.blockRendering.Hat');
 /* eslint-disable-next-line no-unused-vars */
 const {PreviousConnection} = goog.requireType('Blockly.blockRendering.PreviousConnection');
 const {Row} = goog.require('Blockly.blockRendering.Row');
@@ -32,109 +32,112 @@ const {Types} = goog.require('Blockly.blockRendering.Types');
  * connections.
  * After this constructor is called, the row will contain all non-spacer
  * elements it needs.
- * @param {!ConstantProvider} constants The rendering
- *   constants provider.
- * @package
- * @constructor
  * @extends {Row}
+ * @struct
  * @alias Blockly.blockRendering.TopRow
  */
-const TopRow = function(constants) {
-  TopRow.superClass_.constructor.call(this, constants);
-
-  this.type |= Types.TOP_ROW;
-
+class TopRow extends Row {
   /**
-   * The starting point for drawing the row, in the y direction.
-   * This allows us to draw hats and similar shapes that don't start at the
-   * origin. Must be non-negative (see #2820).
+   * @param {!ConstantProvider} constants The rendering
+   *   constants provider.
    * @package
-   * @type {number}
    */
-  this.capline = 0;
+  constructor(constants) {
+    super(constants);
+
+    this.type |= Types.TOP_ROW;
+
+    /**
+     * The starting point for drawing the row, in the y direction.
+     * This allows us to draw hats and similar shapes that don't start at the
+     * origin. Must be non-negative (see #2820).
+     * @package
+     * @type {number}
+     */
+    this.capline = 0;
+
+    /**
+     * How much the row extends up above its capline.
+     * @type {number}
+     */
+    this.ascenderHeight = 0;
+
+    /**
+     * Whether the block has a previous connection.
+     * @package
+     * @type {boolean}
+     */
+    this.hasPreviousConnection = false;
+
+    /**
+     * The previous connection on the block, if any.
+     * @type {PreviousConnection}
+     */
+    this.connection = null;
+  }
 
   /**
-   * How much the row extends up above its capline.
-   * @type {number}
+   * Returns whether or not the top row has a left square corner.
+   * @param {!BlockSvg} block The block whose top row this represents.
+   * @return {boolean} Whether or not the top row has a left square corner.
    */
-  this.ascenderHeight = 0;
+  hasLeftSquareCorner(block) {
+    const hasHat =
+        (block.hat ? block.hat === 'cap' : this.constants_.ADD_START_HATS) &&
+        !block.outputConnection && !block.previousConnection;
+    const prevBlock = block.getPreviousBlock();
+
+    return !!block.outputConnection || hasHat ||
+        (prevBlock ? prevBlock.getNextBlock() === block : false);
+  }
 
   /**
-   * Whether the block has a previous connection.
-   * @package
-   * @type {boolean}
+   * Returns whether or not the top row has a right square corner.
+   * @param {!BlockSvg} _block The block whose top row this represents.
+   * @return {boolean} Whether or not the top row has a right square corner.
    */
-  this.hasPreviousConnection = false;
+  hasRightSquareCorner(_block) {
+    return true;
+  }
 
   /**
-   * The previous connection on the block, if any.
-   * @type {PreviousConnection}
+   * @override
    */
-  this.connection = null;
-};
-object.inherits(TopRow, Row);
-
-/**
- * Returns whether or not the top row has a left square corner.
- * @param {!BlockSvg} block The block whose top row this represents.
- * @return {boolean} Whether or not the top row has a left square corner.
- */
-TopRow.prototype.hasLeftSquareCorner = function(block) {
-  const hasHat =
-      (block.hat ? block.hat === 'cap' : this.constants_.ADD_START_HATS) &&
-      !block.outputConnection && !block.previousConnection;
-  const prevBlock = block.getPreviousBlock();
-
-  return !!block.outputConnection || hasHat ||
-      (prevBlock ? prevBlock.getNextBlock() === block : false);
-};
-
-/**
- * Returns whether or not the top row has a right square corner.
- * @param {!BlockSvg} _block The block whose top row this represents.
- * @return {boolean} Whether or not the top row has a right square corner.
- */
-TopRow.prototype.hasRightSquareCorner = function(_block) {
-  return true;
-};
-
-/**
- * @override
- */
-TopRow.prototype.measure = function() {
-  let height = 0;
-  let width = 0;
-  let ascenderHeight = 0;
-  for (let i = 0; i < this.elements.length; i++) {
-    const elem = this.elements[i];
-    width += elem.width;
-    if (!(Types.isSpacer(elem))) {
-      if (Types.isHat(elem)) {
-        ascenderHeight = Math.max(ascenderHeight, elem.ascenderHeight);
-      } else {
-        height = Math.max(height, elem.height);
+  measure() {
+    let height = 0;
+    let width = 0;
+    let ascenderHeight = 0;
+    for (let i = 0; i < this.elements.length; i++) {
+      const elem = this.elements[i];
+      width += elem.width;
+      if (!(Types.isSpacer(elem))) {
+        if (Types.isHat(elem) && elem instanceof Hat) {
+          ascenderHeight = Math.max(ascenderHeight, elem.ascenderHeight);
+        } else {
+          height = Math.max(height, elem.height);
+        }
       }
     }
+    this.width = Math.max(this.minWidth, width);
+    this.height = Math.max(this.minHeight, height) + ascenderHeight;
+    this.ascenderHeight = ascenderHeight;
+    this.capline = this.ascenderHeight;
+    this.widthWithConnectedBlocks = this.width;
   }
-  this.width = Math.max(this.minWidth, width);
-  this.height = Math.max(this.minHeight, height) + ascenderHeight;
-  this.ascenderHeight = ascenderHeight;
-  this.capline = this.ascenderHeight;
-  this.widthWithConnectedBlocks = this.width;
-};
 
-/**
- * @override
- */
-TopRow.prototype.startsWithElemSpacer = function() {
-  return false;
-};
+  /**
+   * @override
+   */
+  startsWithElemSpacer() {
+    return false;
+  }
 
-/**
- * @override
- */
-TopRow.prototype.endsWithElemSpacer = function() {
-  return false;
-};
+  /**
+   * @override
+   */
+  endsWithElemSpacer() {
+    return false;
+  }
+}
 
 exports.TopRow = TopRow;

package/core/renderers/minimalist/constants.js

@@ -17,20 +17,21 @@
  */
 goog.module('Blockly.minimalist.ConstantProvider');
 
-const object = goog.require('Blockly.utils.object');
 const {ConstantProvider: BaseConstantProvider} = goog.require('Blockly.blockRendering.ConstantProvider');
 
 
 /**
  * An object that provides constants for rendering blocks in the sample.
- * @constructor
- * @package
  * @extends {BaseConstantProvider}
  * @alias Blockly.minimalist.ConstantProvider
  */
-const ConstantProvider = function() {
-  ConstantProvider.superClass_.constructor.call(this);
-};
-object.inherits(ConstantProvider, BaseConstantProvider);
+class ConstantProvider extends BaseConstantProvider {
+  /**
+   * @package
+   */
+  constructor() {
+    super();
+  }
+}
 
 exports.ConstantProvider = ConstantProvider;

package/core/renderers/minimalist/drawer.js

@@ -15,7 +15,6 @@
  */
 goog.module('Blockly.minimalist.Drawer');
 
-const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 const {Drawer: BaseDrawer} = goog.require('Blockly.blockRendering.Drawer');
@@ -25,17 +24,19 @@ const {RenderInfo} = goog.requireType('Blockly.minimalist.RenderInfo');
 
 /**
  * An object that draws a block based on the given rendering information.
- * @param {!BlockSvg} block The block to render.
- * @param {!RenderInfo} info An object containing all
- *   information needed to render this block.
- * @package
- * @constructor
  * @extends {BaseDrawer}
  * @alias Blockly.minimalist.Drawer
  */
-const Drawer = function(block, info) {
-  Drawer.superClass_.constructor.call(this, block, info);
-};
-object.inherits(Drawer, BaseDrawer);
+class Drawer extends BaseDrawer {
+  /**
+   * @param {!BlockSvg} block The block to render.
+   * @param {!RenderInfo} info An object containing all
+   *   information needed to render this block.
+   * @package
+   */
+  constructor(block, info) {
+    super(block, info);
+  }
+}
 
 exports.Drawer = Drawer;

package/core/renderers/minimalist/info.js

@@ -15,7 +15,6 @@
  */
 goog.module('Blockly.minimalist.RenderInfo');
 
-const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 const {RenderInfo: BaseRenderInfo} = goog.require('Blockly.blockRendering.RenderInfo');
@@ -29,26 +28,27 @@ const {Renderer} = goog.requireType('Blockly.minimalist.Renderer');
  * This measure pass does not propagate changes to the block (although fields
  * may choose to rerender when getSize() is called).  However, calling it
  * repeatedly may be expensive.
- *
- * @param {!Renderer} renderer The renderer in use.
- * @param {!BlockSvg} block The block to measure.
- * @constructor
- * @package
  * @extends {BaseRenderInfo}
  * @alias Blockly.minimalist.RenderInfo
  */
-const RenderInfo = function(renderer, block) {
-  RenderInfo.superClass_.constructor.call(this, renderer, block);
-};
-object.inherits(RenderInfo, BaseRenderInfo);
+class RenderInfo extends BaseRenderInfo {
+  /**
+   * @param {!Renderer} renderer The renderer in use.
+   * @param {!BlockSvg} block The block to measure.
+   * @package
+   */
+  constructor(renderer, block) {
+    super(renderer, block);
+  }
 
-/**
- * Get the block renderer in use.
- * @return {!Renderer} The block renderer in use.
- * @package
- */
-RenderInfo.prototype.getRenderer = function() {
-  return /** @type {!Renderer} */ (this.renderer_);
-};
+  /**
+   * Get the block renderer in use.
+   * @return {!Renderer} The block renderer in use.
+   * @package
+   */
+  getRenderer() {
+    return /** @type {!Renderer} */ (this.renderer_);
+  }
+}
 
 exports.RenderInfo = RenderInfo;

package/core/renderers/minimalist/renderer.js

@@ -16,7 +16,6 @@
 goog.module('Blockly.minimalist.Renderer');
 
 const blockRendering = goog.require('Blockly.blockRendering');
-const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 const {ConstantProvider} = goog.require('Blockly.minimalist.ConstantProvider');
@@ -29,50 +28,52 @@ const {Renderer: BaseRenderer} = goog.require('Blockly.blockRendering.Renderer')
 
 /**
  * The minimalist renderer.
- * @param {string} name The renderer name.
- * @package
- * @constructor
  * @extends {BaseRenderer}
  * @alias Blockly.minimalist.Renderer
  */
-const Renderer = function(name) {
-  Renderer.superClass_.constructor.call(this, name);
-};
-object.inherits(Renderer, BaseRenderer);
+class Renderer extends BaseRenderer {
+  /**
+   * @param {string} name The renderer name.
+   * @package
+   */
+  constructor(name) {
+    super(name);
+  }
 
-/**
- * Create a new instance of the renderer's constant provider.
- * @return {!ConstantProvider} The constant provider.
- * @protected
- * @override
- */
-Renderer.prototype.makeConstants_ = function() {
-  return new ConstantProvider();
-};
+  /**
+   * Create a new instance of the renderer's constant provider.
+   * @return {!ConstantProvider} The constant provider.
+   * @protected
+   * @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
- */
-Renderer.prototype.makeRenderInfo_ = function(block) {
-  return new RenderInfo(this, block);
-};
+  /**
+   * 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
- */
-Renderer.prototype.makeDrawer_ = function(block, info) {
-  return new Drawer(block, /** @type {!RenderInfo} */ (info));
-};
+  /**
+   * 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));
+  }
+}
 
 blockRendering.register('minimalist', Renderer);