blockly 9.0.0-beta.0 → 9.0.0-beta.2

package/core/renderers/measurables/input_connection.ts

@@ -1,66 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Class representing inputs with connections on a rendered block.
- */
-
-/**
- * Class representing inputs with connections on a rendered block.
- * @class
- */
-import * as goog from '../../../closure/goog/goog.js';
-goog.declareModuleId('Blockly.blockRendering.InputConnection');
-
-import type {BlockSvg} from '../../block_svg.js';
-import type {Input} from '../../input.js';
-import type {RenderedConnection} from '../../rendered_connection.js';
-import type {ConstantProvider} from '../common/constants.js';
-
-import {Connection} from './connection.js';
-import {Types} from './types.js';
-
-
-/**
- * The base class to represent an input that takes up space on a block
- * during rendering
- * @alias Blockly.blockRendering.InputConnection
- */
-export class InputConnection extends Connection {
-  align: number;
-  connectedBlock: BlockSvg|null;
-  connectedBlockWidth: number;
-  connectedBlockHeight: number;
-  connectionOffsetX: number = 0;
-  connectionOffsetY: number = 0;
-
-  /**
-   * @param constants The rendering constants provider.
-   * @param input The input to measure and store information for.
-   * @internal
-   */
-  constructor(constants: ConstantProvider, public input: Input) {
-    super(constants, input.connection as RenderedConnection);
-
-    this.type |= Types.INPUT;
-
-    this.align = input.align;
-
-    this.connectedBlock =
-        (input.connection && input.connection.targetBlock() ?
-             input.connection.targetBlock() as BlockSvg :
-             null);
-
-    if (this.connectedBlock) {
-      const bBox = this.connectedBlock.getHeightWidth();
-      this.connectedBlockWidth = bBox.width;
-      this.connectedBlockHeight = bBox.height;
-    } else {
-      this.connectedBlockWidth = 0;
-      this.connectedBlockHeight = 0;
-    }
-  }
-}

package/core/renderers/measurables/input_row.ts

@@ -1,82 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Object representing a row that holds one or more inputs on a
- * rendered block.
- */
-
-/**
- * Object representing a row that holds one or more inputs on a
- * rendered block.
- * @class
- */
-import * as goog from '../../../closure/goog/goog.js';
-goog.declareModuleId('Blockly.blockRendering.InputRow');
-
-import type {ConstantProvider} from '../common/constants.js';
-
-import {ExternalValueInput} from './external_value_input.js';
-import {InputConnection} from './input_connection.js';
-import {Row} from './row.js';
-import {StatementInput} from './statement_input.js';
-import {Types} from './types.js';
-
-
-/**
- * An object containing information about a row that holds one or more inputs.
- * @struct
- * @alias Blockly.blockRendering.InputRow
- */
-export class InputRow extends Row {
-  /**
-   * The total width of all blocks connected to this row.
-   * @internal
-   */
-  connectedBlockWidths = 0;
-
-  /**
-   * @param constants The rendering constants provider.
-   * @internal
-   */
-  constructor(constants: ConstantProvider) {
-    super(constants);
-    this.type |= Types.INPUT_ROW;
-  }
-
-  /**
-   * Inspect all subcomponents and populate all size properties on the row.
-   * @internal
-   */
-  override 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);
-      }
-    }
-    this.connectedBlockWidths = connectedBlockWidths;
-    this.widthWithConnectedBlocks = this.width + connectedBlockWidths;
-  }
-
-  override endsWithElemSpacer() {
-    return !this.hasExternalInput && !this.hasStatement;
-  }
-}

package/core/renderers/measurables/jagged_edge.ts

@@ -1,43 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Objects representing a jagged edge in a row of a rendered
- * block.
- */
-
-/**
- * Objects representing a jagged edge in a row of a rendered
- * block.
- * @class
- */
-import * as goog from '../../../closure/goog/goog.js';
-goog.declareModuleId('Blockly.blockRendering.JaggedEdge');
-
-import type {ConstantProvider} from '../common/constants.js';
-
-import {Measurable} from './base.js';
-import {Types} from './types.js';
-
-
-/**
- * An object containing information about the jagged edge of a collapsed block
- * takes up during rendering
- * @struct
- * @alias Blockly.blockRendering.JaggedEdge
- */
-export class JaggedEdge extends Measurable {
-  /**
-   * @param constants The rendering constants provider.
-   * @internal
-   */
-  constructor(constants: ConstantProvider) {
-    super(constants);
-    this.type |= Types.JAGGED_EDGE;
-    this.height = this.constants_.JAGGED_TEETH.height;
-    this.width = this.constants_.JAGGED_TEETH.width;
-  }
-}

package/core/renderers/measurables/next_connection.ts

@@ -1,47 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Class representing the space a next connection takes up during
- * rendering.
- */
-
-/**
- * Class representing the space a next connection takes up during
- * rendering.
- * @class
- */
-import * as goog from '../../../closure/goog/goog.js';
-goog.declareModuleId('Blockly.blockRendering.NextConnection');
-
-import type {RenderedConnection} from '../../rendered_connection.js';
-import type {ConstantProvider} from '../common/constants.js';
-
-import {Connection} from './connection.js';
-import {Types} from './types.js';
-
-
-/**
- * An object containing information about the space a next connection takes
- * up during rendering.
- * @struct
- * @alias Blockly.blockRendering.NextConnection
- */
-export class NextConnection extends Connection {
-  /**
-   * @param constants The rendering constants provider.
-   * @param connectionModel The connection object on the block that this
-   *     represents.
-   * @internal
-   */
-  constructor(
-      constants: ConstantProvider, connectionModel: RenderedConnection) {
-    super(constants, connectionModel);
-    this.type |= Types.NEXT_CONNECTION;
-    this.height = this.shape.height as number;
-    this.width = this.shape.width as number;
-  }
-}

package/core/renderers/measurables/output_connection.ts

@@ -1,56 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Class representing the space a output connection takes up
- * during rendering.
- */
-
-/**
- * Class representing the space a output connection takes up
- * during rendering.
- * @class
- */
-import * as goog from '../../../closure/goog/goog.js';
-goog.declareModuleId('Blockly.blockRendering.OutputConnection');
-
-import type {RenderedConnection} from '../../rendered_connection.js';
-import type {ConstantProvider} from '../common/constants.js';
-
-import {Connection} from './connection.js';
-import {Types} from './types.js';
-
-
-/**
- * An object containing information about the space an output connection takes
- * up during rendering.
- * @struct
- * @alias Blockly.blockRendering.OutputConnection
- */
-export class OutputConnection extends Connection {
-  startX: number;
-  connectionOffsetY: number;
-  connectionOffsetX = 0;
-
-  /**
-   * @param constants The rendering constants provider.
-   * @param connectionModel The connection object on the block that this
-   *     represents.
-   * @internal
-   */
-  constructor(
-      constants: ConstantProvider, connectionModel: RenderedConnection) {
-    super(constants, connectionModel);
-    this.type |= Types.OUTPUT_CONNECTION;
-
-    this.height = !this.isDynamicShape ? this.shape.height as number : 0;
-    this.width = !this.isDynamicShape ? this.shape.width as number : 0;
-
-    this.startX = this.width;
-
-    this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
-  }
-}

package/core/renderers/measurables/previous_connection.ts

@@ -1,47 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Class representing the space a previous connection takes up
- * during rendering.
- */
-
-/**
- * Class representing the space a previous connection takes up
- * during rendering.
- * @class
- */
-import * as goog from '../../../closure/goog/goog.js';
-goog.declareModuleId('Blockly.blockRendering.PreviousConnection');
-
-import type {RenderedConnection} from '../../rendered_connection.js';
-import type {ConstantProvider} from '../common/constants.js';
-
-import {Connection} from './connection.js';
-import {Types} from './types.js';
-
-
-/**
- * An object containing information about the space a previous connection takes
- * up during rendering.
- * @struct
- * @alias Blockly.blockRendering.PreviousConnection
- */
-export class PreviousConnection extends Connection {
-  /**
-   * @param constants The rendering constants provider.
-   * @param connectionModel The connection object on the block that this
-   *     represents.
-   * @internal
-   */
-  constructor(
-      constants: ConstantProvider, connectionModel: RenderedConnection) {
-    super(constants, connectionModel);
-    this.type |= Types.PREVIOUS_CONNECTION;
-    this.height = this.shape.height as number;
-    this.width = this.shape.width as number;
-  }
-}

package/core/renderers/measurables/round_corner.ts

@@ -1,49 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Objects representing a round corner in a row of a rendered
- * block.
- */
-
-/**
- * Objects representing a round corner in a row of a rendered
- * block.
- * @class
- */
-import * as goog from '../../../closure/goog/goog.js';
-goog.declareModuleId('Blockly.blockRendering.RoundCorner');
-
-import type {ConstantProvider} from '../common/constants.js';
-
-import {Measurable} from './base.js';
-import {Types} from './types.js';
-
-
-/**
- * An object containing information about the space a rounded corner takes up
- * during rendering.
- * @struct
- * @alias Blockly.blockRendering.RoundCorner
- */
-export class RoundCorner extends Measurable {
-  /**
-   * @param constants The rendering constants provider.
-   * @param opt_position The position of this corner.
-   * @internal
-   */
-  constructor(constants: ConstantProvider, opt_position?: string) {
-    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;
-  }
-}

package/core/renderers/measurables/row.ts

@@ -1,225 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Object representing a single row on a rendered block.
- */
-
-/**
- * Object representing a single row on a rendered block.
- * @class
- */
-import * as goog from '../../../closure/goog/goog.js';
-goog.declareModuleId('Blockly.blockRendering.Row');
-
-import type {ConstantProvider} from '../common/constants.js';
-
-import type {Measurable} from './base.js';
-import type {InRowSpacer} from './in_row_spacer.js';
-import type {InputConnection} from './input_connection.js';
-import {Types} from './types.js';
-
-
-/**
- * An object representing a single row on a rendered block and all of its
- * subcomponents.
- * @alias Blockly.blockRendering.Row
- */
-export class Row {
-  /** @internal */
-  type: number;
-
-  /**
-   * An array of elements contained in this row.
-   * @internal
-   */
-  elements: Measurable[] = [];
-
-  /**
-   * The height of the row.
-   * @internal
-   */
-  height = 0;
-
-  /**
-   * The width of the row, from the left edge of the block to the right.
-   * Does not include child blocks unless they are inline.
-   * @internal
-   */
-  width = 0;
-
-  /**
-   * The minimum height of the row.
-   * @internal
-   */
-  minHeight = 0;
-
-  /**
-   * The minimum width of the row, from the left edge of the block to the
-   * right. Does not include child blocks unless they are inline.
-   * @internal
-   */
-  minWidth = 0;
-
-  /**
-   * The width of the row, from the left edge of the block to the edge of the
-   * block or any connected child blocks.
-   * @internal
-   */
-  widthWithConnectedBlocks = 0;
-
-  /**
-   * The Y position of the row relative to the origin of the block's svg
-   * group.
-   * @internal
-   */
-  yPos = 0;
-
-  /**
-   * The X position of the row relative to the origin of the block's svg
-   * group.
-   * @internal
-   */
-  xPos = 0;
-
-  /**
-   * Whether the row has any external inputs.
-   * @internal
-   */
-  hasExternalInput = false;
-
-  /**
-   * Whether the row has any statement inputs.
-   * @internal
-   */
-  hasStatement = false;
-
-  /**
-   * Where the left edge of all of the statement inputs on the block should
-   * be. This makes sure that statement inputs which are proceded by fields
-   * of varius widths are all aligned.
-   */
-  statementEdge = 0;
-
-  /**
-   * Whether the row has any inline inputs.
-   * @internal
-   */
-  hasInlineInput = false;
-
-  /**
-   * Whether the row has any dummy inputs.
-   * @internal
-   */
-  hasDummyInput = false;
-
-  /**
-   * Whether the row has a jagged edge.
-   * @internal
-   */
-  hasJaggedEdge = false;
-  notchOffset: number;
-
-  /**
-   * Alignment of the row.
-   * @internal
-   */
-  align: number|null = null;
-
-  protected readonly constants_: ConstantProvider;
-
-  /**
-   * @param constants The rendering constants provider.
-   * @internal
-   */
-  constructor(constants: ConstantProvider) {
-    /** The renderer's constant provider. */
-    this.constants_ = constants;
-
-    /** The type of this rendering object. */
-    this.type = Types.ROW;
-
-    this.notchOffset = this.constants_.NOTCH_OFFSET_LEFT;
-  }
-
-  /**
-   * Get the last input on this row, if it has one.
-   * @return The last input on the row, or null.
-   * @internal
-   */
-  getLastInput(): InputConnection {
-    // TODO: Consider moving this to InputRow, if possible.
-    for (let i = this.elements.length - 1; i >= 0; i--) {
-      const elem = this.elements[i];
-      if (Types.isInput(elem)) {
-        return elem as InputConnection;
-      }
-    }
-    // AnyDuringMigration because:  Type 'null' is not assignable to type
-    // 'InputConnection'.
-    return null as AnyDuringMigration;
-  }
-
-  /**
-   * Inspect all subcomponents and populate all size properties on the row.
-   * @internal
-   */
-  measure() {
-    throw Error('Unexpected attempt to measure a base Row.');
-  }
-
-  /**
-   * Determines whether this row should start with an element spacer.
-   * @return Whether the row should start with a spacer.
-   * @internal
-   */
-  startsWithElemSpacer(): boolean {
-    return true;
-  }
-
-  /**
-   * Determines whether this row should end with an element spacer.
-   * @return Whether the row should end with a spacer.
-   * @internal
-   */
-  endsWithElemSpacer(): boolean {
-    return true;
-  }
-
-  /**
-   * Convenience method to get the first spacer element on this row.
-   * @return The first spacer element on this row.
-   * @internal
-   */
-  getFirstSpacer(): InRowSpacer {
-    for (let i = 0; i < this.elements.length; i++) {
-      const elem = this.elements[i];
-      if (Types.isSpacer(elem)) {
-        return elem as InRowSpacer;
-      }
-    }
-    // AnyDuringMigration because:  Type 'null' is not assignable to type
-    // 'InRowSpacer'.
-    return null as AnyDuringMigration;
-  }
-
-  /**
-   * Convenience method to get the last spacer element on this row.
-   * @return The last spacer element on this row.
-   * @internal
-   */
-  getLastSpacer(): InRowSpacer {
-    for (let i = this.elements.length - 1; i >= 0; i--) {
-      const elem = this.elements[i];
-      if (Types.isSpacer(elem)) {
-        return elem as InRowSpacer;
-      }
-    }
-    // AnyDuringMigration because:  Type 'null' is not assignable to type
-    // 'InRowSpacer'.
-    return null as AnyDuringMigration;
-  }
-}

package/core/renderers/measurables/spacer_row.ts

@@ -1,55 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Object representing a spacer between two rows.
- */
-
-/**
- * Object representing a spacer between two rows.
- * @class
- */
-import * as goog from '../../../closure/goog/goog.js';
-goog.declareModuleId('Blockly.blockRendering.SpacerRow');
-
-import type {ConstantProvider} from '../common/constants.js';
-
-import {InRowSpacer} from './in_row_spacer.js';
-import {Row} from './row.js';
-import {Types} from './types.js';
-
-
-/**
- * An object containing information about a spacer between two rows.
- * @struct
- * @alias Blockly.blockRendering.SpacerRow
- */
-export class SpacerRow extends Row {
-  followsStatement = false;
-
-  precedesStatement = false;
-
-  override widthWithConnectedBlocks = 0;
-  override elements: InRowSpacer[];
-
-  /**
-   * @param constants The rendering constants provider.
-   * @param height The height of the spacer.
-   * @param width The width of the spacer.
-   * @internal
-   */
-  constructor(
-      constants: ConstantProvider, public override height: number,
-      public override width: number) {
-    super(constants);
-    this.type |= Types.SPACER | Types.BETWEEN_ROW_SPACER;
-
-    this.elements = [new InRowSpacer(this.constants_, width)];
-  }
-
-  override measure() {}
-}
-// NOP.  Width and height were set at creation.