Move the base Measurable class to its own file

2026-01-10 02:17:09 +01:00 · 2019-08-19 11:57:47 -07:00
parent 94e1c77975
commit 981761f7da
3 changed files with 186 additions and 152 deletions
--- a/blockly_uncompressed.js
+++ b/blockly_uncompressed.js
@@ -106,7 +106,8 @@ goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/
 goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/block_rendering.js", ['Blockly.blockRendering'], ['Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.RenderInfo']);
 goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/block_rendering_constants.js", ['Blockly.blockRendering.constants'], ['Blockly.utils.svgPaths']);
 goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/highlight_constants.js", ['Blockly.blockRendering.highlightConstants'], ['Blockly.blockRendering.constants', 'Blockly.utils.svgPaths']);
-goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/measurables.js", ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Input', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.constants']);
+goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/measurables.js", ['Blockly.blockRendering.Input', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.constants', 'Blockly.blockRendering.Measurable']);
+goog.addDependency("../../../" + dir + "/core/renderers/measurables/base.js", ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.constants']);
 goog.addDependency("../../../" + dir + "/core/renderers/measurables/rows.js", ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.constants', 'Blockly.blockRendering.Input', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.RenderedConnection']);
 goog.addDependency("../../../" + dir + "/core/scrollbar.js", ['Blockly.Scrollbar', 'Blockly.ScrollbarPair'], ['Blockly.Touch', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.dom']);
 goog.addDependency("../../../" + dir + "/core/theme.js", ['Blockly.Theme'], []);
--- a/core/renderers/block_rendering_rewrite/measurables.js
+++ b/core/renderers/block_rendering_rewrite/measurables.js
@@ -1,161 +1,12 @@
-goog.provide('Blockly.blockRendering.Measurable');
+
 goog.provide('Blockly.blockRendering.Input');
 goog.provide('Blockly.blockRendering.InRowSpacer');
 goog.provide('Blockly.blockRendering.NextConnection');
 goog.provide('Blockly.blockRendering.PreviousConnection');

 goog.require('Blockly.blockRendering.constants');
+goog.require('Blockly.blockRendering.Measurable');

-/**
- * The base class to represent a part of a block that takes up space during
- * rendering.  The constructor for each non-spacer Measurable records the size
- * of the block element (e.g. field, statement input).
- * @package
- * @constructor
- */
-Blockly.blockRendering.Measurable = function() {
-  this.isInput = false;
-  this.width = 0;
-  this.height = 0;
-  this.type = null;
-
-  this.xPos = 0;
-  this.centerline = 0;
-};
-
-/**
- * The shape object to use when drawing input and output connections.
- * TODO (#2803): Formalize type annotations for these objects.
- * @type {Object}
- */
-Blockly.blockRendering.Measurable.prototype.connectionShape =
-    Blockly.blockRendering.constants.PUZZLE_TAB;
-
-/**
- * The shape object to use when drawing previous and next connections.
- * TODO (#2803): Formalize type annotations for these objects.
- * @type {Object}
- */
-Blockly.blockRendering.Measurable.prototype.notchShape =
-    Blockly.blockRendering.constants.NOTCH;
-
-// TODO: We may remove these helper functions if all of them end up being direct
-// checks against types.
-
-/**
- * Whether this stores information about a field.
- * @return {boolean} True if this object stores information about a field.
- * @package
- */
-Blockly.blockRendering.Measurable.prototype.isField = function() {
-  return this.type == 'field';
-};
-
-/**
- * Whether this stores information about a hat.
- * @return {boolean} True if this object stores information about a hat.
- * @package
- */
-Blockly.blockRendering.Measurable.prototype.isHat = function() {
-  return this.type == 'hat';
-};
-
-/**
- * Whether this stores information about an icon.
- * @return {boolean} True if this object stores information about an icon.
- * @package
- */
-Blockly.blockRendering.Measurable.prototype.isIcon = function() {
-  return this.type == 'icon';
-};
-
-/**
- * Whether this stores information about a spacer.
- * @return {boolean} True if this object stores information about a spacer.
- * @package
- */
-Blockly.blockRendering.Measurable.prototype.isSpacer = function() {
-  return this.type == 'between-row spacer' || this.type == 'in-row spacer';
-};
-
-/**
- * Whether this stores information about an external input.
- * @return {boolean} True if this object stores information about an external
- * input.
- * @package
- */
-Blockly.blockRendering.Measurable.prototype.isExternalInput = function() {
-  return this.type == 'external value input';
-};
-
-/**
- * Whether this stores information about a inline input.
- * @return {boolean} True if this object stores information about a inline
- * input.
- * @package
- */
-Blockly.blockRendering.Measurable.prototype.isInlineInput = function() {
-  return this.type == 'inline input';
-};
-
-/**
- * Whether this stores information about a statement input.
- * @return {boolean} True if this object stores information about a statement
- * input.
- * @package
- */
-Blockly.blockRendering.Measurable.prototype.isStatementInput = function() {
-  return this.type == 'statement input';
-};
-
-/**
- * Whether this stores information about a previous connection.
- * @return {boolean} True if this object stores information about a previous
- * connection.
- * @package
- */
-Blockly.blockRendering.Measurable.prototype.isPreviousConnection = function() {
-  return this.type == 'previous connection';
-};
-
-/**
- * Whether this stores information about a next connection.
- * @return {boolean} True if this object stores information about an next
- * connection.
- * @package
- */
-Blockly.blockRendering.Measurable.prototype.isNextConnection = function() {
-  return this.type == 'next connection';
-};
-
-/**
- * Whether this stores information about a rounded corner.
- * @return {boolean} True if this object stores information about an rounded
- * corner.
- * @package
- */
-Blockly.blockRendering.Measurable.prototype.isRoundedCorner = function() {
-  return this.type == 'round corner';
-};
-
-/**
- * Whether this stores information about a square corner.
- * @return {boolean} True if this object stores information about an square
- * corner.
- * @package
- */
-Blockly.blockRendering.Measurable.prototype.isSquareCorner = function() {
-  return this.type == 'square corner';
-};
-
-/**
- * Whether this stores information about a jagged edge.
- * @return {boolean} True if this object stores information about a jagged edge.
- * @package
- */
-Blockly.blockRendering.Measurable.prototype.isJaggedEdge = function() {
-  return this.type == 'jagged edge';
-};

 /**
 * The base class to represent an input that takes up space on a block
--- a/core/renderers/measurables/base.js
+++ b/core/renderers/measurables/base.js
@@ -0,0 +1,182 @@
+/**
+ * @license
+ * Visual Blocks Editor
+ *
+ * Copyright 2019 Google Inc.
+ * https://developers.google.com/blockly/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @fileoverview Methods for graphically rendering a block as SVG.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+'use strict';
+
+goog.provide('Blockly.blockRendering.Measurable');
+
+goog.require('Blockly.blockRendering.constants');
+
+
+/**
+ * The base class to represent a part of a block that takes up space during
+ * rendering.  The constructor for each non-spacer Measurable records the size
+ * of the block element (e.g. field, statement input).
+ * @package
+ * @constructor
+ */
+Blockly.blockRendering.Measurable = function() {
+  this.isInput = false;
+  this.width = 0;
+  this.height = 0;
+  this.type = null;
+
+  this.xPos = 0;
+  this.centerline = 0;
+};
+
+/**
+ * The shape object to use when drawing input and output connections.
+ * TODO (#2803): Formalize type annotations for these objects.
+ * @type {Object}
+ */
+Blockly.blockRendering.Measurable.prototype.connectionShape =
+    Blockly.blockRendering.constants.PUZZLE_TAB;
+
+/**
+ * The shape object to use when drawing previous and next connections.
+ * TODO (#2803): Formalize type annotations for these objects.
+ * @type {Object}
+ */
+Blockly.blockRendering.Measurable.prototype.notchShape =
+    Blockly.blockRendering.constants.NOTCH;
+
+// TODO: We may remove these helper functions if all of them end up being direct
+// checks against types.
+
+/**
+ * Whether this stores information about a field.
+ * @return {boolean} True if this object stores information about a field.
+ * @package
+ */
+Blockly.blockRendering.Measurable.prototype.isField = function() {
+  return this.type == 'field';
+};
+
+/**
+ * Whether this stores information about a hat.
+ * @return {boolean} True if this object stores information about a hat.
+ * @package
+ */
+Blockly.blockRendering.Measurable.prototype.isHat = function() {
+  return this.type == 'hat';
+};
+
+/**
+ * Whether this stores information about an icon.
+ * @return {boolean} True if this object stores information about an icon.
+ * @package
+ */
+Blockly.blockRendering.Measurable.prototype.isIcon = function() {
+  return this.type == 'icon';
+};
+
+/**
+ * Whether this stores information about a spacer.
+ * @return {boolean} True if this object stores information about a spacer.
+ * @package
+ */
+Blockly.blockRendering.Measurable.prototype.isSpacer = function() {
+  return this.type == 'between-row spacer' || this.type == 'in-row spacer';
+};
+
+/**
+ * Whether this stores information about an external input.
+ * @return {boolean} True if this object stores information about an external
+ * input.
+ * @package
+ */
+Blockly.blockRendering.Measurable.prototype.isExternalInput = function() {
+  return this.type == 'external value input';
+};
+
+/**
+ * Whether this stores information about a inline input.
+ * @return {boolean} True if this object stores information about a inline
+ * input.
+ * @package
+ */
+Blockly.blockRendering.Measurable.prototype.isInlineInput = function() {
+  return this.type == 'inline input';
+};
+
+/**
+ * Whether this stores information about a statement input.
+ * @return {boolean} True if this object stores information about a statement
+ * input.
+ * @package
+ */
+Blockly.blockRendering.Measurable.prototype.isStatementInput = function() {
+  return this.type == 'statement input';
+};
+
+/**
+ * Whether this stores information about a previous connection.
+ * @return {boolean} True if this object stores information about a previous
+ * connection.
+ * @package
+ */
+Blockly.blockRendering.Measurable.prototype.isPreviousConnection = function() {
+  return this.type == 'previous connection';
+};
+
+/**
+ * Whether this stores information about a next connection.
+ * @return {boolean} True if this object stores information about an next
+ * connection.
+ * @package
+ */
+Blockly.blockRendering.Measurable.prototype.isNextConnection = function() {
+  return this.type == 'next connection';
+};
+
+/**
+ * Whether this stores information about a rounded corner.
+ * @return {boolean} True if this object stores information about an rounded
+ * corner.
+ * @package
+ */
+Blockly.blockRendering.Measurable.prototype.isRoundedCorner = function() {
+  return this.type == 'round corner';
+};
+
+/**
+ * Whether this stores information about a square corner.
+ * @return {boolean} True if this object stores information about an square
+ * corner.
+ * @package
+ */
+Blockly.blockRendering.Measurable.prototype.isSquareCorner = function() {
+  return this.type == 'square corner';
+};
+
+/**
+ * Whether this stores information about a jagged edge.
+ * @return {boolean} True if this object stores information about a jagged edge.
+ * @package
+ */
+Blockly.blockRendering.Measurable.prototype.isJaggedEdge = function() {
+  return this.type == 'jagged edge';
+};