scratch-blocks 2.0.0-beta.1 → 2.0.0-beta.2

package/blockly-rc/core/renderers/measurables/input_row.ts

@@ -1,67 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// Former goog.module ID: 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.
- */
-export class InputRow extends Row {
-  /**
-   * The total width of all blocks connected to this row.
-   */
-  connectedBlockWidths = 0;
-
-  /**
-   * @param constants The rendering constants provider.
-   */
-  constructor(constants: ConstantProvider) {
-    super(constants);
-    this.type |= Types.INPUT_ROW;
-  }
-
-  /**
-   * Inspect all subcomponents and populate all size properties on the row.
-   */
-  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/blockly-rc/core/renderers/measurables/jagged_edge.ts

@@ -1,28 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// Former goog.module ID: 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 space the jagged edge of a
- * collapsed block takes up during rendering.
- */
-export class JaggedEdge extends Measurable {
-  /**
-   * @param constants The rendering constants provider.
-   */
-  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/blockly-rc/core/renderers/measurables/next_connection.ts

@@ -1,34 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// Former goog.module ID: 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.
- */
-export class NextConnection extends Connection {
-  /**
-   * @param constants The rendering constants provider.
-   * @param connectionModel The connection object on the block that this
-   *     represents.
-   */
-  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/blockly-rc/core/renderers/measurables/output_connection.ts

@@ -1,43 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// Former goog.module ID: 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.
- */
-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.
-   */
-  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/blockly-rc/core/renderers/measurables/previous_connection.ts

@@ -1,34 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// Former goog.module ID: 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.
- */
-export class PreviousConnection extends Connection {
-  /**
-   * @param constants The rendering constants provider.
-   * @param connectionModel The connection object on the block that this
-   *     represents.
-   */
-  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/blockly-rc/core/renderers/measurables/round_corner.ts

@@ -1,34 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// Former goog.module ID: 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.
- */
-export class RoundCorner extends Measurable {
-  /**
-   * @param constants The rendering constants provider.
-   * @param opt_position The position of this corner.
-   */
-  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/blockly-rc/core/renderers/measurables/row.ts

@@ -1,191 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// Former goog.module ID: 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.
- */
-export class Row {
-  type: number;
-
-  /**
-   * An array of elements contained in this row.
-   */
-  elements: Measurable[] = [];
-
-  /**
-   * The height of the row.
-   */
-  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.
-   */
-  width = 0;
-
-  /**
-   * The minimum height of the row.
-   */
-  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.
-   */
-  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.
-   */
-  widthWithConnectedBlocks = 0;
-
-  /**
-   * The Y position of the row relative to the origin of the block's svg
-   * group.
-   */
-  yPos = 0;
-
-  /**
-   * The X position of the row relative to the origin of the block's svg
-   * group.
-   */
-  xPos = 0;
-
-  /**
-   * Whether the row has any external inputs.
-   */
-  hasExternalInput = false;
-
-  /**
-   * Whether the row has any statement inputs.
-   */
-  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.
-   */
-  hasInlineInput = false;
-
-  /**
-   * Whether the row has any dummy inputs or end-row inputs.
-   */
-  hasDummyInput = false;
-
-  /**
-   * Whether the row has a jagged edge.
-   */
-  hasJaggedEdge = false;
-  notchOffset: number;
-
-  /**
-   * Alignment of the row.
-   */
-  align: number | null = null;
-
-  protected readonly constants_: ConstantProvider;
-
-  /**
-   * @param constants The rendering constants provider.
-   */
-  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.
-   *
-   * @returns The last input on the row, or null.
-   */
-  getLastInput(): InputConnection | null {
-    // 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;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Inspect all subcomponents and populate all size properties on the row.
-   */
-  measure() {
-    throw Error('Unexpected attempt to measure a base Row.');
-  }
-
-  /**
-   * Determines whether this row should start with an element spacer.
-   *
-   * @returns Whether the row should start with a spacer.
-   */
-  startsWithElemSpacer(): boolean {
-    return true;
-  }
-
-  /**
-   * Determines whether this row should end with an element spacer.
-   *
-   * @returns Whether the row should end with a spacer.
-   */
-  endsWithElemSpacer(): boolean {
-    return true;
-  }
-
-  /**
-   * Convenience method to get the first spacer element on this row.
-   *
-   * @returns The first spacer element on this row.
-   */
-  getFirstSpacer(): InRowSpacer | null {
-    for (let i = 0; i < this.elements.length; i++) {
-      const elem = this.elements[i];
-      if (Types.isSpacer(elem)) {
-        return elem as InRowSpacer;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Convenience method to get the last spacer element on this row.
-   *
-   * @returns The last spacer element on this row.
-   */
-  getLastSpacer(): InRowSpacer | null {
-    for (let i = this.elements.length - 1; i >= 0; i--) {
-      const elem = this.elements[i];
-      if (Types.isSpacer(elem)) {
-        return elem as InRowSpacer;
-      }
-    }
-    return null;
-  }
-}

package/blockly-rc/core/renderers/measurables/spacer_row.ts

@@ -1,44 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// Former goog.module ID: 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.
- */
-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.
-   */
-  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.

package/blockly-rc/core/renderers/measurables/square_corner.ts

@@ -1,32 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// Former goog.module ID: Blockly.blockRendering.SquareCorner
-
-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 square corner takes up
- * during rendering.
- */
-export class SquareCorner extends Measurable {
-  /**
-   * @param constants The rendering constants provider.
-   * @param opt_position The position of this corner.
-   */
-  constructor(constants: ConstantProvider, opt_position?: string) {
-    super(constants);
-    this.type =
-      (!opt_position || opt_position === 'left'
-        ? Types.LEFT_SQUARE_CORNER
-        : Types.RIGHT_SQUARE_CORNER) | Types.CORNER;
-    this.height = this.constants_.NO_PADDING;
-    this.width = this.constants_.NO_PADDING;
-  }
-}

package/blockly-rc/core/renderers/measurables/statement_input.ts

@@ -1,41 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// Former goog.module ID: Blockly.blockRendering.StatementInput
-
-/* eslint-disable-next-line no-unused-vars */
-import type {Input} from '../../inputs/input.js';
-import type {ConstantProvider} from '../common/constants.js';
-
-import {InputConnection} from './input_connection.js';
-import {Types} from './types.js';
-
-/**
- * An object containing information about the space a statement input takes up
- * during rendering
- */
-export class StatementInput extends InputConnection {
-  /**
-   * @param constants The rendering constants provider.
-   * @param input The statement input to measure and store information for.
-   */
-  constructor(constants: ConstantProvider, input: Input) {
-    super(constants, input);
-    this.type |= Types.STATEMENT_INPUT;
-
-    if (!this.connectedBlock) {
-      this.height = this.constants_.EMPTY_STATEMENT_INPUT_HEIGHT;
-    } 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.height =
-        this.connectedBlockHeight + this.constants_.STATEMENT_BOTTOM_SPACER;
-    }
-    this.width =
-      this.constants_.STATEMENT_INPUT_NOTCH_OFFSET +
-      (this.shape.width as number);
-  }
-}

package/blockly-rc/core/renderers/measurables/top_row.ts

@@ -1,110 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// Former goog.module ID: Blockly.blockRendering.TopRow
-
-import type {BlockSvg} from '../../block_svg.js';
-import type {ConstantProvider} from '../common/constants.js';
-
-import {Hat} from './hat.js';
-import type {PreviousConnection} from './previous_connection.js';
-import {Row} from './row.js';
-import {Types} from './types.js';
-
-/**
- * An object containing information about what elements are in the top row of a
- * block as well as sizing information for the top row.
- * Elements in a top row can consist of corners, hats, spacers, and previous
- * connections.
- * After this constructor is called, the row will contain all non-spacer
- * elements it needs.
- */
-export 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).
-   */
-  capline = 0;
-
-  /** How much the row extends up above its capline. */
-  ascenderHeight = 0;
-
-  /** Whether the block has a previous connection. */
-  hasPreviousConnection = false;
-
-  /** The previous connection on the block, if any. */
-  connection: PreviousConnection | null = null;
-
-  /**
-   * @param constants The rendering constants provider.
-   */
-  constructor(constants: ConstantProvider) {
-    super(constants);
-
-    this.type |= Types.TOP_ROW;
-  }
-
-  /**
-   * Returns whether or not the top row has a left square corner.
-   *
-   * @param block The block whose top row this represents.
-   * @returns Whether or not the top row has a left square corner.
-   */
-  hasLeftSquareCorner(block: BlockSvg): boolean {
-    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 _block The block whose top row this represents.
-   * @returns Whether or not the top row has a right square corner.
-   */
-  hasRightSquareCorner(_block: BlockSvg): boolean {
-    return true;
-  }
-
-  override 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;
-  }
-
-  override startsWithElemSpacer() {
-    return false;
-  }
-
-  override endsWithElemSpacer() {
-    return false;
-  }
-}