From ce662f43d91ff2e3f0c9d4e6d9c531dd37559b3f Mon Sep 17 00:00:00 2001 From: kozbial Date: Thu, 12 Aug 2021 16:41:57 -0700 Subject: [PATCH] Migrate core/renderers/thrasos/info.js named requires --- core/renderers/thrasos/info.js | 138 +++++++++++++++++---------------- 1 file changed, 70 insertions(+), 68 deletions(-) diff --git a/core/renderers/thrasos/info.js b/core/renderers/thrasos/info.js index edfdb8b9d..46716de34 100644 --- a/core/renderers/thrasos/info.js +++ b/core/renderers/thrasos/info.js @@ -14,14 +14,16 @@ goog.module('Blockly.thrasos.RenderInfo'); goog.module.declareLegacyNamespace(); -goog.require('Blockly.blockRendering.InRowSpacer'); -goog.require('Blockly.blockRendering.RenderInfo'); -goog.require('Blockly.blockRendering.Types'); -goog.require('Blockly.utils.object'); - -goog.requireType('Blockly.blockRendering.Field'); -goog.requireType('Blockly.BlockSvg'); -goog.requireType('Blockly.thrasos.Renderer'); +const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); +/* eslint-disable-next-line no-unused-vars */ +const BlockSvg = goog.requireType('Blockly.BlockSvg'); +/* eslint-disable-next-line no-unused-vars */ +const Field = goog.requireType('Blockly.blockRendering.Field'); +const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer'); +/* eslint-disable-next-line no-unused-vars */ +const Renderer = goog.requireType('Blockly.thrasos.Renderer'); +const Types = goog.require('Blockly.blockRendering.Types'); +const object = goog.require('Blockly.utils.object'); /** @@ -31,25 +33,25 @@ goog.requireType('Blockly.thrasos.Renderer'); * may choose to rerender when getSize() is called). However, calling it * repeatedly may be expensive. * - * @param {!Blockly.thrasos.Renderer} renderer The renderer in use. - * @param {!Blockly.BlockSvg} block The block to measure. + * @param {!Renderer} renderer The renderer in use. + * @param {!BlockSvg} block The block to measure. * @constructor * @package - * @extends {Blockly.blockRendering.RenderInfo} + * @extends {BaseRenderInfo} */ const RenderInfo = function(renderer, block) { RenderInfo.superClass_.constructor.call(this, renderer, block); }; -Blockly.utils.object.inherits(RenderInfo, - Blockly.blockRendering.RenderInfo); +object.inherits(RenderInfo, + BaseRenderInfo); /** * Get the block renderer in use. - * @return {!Blockly.thrasos.Renderer} The block renderer in use. + * @return {!Renderer} The block renderer in use. * @package */ RenderInfo.prototype.getRenderer = function() { - return /** @type {!Blockly.thrasos.Renderer} */ (this.renderer_); + return /** @type {!Renderer} */ (this.renderer_); }; /** @@ -71,14 +73,14 @@ RenderInfo.prototype.addElemSpacing_ = function() { // No spacing needed before the corner on the top row or the bottom row. if (row.startsWithElemSpacer()) { // There's a spacer before the first element in the row. - row.elements.push(new Blockly.blockRendering.InRowSpacer( + row.elements.push(new InRowSpacer( this.constants_, this.getInRowSpacing_(null, oldElems[0]))); } for (let e = 0; e < oldElems.length - 1; e++) { row.elements.push(oldElems[e]); const spacing = this.getInRowSpacing_(oldElems[e], oldElems[e + 1]); row.elements.push( - new Blockly.blockRendering.InRowSpacer(this.constants_, spacing)); + new InRowSpacer(this.constants_, spacing)); } row.elements.push(oldElems[oldElems.length - 1]); if (row.endsWithElemSpacer()) { @@ -87,7 +89,7 @@ RenderInfo.prototype.addElemSpacing_ = function() { spacing += this.constants_.TAB_WIDTH; } // There's a spacer after the last element in the row. - row.elements.push(new Blockly.blockRendering.InRowSpacer( + row.elements.push(new InRowSpacer( this.constants_, spacing)); } } @@ -99,15 +101,15 @@ RenderInfo.prototype.addElemSpacing_ = function() { RenderInfo.prototype.getInRowSpacing_ = function(prev, next) { if (!prev) { // Between an editable field and the beginning of the row. - if (next && Blockly.blockRendering.Types.isField(next) && - (/** @type {Blockly.blockRendering.Field} */ (next)).isEditable) { + if (next && Types.isField(next) && + (/** @type {Field} */ (next)).isEditable) { return this.constants_.MEDIUM_PADDING; } // Inline input at the beginning of the row. - if (next && Blockly.blockRendering.Types.isInlineInput(next)) { + if (next && Types.isInlineInput(next)) { return this.constants_.MEDIUM_LARGE_PADDING; } - if (next && Blockly.blockRendering.Types.isStatementInput(next)) { + if (next && Types.isStatementInput(next)) { return this.constants_.STATEMENT_INPUT_PADDING_LEFT; } // Anything else at the beginning of the row. @@ -115,29 +117,29 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) { } // Spacing between a non-input and the end of the row. - if (!Blockly.blockRendering.Types.isInput(prev) && !next) { + if (!Types.isInput(prev) && !next) { // Between an editable field and the end of the row. - if (Blockly.blockRendering.Types.isField(prev) && - (/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable) { + if (Types.isField(prev) && + (/** @type {Field} */ (prev)).isEditable) { return this.constants_.MEDIUM_PADDING; } // Padding at the end of an icon-only row to make the block shape clearer. - if (Blockly.blockRendering.Types.isIcon(prev)) { + if (Types.isIcon(prev)) { return (this.constants_.LARGE_PADDING * 2) + 1; } - if (Blockly.blockRendering.Types.isHat(prev)) { + if (Types.isHat(prev)) { return this.constants_.NO_PADDING; } // Establish a minimum width for a block with a previous or next connection. - if (Blockly.blockRendering.Types.isPreviousOrNextConnection(prev)) { + if (Types.isPreviousOrNextConnection(prev)) { return this.constants_.LARGE_PADDING; } // Between rounded corner and the end of the row. - if (Blockly.blockRendering.Types.isLeftRoundedCorner(prev)) { + if (Types.isLeftRoundedCorner(prev)) { return this.constants_.MIN_BLOCK_WIDTH; } // Between a jagged edge and the end of the row. - if (Blockly.blockRendering.Types.isJaggedEdge(prev)) { + if (Types.isJaggedEdge(prev)) { return this.constants_.NO_PADDING; } // Between noneditable fields and icons and the end of the row. @@ -145,33 +147,33 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) { } // Between inputs and the end of the row. - if (Blockly.blockRendering.Types.isInput(prev) && !next) { - if (Blockly.blockRendering.Types.isExternalInput(prev)) { + if (Types.isInput(prev) && !next) { + if (Types.isExternalInput(prev)) { return this.constants_.NO_PADDING; - } else if (Blockly.blockRendering.Types.isInlineInput(prev)) { + } else if (Types.isInlineInput(prev)) { return this.constants_.LARGE_PADDING; - } else if (Blockly.blockRendering.Types.isStatementInput(prev)) { + } else if (Types.isStatementInput(prev)) { return this.constants_.NO_PADDING; } } // Spacing between a non-input and an input. - if (!Blockly.blockRendering.Types.isInput(prev) && - next && Blockly.blockRendering.Types.isInput(next)) { + if (!Types.isInput(prev) && + next && Types.isInput(next)) { // Between an editable field and an input. - if (Blockly.blockRendering.Types.isField(prev) && - (/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable) { - if (Blockly.blockRendering.Types.isInlineInput(next)) { + if (Types.isField(prev) && + (/** @type {Field} */ (prev)).isEditable) { + if (Types.isInlineInput(next)) { return this.constants_.SMALL_PADDING; - } else if (Blockly.blockRendering.Types.isExternalInput(next)) { + } else if (Types.isExternalInput(next)) { return this.constants_.SMALL_PADDING; } } else { - if (Blockly.blockRendering.Types.isInlineInput(next)) { + if (Types.isInlineInput(next)) { return this.constants_.MEDIUM_LARGE_PADDING; - } else if (Blockly.blockRendering.Types.isExternalInput(next)) { + } else if (Types.isExternalInput(next)) { return this.constants_.MEDIUM_LARGE_PADDING; - } else if (Blockly.blockRendering.Types.isStatementInput(next)) { + } else if (Types.isStatementInput(next)) { return this.constants_.LARGE_PADDING; } } @@ -179,16 +181,16 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) { } // Spacing between an icon and an icon or field. - if (Blockly.blockRendering.Types.isIcon(prev) && - next && !Blockly.blockRendering.Types.isInput(next)) { + if (Types.isIcon(prev) && + next && !Types.isInput(next)) { return this.constants_.LARGE_PADDING; } // Spacing between an inline input and a field. - if (Blockly.blockRendering.Types.isInlineInput(prev) && - next && Blockly.blockRendering.Types.isField(next)) { + if (Types.isInlineInput(prev) && + next && Types.isField(next)) { // Editable field after inline input. - if ((/** @type {Blockly.blockRendering.Field} */ (next)).isEditable) { + if ((/** @type {Field} */ (next)).isEditable) { return this.constants_.MEDIUM_PADDING; } else { // Noneditable field after inline input. @@ -196,33 +198,33 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) { } } - if (Blockly.blockRendering.Types.isLeftSquareCorner(prev) && next) { + if (Types.isLeftSquareCorner(prev) && next) { // Spacing between a hat and a corner - if (Blockly.blockRendering.Types.isHat(next)) { + if (Types.isHat(next)) { return this.constants_.NO_PADDING; } // Spacing between a square corner and a previous or next connection - if (Blockly.blockRendering.Types.isPreviousConnection(next) || - Blockly.blockRendering.Types.isNextConnection(next)) { + if (Types.isPreviousConnection(next) || + Types.isNextConnection(next)) { return next.notchOffset; } } // Spacing between a rounded corner and a previous or next connection. - if (Blockly.blockRendering.Types.isLeftRoundedCorner(prev) && next) { + if (Types.isLeftRoundedCorner(prev) && next) { return next.notchOffset - this.constants_.CORNER_RADIUS; } // Spacing between two fields of the same editability. - if (Blockly.blockRendering.Types.isField(prev) && - next && Blockly.blockRendering.Types.isField(next) && - ((/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable == - (/** @type {Blockly.blockRendering.Field} */ (next)).isEditable)) { + if (Types.isField(prev) && + next && Types.isField(next) && + ((/** @type {Field} */ (prev)).isEditable == + (/** @type {Field} */ (next)).isEditable)) { return this.constants_.LARGE_PADDING; } // Spacing between anything and a jagged edge. - if (next && Blockly.blockRendering.Types.isJaggedEdge(next)) { + if (next && Types.isJaggedEdge(next)) { return this.constants_.LARGE_PADDING; } @@ -235,13 +237,13 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) { RenderInfo.prototype.getSpacerRowHeight_ = function( prev, next) { // If we have an empty block add a spacer to increase the height. - if (Blockly.blockRendering.Types.isTopRow(prev) && - Blockly.blockRendering.Types.isBottomRow(next)) { + if (Types.isTopRow(prev) && + Types.isBottomRow(next)) { return this.constants_.EMPTY_BLOCK_SPACER_HEIGHT; } // Top and bottom rows act as a spacer so we don't need any extra padding. - if (Blockly.blockRendering.Types.isTopRow(prev) || - Blockly.blockRendering.Types.isBottomRow(next)) { + if (Types.isTopRow(prev) || + Types.isBottomRow(next)) { return this.constants_.NO_PADDING; } if (prev.hasExternalInput && next.hasExternalInput) { @@ -263,25 +265,25 @@ RenderInfo.prototype.getSpacerRowHeight_ = function( * @override */ RenderInfo.prototype.getElemCenterline_ = function(row, elem) { - if (Blockly.blockRendering.Types.isSpacer(elem)) { + if (Types.isSpacer(elem)) { return row.yPos + elem.height / 2; } - if (Blockly.blockRendering.Types.isBottomRow(row)) { + if (Types.isBottomRow(row)) { const baseline = row.yPos + row.height - row.descenderHeight; - if (Blockly.blockRendering.Types.isNextConnection(elem)) { + if (Types.isNextConnection(elem)) { return baseline + elem.height / 2; } return baseline - elem.height / 2; } - if (Blockly.blockRendering.Types.isTopRow(row)) { - if (Blockly.blockRendering.Types.isHat(elem)) { + if (Types.isTopRow(row)) { + if (Types.isHat(elem)) { return row.capline - elem.height / 2; } return row.capline + elem.height / 2; } let result = row.yPos; - if (Blockly.blockRendering.Types.isField(elem) && row.hasStatement) { + if (Types.isField(elem) && row.hasStatement) { const offset = this.constants_.TALL_INPUT_FIELD_OFFSET_Y + elem.height / 2; result += offset;