blockly 8.0.4-beta.0 → 8.0.5-beta.0

package/core/renderers/thrasos/info.d.ts

@@ -0,0 +1,40 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { BlockSvg } from '../../block_svg.js';
+import { RenderInfo as BaseRenderInfo } from '../common/info.js';
+import type { Measurable } from '../measurables/base.js';
+import type { Row } from '../measurables/row.js';
+import type { Renderer } from './renderer.js';
+/**
+ * An object containing all sizing information needed to draw this block.
+ *
+ * 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.
+ * @alias Blockly.thrasos.RenderInfo
+ */
+export declare class RenderInfo extends BaseRenderInfo {
+    widthWithChildren: any;
+    height: any;
+    startY: any;
+    /**
+     * @param renderer The renderer in use.
+     * @param block The block to measure.
+     * @internal
+     */
+    constructor(renderer: Renderer, block: BlockSvg);
+    /**
+     * Get the block renderer in use.
+     * @return The block renderer in use.
+     * @internal
+     */
+    getRenderer(): Renderer;
+    addElemSpacing_(): void;
+    getInRowSpacing_(prev: Measurable | null, next: Measurable | null): number;
+    getSpacerRowHeight_(prev: Row, next: Row): number;
+    getElemCenterline_(row: Row, elem: Measurable): number;
+    finalize_(): void;
+}

package/core/renderers/thrasos/{info.js → info.ts}

@@ -8,28 +8,26 @@
  * @fileoverview New (evolving) renderer.
  * Thrasos: spirit of boldness.
  */
-'use strict';
 
 /**
  * New (evolving) renderer.
  * Thrasos: spirit of boldness.
  * @class
  */
-goog.module('Blockly.thrasos.RenderInfo');
+import * as goog from '../../../closure/goog/goog.js';
+goog.declareModuleId('Blockly.thrasos.RenderInfo');
 
-/* eslint-disable-next-line no-unused-vars */
-const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
-/* eslint-disable-next-line no-unused-vars */
-const {BottomRow} = goog.requireType('Blockly.blockRendering.BottomRow');
-/* eslint-disable-next-line no-unused-vars */
-const {Field} = goog.requireType('Blockly.blockRendering.Field');
-const {InRowSpacer} = goog.require('Blockly.blockRendering.InRowSpacer');
-const {RenderInfo: BaseRenderInfo} = goog.require('Blockly.blockRendering.RenderInfo');
-/* eslint-disable-next-line no-unused-vars */
-const {Renderer} = goog.requireType('Blockly.thrasos.Renderer');
-/* eslint-disable-next-line no-unused-vars */
-const {TopRow} = goog.requireType('Blockly.blockRendering.TopRow');
-const {Types} = goog.require('Blockly.blockRendering.Types');
+import type {BlockSvg} from '../../block_svg.js';
+import {RenderInfo as BaseRenderInfo} from '../common/info.js';
+import type {Measurable} from '../measurables/base.js';
+import type {BottomRow} from '../measurables/bottom_row.js';
+import type {Field} from '../measurables/field.js';
+import {InRowSpacer} from '../measurables/in_row_spacer.js';
+import type {Row} from '../measurables/row.js';
+import type {TopRow} from '../measurables/top_row.js';
+import {Types} from '../measurables/types.js';
+
+import type {Renderer} from './renderer.js';
 
 
 /**
@@ -38,32 +36,34 @@ const {Types} = goog.require('Blockly.blockRendering.Types');
  * 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.
- * @extends {BaseRenderInfo}
  * @alias Blockly.thrasos.RenderInfo
  */
-class RenderInfo extends BaseRenderInfo {
+export class RenderInfo extends BaseRenderInfo {
+  override widthWithChildren: AnyDuringMigration;
+  override height: AnyDuringMigration;
+  override startY: AnyDuringMigration;
+
   /**
-   * @param {!Renderer} renderer The renderer in use.
-   * @param {!BlockSvg} block The block to measure.
-   * @package
+   * @param renderer The renderer in use.
+   * @param block The block to measure.
+   * @internal
    */
-  constructor(renderer, block) {
+  constructor(renderer: Renderer, block: BlockSvg) {
     super(renderer, block);
   }
 
   /**
    * Get the block renderer in use.
-   * @return {!Renderer} The block renderer in use.
-   * @package
+   * @return The block renderer in use.
+   * @internal
    */
-  getRenderer() {
-    return /** @type {!Renderer} */ (this.renderer_);
+  override getRenderer(): Renderer {
+    // AnyDuringMigration because:  Property 'renderer_' does not exist on type
+    // 'RenderInfo'.
+    return (this as AnyDuringMigration).renderer_ as Renderer;
   }
 
-  /**
-   * @override
-   */
-  addElemSpacing_() {
+  override addElemSpacing_() {
     let hasExternalInputs = false;
     for (let i = 0; i < this.rows.length; i++) {
       const row = this.rows[i];
@@ -82,6 +82,9 @@ class RenderInfo extends BaseRenderInfo {
         row.elements.push(new InRowSpacer(
             this.constants_, this.getInRowSpacing_(null, oldElems[0])));
       }
+      if (!oldElems.length) {
+        continue;
+      }
       for (let e = 0; e < oldElems.length - 1; e++) {
         row.elements.push(oldElems[e]);
         const spacing = this.getInRowSpacing_(oldElems[e], oldElems[e + 1]);
@@ -100,14 +103,10 @@ class RenderInfo extends BaseRenderInfo {
     }
   }
 
-  /**
-   * @override
-   */
-  getInRowSpacing_(prev, next) {
+  override getInRowSpacing_(prev: Measurable|null, next: Measurable|null) {
     if (!prev) {
       // Between an editable field and the beginning of the row.
-      if (next && Types.isField(next) &&
-          (/** @type {Field} */ (next)).isEditable) {
+      if (next && Types.isField(next) && (next as Field).isEditable) {
         return this.constants_.MEDIUM_PADDING;
       }
       // Inline input at the beginning of the row.
@@ -124,19 +123,23 @@ class RenderInfo extends BaseRenderInfo {
     // Spacing between a non-input and the end of the row.
     if (!Types.isInput(prev) && !next) {
       // Between an editable field and the end of the row.
-      if (Types.isField(prev) && (/** @type {Field} */ (prev)).isEditable) {
+      if (Types.isField(prev) && (prev as Field).isEditable) {
         return this.constants_.MEDIUM_PADDING;
       }
       // Padding at the end of an icon-only row to make the block shape clearer.
       if (Types.isIcon(prev)) {
-        return (this.constants_.LARGE_PADDING * 2) + 1;
+        return this.constants_.LARGE_PADDING * 2 + 1;
       }
-      if (Types.isHat(prev)) {
+      // AnyDuringMigration because:  Property 'isHat' does not exist on type
+      // 'typeof Types'.
+      if ((Types as AnyDuringMigration).isHat(prev)) {
         return this.constants_.NO_PADDING;
       }
       // Establish a minimum width for a block with a previous or next
       // connection.
-      if (Types.isPreviousOrNextConnection(prev)) {
+      // AnyDuringMigration because:  Property 'isPreviousOrNextConnection' does
+      // not exist on type 'typeof Types'.
+      if ((Types as AnyDuringMigration).isPreviousOrNextConnection(prev)) {
         return this.constants_.LARGE_PADDING;
       }
       // Between rounded corner and the end of the row.
@@ -150,10 +153,11 @@ class RenderInfo extends BaseRenderInfo {
       // Between noneditable fields and icons and the end of the row.
       return this.constants_.LARGE_PADDING;
     }
-
     // Between inputs and the end of the row.
     if (Types.isInput(prev) && !next) {
-      if (Types.isExternalInput(prev)) {
+      // AnyDuringMigration because:  Property 'isExternalInput' does not exist
+      // on type 'typeof Types'.
+      if ((Types as AnyDuringMigration).isExternalInput(prev)) {
         return this.constants_.NO_PADDING;
       } else if (Types.isInlineInput(prev)) {
         return this.constants_.LARGE_PADDING;
@@ -165,16 +169,20 @@ class RenderInfo extends BaseRenderInfo {
     // Spacing between a non-input and an input.
     if (!Types.isInput(prev) && next && Types.isInput(next)) {
       // Between an editable field and an input.
-      if (Types.isField(prev) && (/** @type {Field} */ (prev)).isEditable) {
+      if (Types.isField(prev) && (prev as Field).isEditable) {
         if (Types.isInlineInput(next)) {
           return this.constants_.SMALL_PADDING;
-        } else if (Types.isExternalInput(next)) {
+          // AnyDuringMigration because:  Property 'isExternalInput' does not
+          // exist on type 'typeof Types'.
+        } else if ((Types as AnyDuringMigration).isExternalInput(next)) {
           return this.constants_.SMALL_PADDING;
         }
       } else {
         if (Types.isInlineInput(next)) {
           return this.constants_.MEDIUM_LARGE_PADDING;
-        } else if (Types.isExternalInput(next)) {
+          // AnyDuringMigration because:  Property 'isExternalInput' does not
+          // exist on type 'typeof Types'.
+        } else if ((Types as AnyDuringMigration).isExternalInput(next)) {
           return this.constants_.MEDIUM_LARGE_PADDING;
         } else if (Types.isStatementInput(next)) {
           return this.constants_.LARGE_PADDING;
@@ -191,7 +199,7 @@ class RenderInfo extends BaseRenderInfo {
     // Spacing between an inline input and a field.
     if (Types.isInlineInput(prev) && next && Types.isField(next)) {
       // Editable field after inline input.
-      if ((/** @type {Field} */ (next)).isEditable) {
+      if ((next as Field).isEditable) {
         return this.constants_.MEDIUM_PADDING;
       } else {
         // Noneditable field after inline input.
@@ -201,7 +209,9 @@ class RenderInfo extends BaseRenderInfo {
 
     if (Types.isLeftSquareCorner(prev) && next) {
       // Spacing between a hat and a corner
-      if (Types.isHat(next)) {
+      // AnyDuringMigration because:  Property 'isHat' does not exist on type
+      // 'typeof Types'.
+      if ((Types as AnyDuringMigration).isHat(next)) {
         return this.constants_.NO_PADDING;
       }
       // Spacing between a square corner and a previous or next connection
@@ -209,7 +219,6 @@ class RenderInfo extends BaseRenderInfo {
         return next.notchOffset;
       }
     }
-
     // Spacing between a rounded corner and a previous or next connection.
     if (Types.isLeftRoundedCorner(prev) && next) {
       return next.notchOffset - this.constants_.CORNER_RADIUS;
@@ -217,8 +226,7 @@ class RenderInfo extends BaseRenderInfo {
 
     // Spacing between two fields of the same editability.
     if (Types.isField(prev) && next && Types.isField(next) &&
-        ((/** @type {Field} */ (prev)).isEditable ===
-         (/** @type {Field} */ (next)).isEditable)) {
+        (prev as Field).isEditable === (next as Field).isEditable) {
       return this.constants_.LARGE_PADDING;
     }
 
@@ -230,10 +238,7 @@ class RenderInfo extends BaseRenderInfo {
     return this.constants_.MEDIUM_PADDING;
   }
 
-  /**
-   * @override
-   */
-  getSpacerRowHeight_(prev, next) {
+  override getSpacerRowHeight_(prev: Row, next: Row) {
     // If we have an empty block add a spacer to increase the height.
     if (Types.isTopRow(prev) && Types.isBottomRow(next)) {
       return this.constants_.EMPTY_BLOCK_SPACER_HEIGHT;
@@ -257,15 +262,12 @@ class RenderInfo extends BaseRenderInfo {
     return this.constants_.MEDIUM_PADDING;
   }
 
-  /**
-   * @override
-   */
-  getElemCenterline_(row, elem) {
+  override getElemCenterline_(row: Row, elem: Measurable) {
     if (Types.isSpacer(elem)) {
       return row.yPos + elem.height / 2;
     }
     if (Types.isBottomRow(row)) {
-      const bottomRow = /** @type {!BottomRow} */ (row);
+      const bottomRow = row as BottomRow;
       const baseline =
           bottomRow.yPos + bottomRow.height - bottomRow.descenderHeight;
       if (Types.isNextConnection(elem)) {
@@ -274,8 +276,10 @@ class RenderInfo extends BaseRenderInfo {
       return baseline - elem.height / 2;
     }
     if (Types.isTopRow(row)) {
-      const topRow = /** @type {!TopRow} */ (row);
-      if (Types.isHat(elem)) {
+      const topRow = row as TopRow;
+      // AnyDuringMigration because:  Property 'isHat' does not exist on type
+      // 'typeof Types'.
+      if ((Types as AnyDuringMigration).isHat(elem)) {
         return topRow.capline - elem.height / 2;
       }
       return topRow.capline + elem.height / 2;
@@ -287,15 +291,12 @@ class RenderInfo extends BaseRenderInfo {
           this.constants_.TALL_INPUT_FIELD_OFFSET_Y + elem.height / 2;
       result += offset;
     } else {
-      result += (row.height / 2);
+      result += row.height / 2;
     }
     return result;
   }
 
-  /**
-   * @override
-   */
-  finalize_() {
+  override finalize_() {
     // Performance note: this could be combined with the draw pass, if the time
     // that this takes is excessive.  But it shouldn't be, because it only
     // accesses and sets properties that already exist on the objects.
@@ -335,5 +336,3 @@ class RenderInfo extends BaseRenderInfo {
     this.startY = this.topRow.capline;
   }
 }
-
-exports.RenderInfo = RenderInfo;

package/core/renderers/thrasos/renderer.d.ts

@@ -0,0 +1,25 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { BlockSvg } from '../../block_svg.js';
+import { Renderer as BaseRenderer } from '../common/renderer.js';
+import { RenderInfo } from './info.js';
+/**
+ * The thrasos renderer.
+ * @alias Blockly.thrasos.Renderer
+ */
+export declare class Renderer extends BaseRenderer {
+    /**
+     * @param name The renderer name.
+     * @internal
+     */
+    constructor(name: string);
+    /**
+     * Create a new instance of the renderer's render info object.
+     * @param block The block to measure.
+     * @return The render info object.
+     */
+    protected makeRenderInfo_(block: BlockSvg): RenderInfo;
+}

package/core/renderers/thrasos/renderer.ts

@@ -0,0 +1,48 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Thrasos renderer.
+ */
+
+/**
+ * Thrasos renderer.
+ * @class
+ */
+import * as goog from '../../../closure/goog/goog.js';
+goog.declareModuleId('Blockly.thrasos.Renderer');
+
+import type {BlockSvg} from '../../block_svg.js';
+import * as blockRendering from '../common/block_rendering.js';
+import {Renderer as BaseRenderer} from '../common/renderer.js';
+
+import {RenderInfo} from './info.js';
+
+
+/**
+ * The thrasos renderer.
+ * @alias Blockly.thrasos.Renderer
+ */
+export class Renderer extends BaseRenderer {
+  /**
+   * @param name The renderer name.
+   * @internal
+   */
+  constructor(name: string) {
+    super(name);
+  }
+
+  /**
+   * Create a new instance of the renderer's render info object.
+   * @param block The block to measure.
+   * @return The render info object.
+   */
+  protected override makeRenderInfo_(block: BlockSvg): RenderInfo {
+    return new RenderInfo(this, block);
+  }
+}
+
+blockRendering.register('thrasos', Renderer);

package/core/renderers/thrasos/thrasos.d.ts

@@ -0,0 +1,4 @@
+/** @fileoverview Re-exports of Blockly.thrasos.* modules. */
+import { RenderInfo } from './info.js';
+import { Renderer } from './renderer.js';
+export { Renderer, RenderInfo };

package/core/renderers/thrasos/thrasos.ts

@@ -0,0 +1,20 @@
+/** @fileoverview Re-exports of Blockly.thrasos.* modules. */
+
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Re-exports of Blockly.thrasos.* modules.
+ * @namespace Blockly.thrasos
+ */
+import * as goog from '../../../closure/goog/goog.js';
+goog.declareModuleId('Blockly.thrasos');
+
+import {RenderInfo} from './info.js';
+import {Renderer} from './renderer.js';
+
+
+export {Renderer, RenderInfo};

package/core/renderers/zelos/constants.d.ts

@@ -0,0 +1,186 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { RenderedConnection } from '../../rendered_connection.js';
+import type { Theme } from '../../theme.js';
+import { ConstantProvider as BaseConstantProvider } from '../common/constants.js';
+import type { Shape } from '../common/constants.js';
+/** An object containing sizing and path information about inside corners. */
+export interface InsideCorners {
+    width: number;
+    height: number;
+    pathTop: string;
+    pathBottom: string;
+    rightWidth: number;
+    rightHeight: number;
+    pathTopRight: string;
+    pathBottomRight: string;
+}
+/**
+ * An object that provides constants for rendering blocks in Zelos mode.
+ * @alias Blockly.zelos.ConstantProvider
+ */
+export declare class ConstantProvider extends BaseConstantProvider {
+    GRID_UNIT: number;
+    SMALL_PADDING: any;
+    MEDIUM_PADDING: any;
+    MEDIUM_LARGE_PADDING: any;
+    LARGE_PADDING: any;
+    CORNER_RADIUS: any;
+    NOTCH_WIDTH: any;
+    NOTCH_HEIGHT: any;
+    NOTCH_OFFSET_LEFT: any;
+    STATEMENT_INPUT_NOTCH_OFFSET: any;
+    MIN_BLOCK_WIDTH: any;
+    MIN_BLOCK_HEIGHT: any;
+    EMPTY_STATEMENT_INPUT_HEIGHT: any;
+    TAB_OFFSET_FROM_TOP: number;
+    TOP_ROW_MIN_HEIGHT: any;
+    TOP_ROW_PRECEDES_STATEMENT_MIN_HEIGHT: any;
+    BOTTOM_ROW_MIN_HEIGHT: any;
+    BOTTOM_ROW_AFTER_STATEMENT_MIN_HEIGHT: any;
+    STATEMENT_BOTTOM_SPACER: any;
+    STATEMENT_INPUT_SPACER_MIN_WIDTH: number;
+    STATEMENT_INPUT_PADDING_LEFT: any;
+    EMPTY_INLINE_INPUT_PADDING: any;
+    EMPTY_INLINE_INPUT_HEIGHT: any;
+    DUMMY_INPUT_MIN_HEIGHT: any;
+    DUMMY_INPUT_SHADOW_MIN_HEIGHT: any;
+    CURSOR_WS_WIDTH: any;
+    CURSOR_COLOUR: string;
+    /**
+     * Radius of the cursor for input and output connections.
+     * @internal
+     */
+    CURSOR_RADIUS: number;
+    JAGGED_TEETH_HEIGHT: number;
+    JAGGED_TEETH_WIDTH: number;
+    START_HAT_HEIGHT: number;
+    START_HAT_WIDTH: number;
+    SHAPES: {
+        HEXAGONAL: number;
+        ROUND: number;
+        SQUARE: number;
+        PUZZLE: number;
+        NOTCH: number;
+    };
+    SHAPE_IN_SHAPE_PADDING: any;
+    FULL_BLOCK_FIELDS: boolean;
+    FIELD_TEXT_FONTSIZE: any;
+    FIELD_TEXT_FONTWEIGHT: string;
+    FIELD_TEXT_FONTFAMILY: string;
+    FIELD_BORDER_RECT_RADIUS: any;
+    FIELD_BORDER_RECT_X_PADDING: any;
+    FIELD_BORDER_RECT_Y_PADDING: any;
+    FIELD_BORDER_RECT_HEIGHT: any;
+    FIELD_DROPDOWN_BORDER_RECT_HEIGHT: any;
+    FIELD_DROPDOWN_NO_BORDER_RECT_SHADOW: boolean;
+    FIELD_DROPDOWN_COLOURED_DIV: boolean;
+    FIELD_DROPDOWN_SVG_ARROW: boolean;
+    FIELD_DROPDOWN_SVG_ARROW_PADDING: any;
+    FIELD_TEXTINPUT_BOX_SHADOW: boolean;
+    FIELD_COLOUR_FULL_BLOCK: boolean;
+    FIELD_COLOUR_DEFAULT_WIDTH: any;
+    FIELD_COLOUR_DEFAULT_HEIGHT: any;
+    FIELD_CHECKBOX_X_OFFSET: any;
+    MAX_DYNAMIC_CONNECTION_SHAPE_WIDTH: number;
+    /** The selected glow colour. */
+    SELECTED_GLOW_COLOUR: string;
+    /** The size of the selected glow. */
+    SELECTED_GLOW_SIZE: number;
+    /** The replacement glow colour. */
+    REPLACEMENT_GLOW_COLOUR: string;
+    /** The size of the selected glow. */
+    REPLACEMENT_GLOW_SIZE: number;
+    /**
+     * The ID of the selected glow filter, or the empty string if no filter is
+     * set.
+     * @internal
+     */
+    selectedGlowFilterId: string;
+    /**
+     * The <filter> element to use for a selected glow, or null if not set.
+     */
+    private selectedGlowFilter_;
+    /**
+     * The ID of the replacement glow filter, or the empty string if no filter
+     * is set.
+     * @internal
+     */
+    replacementGlowFilterId: string;
+    /**
+     * The <filter> element to use for a replacement glow, or null if not set.
+     */
+    private replacementGlowFilter_;
+    /**
+     * The object containing information about the hexagon used for a boolean
+     * reporter block. Null before init is called.
+     */
+    HEXAGONAL: Shape | null;
+    /**
+     * The object containing information about the hexagon used for a number or
+     * string reporter block. Null before init is called.
+     */
+    ROUNDED: Shape | null;
+    /**
+     * The object containing information about the hexagon used for a
+     * rectangular reporter block. Null before init is called.
+     */
+    SQUARED: Shape | null;
+    /** @internal */
+    constructor();
+    setFontConstants_(theme: Theme): void;
+    init(): void;
+    setDynamicProperties_(theme: Theme): void;
+    dispose(): void;
+    makeStartHat(): {
+        height: number;
+        width: number;
+        path: string;
+    };
+    /**
+     * Create sizing and path information about a hexagonal shape.
+     * @return An object containing sizing and path information about a hexagonal
+     *     shape for connections.
+     * @internal
+     */
+    makeHexagonal(): Shape;
+    /**
+     * Create sizing and path information about a rounded shape.
+     * @return An object containing sizing and path information about a rounded
+     *     shape for connections.
+     * @internal
+     */
+    makeRounded(): Shape;
+    /**
+     * Create sizing and path information about a squared shape.
+     * @return An object containing sizing and path information about a squared
+     *     shape for connections.
+     * @internal
+     */
+    makeSquared(): Shape;
+    shapeFor(connection: RenderedConnection): Shape;
+    makeNotch(): {
+        type: number;
+        width: any;
+        height: any;
+        pathLeft: string;
+        pathRight: string;
+    };
+    makeInsideCorners(): {
+        width: any;
+        height: any;
+        pathTop: string;
+        pathBottom: string;
+        rightWidth: any;
+        rightHeight: any;
+        pathTopRight: string;
+        pathBottomRight: string;
+    };
+    generateSecondaryColour_(colour: string): string;
+    generateTertiaryColour_(colour: string): string;
+    createDom(svg: SVGElement, tagName: string, selector: string): void;
+    getCSS_(selector: string): string[];
+}