blockly 13.0.0-beta.7 → 13.0.0-beta.9

package/core/block.d.ts

@@ -720,10 +720,11 @@ export declare class Block {
      */
     setAriaRoleDescriptionProvider(description: string | (() => string)): void;
     /**
-     * @returns The custom string to use as the role description for this block,
-     *   or undefined if no custom description is set.
+     * @returns The string to use as the role description for this block. If a
+     *    custom provider has been set, use that. Otherwise, return a default
+     *    description based on the block's properties.
      */
-    getAriaRoleDescription(): string | undefined;
+    getAriaRoleDescription(): string;
     /**
      * Create a human-readable text representation of this block and any children.
      *

package/core/block_aria_composer.d.ts

@@ -39,15 +39,16 @@ export declare enum ConnectionPreposition {
  * The returned label will be specialized based on whether the block is part of a
  * flyout.
  *
+ * Custom input labels (from {@link Input.setAriaLabelProvider}) are not included
+ * here; they are used only in move-mode disambiguation and parent-input context
+ * via {@link Input.getAriaLabelText}.
+ *
  * @internal
  * @param block The block for which an ARIA representation should be created.
  * @param verbosity How much detail to include in the description.
- * @param useCustomInputLabels Whether to use custom labels for inputs, if they
- *   exist. We don't want to do this when just reading a block's label, but do
- *   want to in other scenarios such as move mode.
  * @returns The ARIA representation for the specified block.
  */
-export declare function computeAriaLabel(block: BlockSvg, verbosity?: Verbosity, useCustomInputLabels?: boolean): string;
+export declare function computeAriaLabel(block: BlockSvg, verbosity?: Verbosity): string;
 /**
  * Sets the ARIA role and role description for the specified block, accounting
  * for whether the block is part of a flyout.
@@ -90,21 +91,20 @@ export declare function computeFieldRowLabel(input: Input, lookback: boolean, ve
  * their contents are returned as a single item in the array per top-level
  * input.
  *
- * Generally, if a custom label for an input is provided, that is preferred.
- * However, we do not surface the custom labels when simply reading the text of
- * the block. They are used as supplementary information for situations like
- * move mode or when an input itself is focused.
+ * Uses derived labels only (field row text and connected block content via
+ * {@link Input.getLabel}). Custom input labels are not included; see
+ * {@link Input.getAriaLabelText} for move-mode and parent-input usage.
  *
  * @internal
  * @param block The block to retrieve a list of field/input labels for.
- * @param verbosity
- * @param useCustomLabels whether to use the custom label for an input, if it's present.
+ * @param verbosity How much detail to include in each input label.
  * @returns A list of field/input labels for the given block.
  */
-export declare function getInputLabels(block: BlockSvg, verbosity?: Verbosity, useCustomLabels?: boolean): string[];
+export declare function getInputLabels(block: BlockSvg, verbosity?: Verbosity): string[];
 /**
- * Returns a subset of labels for inputs on the given block, ending at the
- * specified input.
+ * Returns a subset of derived labels for inputs on the given block, ending at
+ * the specified input. Used to disambiguate move targets and connection
+ * highlights when no custom label is set.
  *
  * The subset is determined based on the input type:
  * - For non-statement inputs, only the label for the given input is returned.
@@ -113,12 +113,21 @@ export declare function getInputLabels(block: BlockSvg, verbosity?: Verbosity, u
  *   begins immediately after the previous statement input, or at the start of
  *   the block if none exists.
  *
+ * Label resolution (see also {@link computeMoveConnectionLabel}):
+ * 1. Custom labels ({@link Input.getAriaLabelText}) are handled by callers, not here.
+ * 2. Derived labels from {@link Input.getLabel} (field row + child blocks).
+ * 3. Numbered fallback ({@link Msg.INPUT_LABEL_INDEX}) when tier 2 is empty.
+ *    For the statement target input, the fallback is omitted if any earlier
+ *    input in the subset already produced a label.
+ *
  * @internal
  * @param block The block to retrieve a list of field/input labels for.
- * @param input The input that defines the end of the subset.
+ * @param endInput The input that defines the end of the subset.
+ * @param includeEndInputChildren Whether to include labels for child blocks
+ *    connected to the end input.
  * @returns A list of field/input labels for the given block.
  */
-export declare function getInputLabelsSubset(block: BlockSvg, input: Input, includeFallbackLabels?: boolean): string[];
+export declare function getInputLabelsSubset(block: BlockSvg, endInput: Input, includeEndInputChildren: boolean): string[];
 /**
  * Returns a translated string describing an in-progress move of a block to a new
  * connection, suitable for announcement on the ARIA live region. The returned string

package/core/blockly.d.ts

@@ -158,8 +158,6 @@ import { ZoomControls } from './zoom_controls.js';
  * This constant is overridden by the build script (npm run build) to the value
  * of the version in package.json. This is done by the Closure Compiler in the
  * buildCompressed gulp task.
- * For local builds, you can pass --define='Blockly.VERSION=X.Y.Z' to the
- * compiler to override this constant.
  *
  * @define {string}
  */

package/core/inputs/input.d.ts

@@ -185,13 +185,14 @@ export declare class Input {
      */
     getRowId(): string;
     /**
-     * Returns an accessibility label describing this input, including the labels
-     * of any fields on the input and the labels of any connected blocks, to help
-     * disambiguate this input from others on the same block.
+     * Returns a derived accessibility label for this input: field row text plus
+     * labels of any connected child blocks (unless excluded). Does not include
+     * custom labels from {@link getAriaLabelText}; those are used in move-mode
+     * and parent-input context only.
      *
      * @internal
      */
-    getLabel(verbosity?: Verbosity, useCustomLabels?: boolean): string;
+    getLabel(verbosity?: Verbosity, includeChildren?: boolean): string;
     /**
      * Returns the index of this input, excluding inputs without connections, on its
      * source block.

package/core/zoom_controls.d.ts

@@ -9,7 +9,7 @@
  * @class
  */
 import './events/events_click.js';
-import { IFocusableNode } from './blockly.js';
+import { IFocusableNode } from './interfaces/i_focusable_node.js';
 import type { IPositionable } from './interfaces/i_positionable.js';
 import type { UiMetrics } from './metrics_manager.js';
 import { Rect } from './utils/rect.js';