blockly 13.0.0-beta.2 → 13.0.0-beta.4

package/core/inputs/input.d.ts

@@ -17,6 +17,12 @@ import type { Field } from '../field.js';
 import { Verbosity } from '../utils/aria.js';
 import { Align } from './align.js';
 import { inputTypes } from './input_types.js';
+/**
+ * Represents a string or a function that returns a string which can be used as a
+ * custom ARIA string to represent an Input, or null if the default fallback should
+ * be used. See setAriaLabelProvider for more context.
+ */
+export type AriaLabelProvider = ((input: Input) => string | null) | string;
 /** Class for an input with optional fields. */
 export declare class Input {
     name: string;
@@ -26,6 +32,8 @@ export declare class Input {
     align: Align;
     /** Is the input visible? */
     private visible;
+    /** The AriaLabelProvider */
+    private ariaLabelProvider;
     readonly type: inputTypes;
     connection: Connection | null;
     /**
@@ -123,6 +131,26 @@ export declare class Input {
     getShadowDom(): Element | null;
     /** Initialize the fields on this input. */
     init(): void;
+    /**
+     * Sets a custom ARIA label provider for this input, or null if it should be reset
+     * to use the default method.
+     *
+     * Inputs do not compute ARIA contexts directly, so the set provider will be used
+     * in select cases when the Input needs to be represented (such as for parts of a
+     * block label or for connections). Note that overriding this provider will not
+     * recompute any already constructed ARIA labels, and it cannot be assumed that the
+     * provider will be called any particular number of times during label
+     * recomputation. As such, implementations should make sure to provide a
+     * deterministic and idempotent ARIA representation each time the provider is
+     * called for a given input. It's also fine to reuse providers across multiple
+     * Input implementations.
+     */
+    setAriaLabelProvider(provider: AriaLabelProvider | null): void;
+    /**
+     * Returns the string from the custom ARIA label provider set, or null if the default label (from the field row) should
+     * be used. See setAriaLabelProvider for more context.
+     */
+    getAriaLabelText(): string | null;
     /**
      * Initializes the fields on this input for a headless block.
      *
@@ -145,7 +173,10 @@ export declare class Input {
      */
     protected makeConnection(type: ConnectionType): Connection;
     /**
-     * Returns an ID for the visual "row" this input is part of.
+     * Returns an ID for the logical "row" this input is part of. A "row" is
+     * bounded by a previous/next connection, a statement input, or a block stack
+     * boundary; all blocks/inputs nested inside of one of those are conceptually
+     * part of its same row.
      *
      * @internal
      */
@@ -159,7 +190,8 @@ export declare class Input {
      */
     getLabel(verbosity?: Verbosity): string;
     /**
-     * Returns the index of this input on its source block.
+     * Returns the index of this input, excluding inputs without connections, on its
+     * source block.
      *
      * @internal
      */

package/core/keyboard_navigation_controller.d.ts

@@ -11,6 +11,8 @@
 export declare class KeyboardNavigationController {
     /** Whether the user is actively using keyboard navigation. */
     private isActive;
+    /** Whether to play audio cues when navigating between scope levels. */
+    private scopeChangeAudioCuesEnabled;
     /** Css class name added to body if keyboard nav is active. */
     private activeClassName;
     /**
@@ -40,6 +42,16 @@ export declare class KeyboardNavigationController {
      * (e.g., has recently taken some action that is only relevant to keyboard users)
      */
     getIsActive(): boolean;
+    /**
+     * Sets whether or not audio cues should be played when keyboard navigation
+     * transitions between blocks of different nesting levels.
+     */
+    setScopeChangeAudioCuesEnabled(enabled: boolean): void;
+    /**
+     * Returns whether or not audio cues should be played when keyboard navigation
+     * transitions between blocks of different nesting levels.
+     */
+    getScopeChangeAudioCuesEnabled(): boolean;
     /** Adds or removes the css class that indicates keyboard navigation is active. */
     private updateActiveVisualization;
 }

package/core/rendered_connection.d.ts

@@ -3,11 +3,6 @@
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-/**
- * Components for creating connections between blocks.
- *
- * @class
- */
 import type { BlockSvg } from './block_svg.js';
 import { Connection } from './connection.js';
 import { IContextMenu } from './interfaces/i_contextmenu.js';
@@ -133,6 +128,12 @@ export declare class RenderedConnection extends Connection implements IContextMe
         connection: RenderedConnection | null;
         radius: number;
     };
+    /**
+     * Sets the aria role, label, and other state for this connection.
+     *
+     * @param highlightSvg The focusable element for this connection.
+     */
+    private recomputeAriaContext;
     /** Add highlighting around this connection. */
     highlight(): void;
     /** Remove the highlighting around this connection. */

package/core/shortcut_items.d.ts

@@ -33,10 +33,12 @@ export declare enum names {
     NEXT_STACK = "next_stack",
     PREVIOUS_STACK = "previous_stack",
     INFORMATION = "information",
+    EXTENDED_INFORMATION = "extended_information",
     PERFORM_ACTION = "perform_action",
     DUPLICATE = "duplicate",
     CLEANUP = "cleanup",
-    SHOW_TOOLTIP = "show_tooltip"
+    SHOW_TOOLTIP = "show_tooltip",
+    TOGGLE_SCREENREADER = "toggle_screenreader"
 }
 /**
  * Keyboard shortcut to hide chaff on escape.
@@ -73,7 +75,8 @@ export declare function registerRedo(): void;
  */
 export declare function registerMovementShortcuts(): void;
 /**
- * Keyboard shortcut to show the context menu on ctrl/cmd+Enter.
+ * Keyboard shortcut to show the context menu on ctrl/cmd+Enter, shift+F10, and
+ * the menu key.
  */
 export declare function registerShowContextMenu(): void;
 /**
@@ -89,9 +92,15 @@ export declare function registerFocusWorkspace(): void;
  */
 export declare function registerFocusToolbox(): void;
 /**
- * Registers keyboard shortcut to get count of block stacks and comments.
+ * Registers keyboard shortcut to announce information about the focused
+ * element.
  */
-export declare function registerWorkspaceOverview(): void;
+export declare function registerReadInformation(): void;
+/**
+ * Registers keyboard shortcut to announce an extended description of the
+ * focused element.
+ */
+export declare function registerReadExtendedInformation(): void;
 /**
  * Registers keyboard shortcut to disconnect the focused block.
  */
@@ -117,6 +126,11 @@ export declare function registerCleanup(): void;
  * Registers keyboard shortcut to display the tooltip for the focused element.
  */
 export declare function registerShowTooltip(): void;
+/**
+ * Registers keyboard shortcut to toggle on or off various behaviors that
+ * improve the experience for individuals using screenreaders.
+ */
+export declare function registerToggleScreenreaderMode(): void;
 /**
  * Registers all default keyboard shortcut item. This should be called once per
  * instance of KeyboardShortcutRegistry.

package/core/workspace_audio.d.ts

@@ -3,12 +3,7 @@
  * Copyright 2017 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-/**
- * Object in charge of loading, storing, and playing audio for a
- *     workspace.
- *
- * @class
- */
+import type { IFocusableNode } from './interfaces/i_focusable_node.js';
 import type { WorkspaceSvg } from './workspace_svg.js';
 /**
  * Class for loading, storing, and playing audio for a workspace.
@@ -25,7 +20,7 @@ export declare class WorkspaceAudio {
     private readonly context?;
     /**
      * @param parentWorkspace The parent of the workspace this audio object
-     *     belongs to, or null.
+     *     belongs to if it has one, or the workspace that owns this instance.
      */
     constructor(parentWorkspace: WorkspaceSvg);
     /**
@@ -61,6 +56,17 @@ export declare class WorkspaceAudio {
      * Plays a standard error beep.
      */
     playErrorBeep(): Promise<void>;
+    /**
+     * If enabled, plays a tone corresponding to the nesting level of the given
+     * node when it differs from the nesting level of the currently focused node.
+     * These tones are generally used for accessibility purposes to indicate a
+     * scope transition to users who use a screenreader. This method must be
+     * called before focus transitions to the given node.
+     *
+     * @internal
+     * @param newNode The soon-to-be-focused node.
+     */
+    maybePlayScopeChangeAudioCue(newNode: IFocusableNode): void;
     /**
      * Returns whether or not playing sounds is currently allowed.
      *

package/core/workspace_svg.d.ts

@@ -242,6 +242,14 @@ export declare class WorkspaceSvg extends Workspace implements IContextMenu, IFo
     svgBlockCanvas_: SVGElement;
     svgBubbleCanvas_: SVGElement;
     zoomControls_: ZoomControls | null;
+    /**
+     * Focus ring in the workspace.
+     */
+    private workspaceFocusRing;
+    /**
+     * Selection ring inside the workspace.
+     */
+    private workspaceSelectionRing;
     /**
      * Navigator that handles moving focus between items in this workspace in
      * response to keyboard navigation commands.
@@ -466,6 +474,14 @@ export declare class WorkspaceSvg extends Workspace implements IContextMenu, IFo
      * trash, zoom, toolbox, etc. (e.g. window resize).
      */
     resize(): void;
+    /**
+     * Sizes the given focus/selection ring inside the bounds of the workspace.
+     *
+     * @param ring The interior workspace ring indicator to resize.
+     * @param inset How many pixels in from the bounds of the workspace the ring
+     *     should be positioned.
+     */
+    private resizeWorkspaceRing;
     /**
      * Resizes and repositions workspace chrome if the page has a new
      * scroll position.

package/msg/ab.js

@@ -19,14 +19,18 @@ var Blockly = Blockly || { Msg: Object.create(null) };
 
 Blockly.Msg["ADD_COMMENT"] = "Иацҵатәуп ахцәажәара";
 Blockly.Msg["ALT_KEY"] = "Alt";  // untranslated
-Blockly.Msg["ANNOUNCE_MOVE_AFTER"] = "moving %1 after %3";  // untranslated
-Blockly.Msg["ANNOUNCE_MOVE_AROUND"] = "moving %1 %2 around %3";  // untranslated
-Blockly.Msg["ANNOUNCE_MOVE_BEFORE"] = "moving %1 before %3";  // untranslated
-Blockly.Msg["ANNOUNCE_MOVE_CANCELED"] = "Canceled movement";  // untranslated
-Blockly.Msg["ANNOUNCE_MOVE_INSIDE"] = "moving %1 inside %3 %4";  // untranslated
-Blockly.Msg["ANNOUNCE_MOVE_TO"] = "moving %1 %2 to %3 %4";  // untranslated
-Blockly.Msg["ANNOUNCE_MOVE_WORKSPACE"] = "moving %1 on workspace";  // untranslated
+Blockly.Msg["ANNOUNCE_MOVE_AFTER"] = "Moving %1 after %2.";  // untranslated
+Blockly.Msg["ANNOUNCE_MOVE_AROUND"] = "Moving %1 around %2.";  // untranslated
+Blockly.Msg["ANNOUNCE_MOVE_BEFORE"] = "Moving %1 before %2.";  // untranslated
+Blockly.Msg["ANNOUNCE_MOVE_CANCELED"] = "Canceled movement.";  // untranslated
+Blockly.Msg["ANNOUNCE_MOVE_INSIDE"] = "Moving %1 inside %2.";  // untranslated
+Blockly.Msg["ANNOUNCE_MOVE_OF"] = "%1 of %2";  // untranslated
+Blockly.Msg["ANNOUNCE_MOVE_TO"] = "Moving %1 to %2.";  // untranslated
+Blockly.Msg["ANNOUNCE_MOVE_WORKSPACE"] = "Moving %1 on workspace.";  // untranslated
 Blockly.Msg["ARIA_LABEL_BUTTON"] = "button";  // untranslated
+Blockly.Msg["ARIA_LABEL_COMMENT"] = "Comment";  // untranslated
+Blockly.Msg["ARIA_LABEL_COMMENT_COLLAPSE"] = "Collapse Comment";  // untranslated
+Blockly.Msg["ARIA_LABEL_COMMENT_EXPAND"] = "Expand Comment";  // untranslated
 Blockly.Msg["ARIA_LABEL_HEADING"] = "heading";  // untranslated
 Blockly.Msg["ARIA_TYPE_FIELD_CHECKBOX"] = "checkbox";  // untranslated
 Blockly.Msg["ARIA_TYPE_FIELD_DROPDOWN"] = "dropdown";  // untranslated
@@ -40,6 +44,7 @@ Blockly.Msg["BLOCK_LABEL_BEGIN_STACK"] = "Begin stack";  // untranslated
 Blockly.Msg["BLOCK_LABEL_COLLAPSED"] = "collapsed";  // untranslated
 Blockly.Msg["BLOCK_LABEL_CONTAINER"] = "container";  // untranslated
 Blockly.Msg["BLOCK_LABEL_DISABLED"] = "disabled";  // untranslated
+Blockly.Msg["BLOCK_LABEL_HAS_BRANCHES"] = "has %1 branches";  // untranslated
 Blockly.Msg["BLOCK_LABEL_HAS_INPUT"] = "has input";  // untranslated
 Blockly.Msg["BLOCK_LABEL_HAS_INPUTS"] = "has inputs";  // untranslated
 Blockly.Msg["BLOCK_LABEL_REPLACEABLE"] = "replaceable";  // untranslated
@@ -47,7 +52,9 @@ Blockly.Msg["BLOCK_LABEL_STACK_BLOCKS"] = "%1 stack blocks";  // untranslated
 Blockly.Msg["BLOCK_LABEL_STATEMENT"] = "command";  // untranslated
 Blockly.Msg["BLOCK_LABEL_TOOLBOX_CATEGORY"] = "%1 category";  // untranslated
 Blockly.Msg["BLOCK_LABEL_VALUE"] = "value";  // untranslated
+Blockly.Msg["BUBBLE_LABEL_COMMENT"] = "Comment: %1";  // untranslated
 Blockly.Msg["BUBBLE_LABEL_DEFAULT"] = "Bubble";  // untranslated
+Blockly.Msg["BUBBLE_LABEL_WARNING"] = "Warning: %1";  // untranslated
 Blockly.Msg["CANNOT_DELETE_VARIABLE_PROCEDURE"] = "Can't delete the variable '%1' because it's part of the definition of the function '%2'";  // untranslated
 Blockly.Msg["CAPS_LOCK_KEY"] = "Caps Lock";  // untranslated
 Blockly.Msg["CHANGE_VALUE_TITLE"] = "Ишәыԥсах аҵакы";
@@ -110,6 +117,7 @@ Blockly.Msg["CONTROLS_WHILEUNTIL_TOOLTIP_UNTIL"] = "Аҭагылазаашьа
 Blockly.Msg["CONTROLS_WHILEUNTIL_TOOLTIP_WHILE"] = "Аҭагылазаашьа иашанаҵ, инанагӡалоит акомандақәа.";
 Blockly.Msg["CONTROL_KEY"] = "Ctrl";  // untranslated
 Blockly.Msg["COPY_SHORTCUT"] = "Copy";  // untranslated
+Blockly.Msg["CURRENT_BLOCK_ANNOUNCEMENT"] = "Current block: %1";  // untranslated
 Blockly.Msg["CUT_SHORTCUT"] = "Cut";  // untranslated
 Blockly.Msg["DELETE_ALL_BLOCKS"] = "Ианыхтәуп аблокқәа (%1) зегьы?";
 Blockly.Msg["DELETE_BLOCK"] = "Ианыхтәуп аблок";
@@ -137,17 +145,28 @@ Blockly.Msg["FIELD_LABEL_EMPTY"] = "empty";  // untranslated
 Blockly.Msg["FIELD_LABEL_OPTION_INDEX"] = "Option %1";  // untranslated
 Blockly.Msg["FIELD_LABEL_VARIABLE"] = "Variable '%1'";  // untranslated
 Blockly.Msg["HELP"] = "Ацхыраара";
-Blockly.Msg["HELP_PROMPT"] = "Press %1 for help on keyboard controls";  // untranslated
+Blockly.Msg["HELP_PROMPT"] = "Press %1 for help on keyboard controls.";  // untranslated
 Blockly.Msg["HOME_KEY"] = "Home";  // untranslated
+Blockly.Msg["ICON_LABEL_COMMENT_CLOSED"] = "Open Comment";  // untranslated
+Blockly.Msg["ICON_LABEL_COMMENT_OPEN"] = "Close Comment";  // untranslated
+Blockly.Msg["ICON_LABEL_DEFAULT"] = "Icon";  // untranslated
+Blockly.Msg["ICON_LABEL_MUTATOR_CLOSED"] = "Edit this block";  // untranslated
+Blockly.Msg["ICON_LABEL_MUTATOR_OPEN"] = "Close block editor";  // untranslated
+Blockly.Msg["ICON_LABEL_WARNING_CLOSED"] = "Open Warning";  // untranslated
+Blockly.Msg["ICON_LABEL_WARNING_OPEN"] = "Close Warning";  // untranslated
 Blockly.Msg["INLINE_INPUTS"] = "Inline Inputs";  // untranslated
+Blockly.Msg["INPUT_LABEL_EMPTY"] = "Empty";  // untranslated
+Blockly.Msg["INPUT_LABEL_END_STATEMENT"] = "End %1";  // untranslated
 Blockly.Msg["INPUT_LABEL_INDEX"] = "input %1";  // untranslated
+Blockly.Msg["INPUT_LABEL_STATEMENT"] = "command position";  // untranslated
+Blockly.Msg["INPUT_LABEL_VALUE"] = "value position";  // untranslated
 Blockly.Msg["INSERT_KEY"] = "Insert";  // untranslated
-Blockly.Msg["KEYBOARD_NAV_BLOCK_NAVIGATION_HINT"] = "Use the right arrow key to navigate inside of blocks";  // untranslated
-Blockly.Msg["KEYBOARD_NAV_CONSTRAINED_MOVE_HINT"] = "Use the arrow keys to move, then %1 to accept the position";  // untranslated
+Blockly.Msg["KEYBOARD_NAV_BLOCK_NAVIGATION_HINT"] = "Use %1 to navigate inside of blocks.";  // untranslated
+Blockly.Msg["KEYBOARD_NAV_CONSTRAINED_MOVE_HINT"] = "Use the arrow keys to move, then %1 to accept the position.";  // untranslated
 Blockly.Msg["KEYBOARD_NAV_COPIED_HINT"] = "Copied. Press %1 to paste.";  // untranslated
 Blockly.Msg["KEYBOARD_NAV_CUT_HINT"] = "Cut. Press %1 to paste.";  // untranslated
-Blockly.Msg["KEYBOARD_NAV_UNCONSTRAINED_MOVE_HINT"] = "Hold %1 and use arrow keys to move freely, then %2 to accept the position";  // untranslated
-Blockly.Msg["KEYBOARD_NAV_WORKSPACE_NAVIGATION_HINT"] = "Use the arrow keys to navigate";  // untranslated
+Blockly.Msg["KEYBOARD_NAV_UNCONSTRAINED_MOVE_HINT"] = "Hold %1 and use arrow keys to move freely, then %2 to accept the position.";  // untranslated
+Blockly.Msg["KEYBOARD_NAV_WORKSPACE_NAVIGATION_HINT"] = "Use the arrow keys to navigate.";  // untranslated
 Blockly.Msg["LINUX"] = "Linux";  // untranslated
 Blockly.Msg["LISTS_CREATE_EMPTY_HELPURL"] = "https://github.com/RaspberryPiFoundation/blockly/wiki/Lists#create-empty-list";  // untranslated
 Blockly.Msg["LISTS_CREATE_EMPTY_TITLE"] = "иаԥцатәуп иҭацәу ахьӡынҵа";
@@ -355,11 +374,13 @@ Blockly.Msg["NEW_STRING_VARIABLE"] = "Create string variable...";  // untranslat
 Blockly.Msg["NEW_VARIABLE"] = "Иаԥҵатәуп аҽеиҭак";
 Blockly.Msg["NEW_VARIABLE_TITLE"] = "Аҽеиҭак ахьӡ ҿыц:";
 Blockly.Msg["NEW_VARIABLE_TYPE_TITLE"] = "New variable type:";  // untranslated
+Blockly.Msg["NO_PARENT_ANNOUNCEMENT"] = "Current block has no parent";  // untranslated
 Blockly.Msg["OPEN_TRASH"] = "Open trash";  // untranslated
 Blockly.Msg["OPTION_KEY"] = "⌥ Option";  // untranslated
 Blockly.Msg["ORDINAL_NUMBER_SUFFIX"] = "";  // untranslated
 Blockly.Msg["PAGE_DOWN_KEY"] = "Page Down";  // untranslated
 Blockly.Msg["PAGE_UP_KEY"] = "Page Up";  // untranslated
+Blockly.Msg["PARENT_BLOCKS_ANNOUNCEMENT"] = "Parent blocks: %1";  // untranslated
 Blockly.Msg["PASTE_SHORTCUT"] = "Paste";  // untranslated
 Blockly.Msg["PAUSE_KEY"] = "Pause";  // untranslated
 Blockly.Msg["PROCEDURES_ALLOW_STATEMENTS"] = "аоператорқәа азин рыҭара";
@@ -394,6 +415,8 @@ Blockly.Msg["REMOVE_COMMENT"] = "Ианыхтәуп ахцәажәара";
 Blockly.Msg["RENAME_VARIABLE"] = "Аҽеиҭак ахьӡ ԥсахтәуп";
 Blockly.Msg["RENAME_VARIABLE_TITLE"] = "Аҽеиҭакқәа'%1' зегь рыхьӡ ԥсахтәуп аҟны:";
 Blockly.Msg["RESET_ZOOM"] = "Reset zoom";  // untranslated
+Blockly.Msg["SCREENREADER_MODE_DISABLED"] = "Screenreader mode is off, press %1 to turn it on";  // untranslated
+Blockly.Msg["SCREENREADER_MODE_ENABLED"] = "Screenreader mode is on, press %1 to turn it off";  // untranslated
 Blockly.Msg["SHIFT_KEY"] = "Shift";  // untranslated
 Blockly.Msg["SHORTCUTS_ABORT_MOVE"] = "Abort move";  // untranslated
 Blockly.Msg["SHORTCUTS_CLEANUP"] = "Clean up workspace";  // untranslated
@@ -403,6 +426,7 @@ Blockly.Msg["SHORTCUTS_DISCONNECT"] = "Disconnect block";  // untranslated
 Blockly.Msg["SHORTCUTS_DUPLICATE"] = "Duplicate";  // untranslated
 Blockly.Msg["SHORTCUTS_EDITING"] = "Editing";  // untranslated
 Blockly.Msg["SHORTCUTS_ESCAPE"] = "Exit";  // untranslated
+Blockly.Msg["SHORTCUTS_EXTENDED_INFORMATION"] = "Announce detailed information";  // untranslated
 Blockly.Msg["SHORTCUTS_FINISH_MOVE"] = "Finish move";  // untranslated
 Blockly.Msg["SHORTCUTS_FOCUS_TOOLBOX"] = "Focus toolbox";  // untranslated
 Blockly.Msg["SHORTCUTS_FOCUS_WORKSPACE"] = "Focus workspace";  // untranslated
@@ -419,6 +443,7 @@ Blockly.Msg["SHORTCUTS_SHOW_CONTEXT_MENU"] = "Show menu";  // untranslated
 Blockly.Msg["SHORTCUTS_SHOW_TOOLTIP"] = "Show tooltip";  // untranslated
 Blockly.Msg["SHORTCUTS_START_MOVE"] = "Start move";  // untranslated
 Blockly.Msg["SHORTCUTS_START_MOVE_STACK"] = "Start move stack";  // untranslated
+Blockly.Msg["SHORTCUTS_TOGGLE_SCREENREADER_MODE"] = "Toggle screenreader mode";  // untranslated
 Blockly.Msg["SPACE_KEY"] = "Space";  // untranslated
 Blockly.Msg["TAB_KEY"] = "Tab";  // untranslated
 Blockly.Msg["TEXT_APPEND_HELPURL"] = "https://github.com/RaspberryPiFoundation/blockly/wiki/Text#text-modification";  // untranslated

package/msg/ab.mjs

@@ -467,6 +467,7 @@ export const {
   SHORTCUTS_FOCUS_WORKSPACE,
   SHORTCUTS_FOCUS_TOOLBOX,
   SHORTCUTS_INFORMATION,
+  SHORTCUTS_EXTENDED_INFORMATION,
   SHORTCUTS_DISCONNECT,
   SHORTCUTS_NEXT_STACK,
   SHORTCUTS_PREVIOUS_STACK,
@@ -474,6 +475,7 @@ export const {
   SHORTCUTS_DUPLICATE,
   SHORTCUTS_CLEANUP,
   SHORTCUTS_SHOW_TOOLTIP,
+  SHORTCUTS_TOGGLE_SCREENREADER_MODE,
   KEYBOARD_NAV_UNCONSTRAINED_MOVE_HINT,
   KEYBOARD_NAV_CONSTRAINED_MOVE_HINT,
   KEYBOARD_NAV_COPIED_HINT,
@@ -497,17 +499,23 @@ export const {
   BLOCK_LABEL_REPLACEABLE,
   BLOCK_LABEL_HAS_INPUT,
   BLOCK_LABEL_HAS_INPUTS,
+  BLOCK_LABEL_HAS_BRANCHES,
   BLOCK_LABEL_STATEMENT,
   BLOCK_LABEL_CONTAINER,
   BLOCK_LABEL_VALUE,
   BLOCK_LABEL_STACK_BLOCKS,
   INPUT_LABEL_INDEX,
+  INPUT_LABEL_VALUE,
+  INPUT_LABEL_STATEMENT,
+  INPUT_LABEL_END_STATEMENT,
+  INPUT_LABEL_EMPTY,
   ANNOUNCE_MOVE_WORKSPACE,
   ANNOUNCE_MOVE_BEFORE,
   ANNOUNCE_MOVE_AFTER,
   ANNOUNCE_MOVE_INSIDE,
   ANNOUNCE_MOVE_AROUND,
   ANNOUNCE_MOVE_TO,
+  ANNOUNCE_MOVE_OF,
   ANNOUNCE_MOVE_CANCELED,
   FIELD_LABEL_EMPTY,
   ARIA_TYPE_FIELD_INPUT,
@@ -528,4 +536,21 @@ export const {
   ARIA_LABEL_BUTTON,
   ARIA_LABEL_HEADING,
   BUBBLE_LABEL_DEFAULT,
+  BUBBLE_LABEL_COMMENT,
+  BUBBLE_LABEL_WARNING,
+  ICON_LABEL_DEFAULT,
+  ICON_LABEL_COMMENT_CLOSED,
+  ICON_LABEL_COMMENT_OPEN,
+  ICON_LABEL_MUTATOR_CLOSED,
+  ICON_LABEL_MUTATOR_OPEN,
+  ICON_LABEL_WARNING_CLOSED,
+  ICON_LABEL_WARNING_OPEN,
+  ARIA_LABEL_COMMENT,
+  ARIA_LABEL_COMMENT_COLLAPSE,
+  ARIA_LABEL_COMMENT_EXPAND,
+  SCREENREADER_MODE_ENABLED,
+  SCREENREADER_MODE_DISABLED,
+  CURRENT_BLOCK_ANNOUNCEMENT,
+  PARENT_BLOCKS_ANNOUNCEMENT,
+  NO_PARENT_ANNOUNCEMENT,
 } = ab;

package/msg/ace.js

@@ -19,14 +19,18 @@ var Blockly = Blockly || { Msg: Object.create(null) };
 
 Blockly.Msg["ADD_COMMENT"] = "Add Comment";  // untranslated
 Blockly.Msg["ALT_KEY"] = "Alt";  // untranslated
-Blockly.Msg["ANNOUNCE_MOVE_AFTER"] = "moving %1 after %3";  // untranslated
-Blockly.Msg["ANNOUNCE_MOVE_AROUND"] = "moving %1 %2 around %3";  // untranslated
-Blockly.Msg["ANNOUNCE_MOVE_BEFORE"] = "moving %1 before %3";  // untranslated
-Blockly.Msg["ANNOUNCE_MOVE_CANCELED"] = "Canceled movement";  // untranslated
-Blockly.Msg["ANNOUNCE_MOVE_INSIDE"] = "moving %1 inside %3 %4";  // untranslated
-Blockly.Msg["ANNOUNCE_MOVE_TO"] = "moving %1 %2 to %3 %4";  // untranslated
-Blockly.Msg["ANNOUNCE_MOVE_WORKSPACE"] = "moving %1 on workspace";  // untranslated
+Blockly.Msg["ANNOUNCE_MOVE_AFTER"] = "Moving %1 after %2.";  // untranslated
+Blockly.Msg["ANNOUNCE_MOVE_AROUND"] = "Moving %1 around %2.";  // untranslated
+Blockly.Msg["ANNOUNCE_MOVE_BEFORE"] = "Moving %1 before %2.";  // untranslated
+Blockly.Msg["ANNOUNCE_MOVE_CANCELED"] = "Canceled movement.";  // untranslated
+Blockly.Msg["ANNOUNCE_MOVE_INSIDE"] = "Moving %1 inside %2.";  // untranslated
+Blockly.Msg["ANNOUNCE_MOVE_OF"] = "%1 of %2";  // untranslated
+Blockly.Msg["ANNOUNCE_MOVE_TO"] = "Moving %1 to %2.";  // untranslated
+Blockly.Msg["ANNOUNCE_MOVE_WORKSPACE"] = "Moving %1 on workspace.";  // untranslated
 Blockly.Msg["ARIA_LABEL_BUTTON"] = "button";  // untranslated
+Blockly.Msg["ARIA_LABEL_COMMENT"] = "Comment";  // untranslated
+Blockly.Msg["ARIA_LABEL_COMMENT_COLLAPSE"] = "Collapse Comment";  // untranslated
+Blockly.Msg["ARIA_LABEL_COMMENT_EXPAND"] = "Expand Comment";  // untranslated
 Blockly.Msg["ARIA_LABEL_HEADING"] = "heading";  // untranslated
 Blockly.Msg["ARIA_TYPE_FIELD_CHECKBOX"] = "checkbox";  // untranslated
 Blockly.Msg["ARIA_TYPE_FIELD_DROPDOWN"] = "dropdown";  // untranslated
@@ -40,6 +44,7 @@ Blockly.Msg["BLOCK_LABEL_BEGIN_STACK"] = "Begin stack";  // untranslated
 Blockly.Msg["BLOCK_LABEL_COLLAPSED"] = "collapsed";  // untranslated
 Blockly.Msg["BLOCK_LABEL_CONTAINER"] = "container";  // untranslated
 Blockly.Msg["BLOCK_LABEL_DISABLED"] = "disabled";  // untranslated
+Blockly.Msg["BLOCK_LABEL_HAS_BRANCHES"] = "has %1 branches";  // untranslated
 Blockly.Msg["BLOCK_LABEL_HAS_INPUT"] = "has input";  // untranslated
 Blockly.Msg["BLOCK_LABEL_HAS_INPUTS"] = "has inputs";  // untranslated
 Blockly.Msg["BLOCK_LABEL_REPLACEABLE"] = "replaceable";  // untranslated
@@ -47,7 +52,9 @@ Blockly.Msg["BLOCK_LABEL_STACK_BLOCKS"] = "%1 stack blocks";  // untranslated
 Blockly.Msg["BLOCK_LABEL_STATEMENT"] = "command";  // untranslated
 Blockly.Msg["BLOCK_LABEL_TOOLBOX_CATEGORY"] = "%1 category";  // untranslated
 Blockly.Msg["BLOCK_LABEL_VALUE"] = "value";  // untranslated
+Blockly.Msg["BUBBLE_LABEL_COMMENT"] = "Comment: %1";  // untranslated
 Blockly.Msg["BUBBLE_LABEL_DEFAULT"] = "Bubble";  // untranslated
+Blockly.Msg["BUBBLE_LABEL_WARNING"] = "Warning: %1";  // untranslated
 Blockly.Msg["CANNOT_DELETE_VARIABLE_PROCEDURE"] = "Can't delete the variable '%1' because it's part of the definition of the function '%2'";  // untranslated
 Blockly.Msg["CAPS_LOCK_KEY"] = "Caps Lock";  // untranslated
 Blockly.Msg["CHANGE_VALUE_TITLE"] = "Change value:";  // untranslated
@@ -110,6 +117,7 @@ Blockly.Msg["CONTROLS_WHILEUNTIL_TOOLTIP_UNTIL"] = "While a value is false, then
 Blockly.Msg["CONTROLS_WHILEUNTIL_TOOLTIP_WHILE"] = "While a value is true, then do some statements.";  // untranslated
 Blockly.Msg["CONTROL_KEY"] = "Ctrl";  // untranslated
 Blockly.Msg["COPY_SHORTCUT"] = "Copy";  // untranslated
+Blockly.Msg["CURRENT_BLOCK_ANNOUNCEMENT"] = "Current block: %1";  // untranslated
 Blockly.Msg["CUT_SHORTCUT"] = "Cut";  // untranslated
 Blockly.Msg["DELETE_ALL_BLOCKS"] = "Delete all %1 blocks?";  // untranslated
 Blockly.Msg["DELETE_BLOCK"] = "Delete Block";  // untranslated
@@ -137,17 +145,28 @@ Blockly.Msg["FIELD_LABEL_EMPTY"] = "empty";  // untranslated
 Blockly.Msg["FIELD_LABEL_OPTION_INDEX"] = "Option %1";  // untranslated
 Blockly.Msg["FIELD_LABEL_VARIABLE"] = "Variable '%1'";  // untranslated
 Blockly.Msg["HELP"] = "Help";  // untranslated
-Blockly.Msg["HELP_PROMPT"] = "Press %1 for help on keyboard controls";  // untranslated
+Blockly.Msg["HELP_PROMPT"] = "Press %1 for help on keyboard controls.";  // untranslated
 Blockly.Msg["HOME_KEY"] = "Home";  // untranslated
+Blockly.Msg["ICON_LABEL_COMMENT_CLOSED"] = "Open Comment";  // untranslated
+Blockly.Msg["ICON_LABEL_COMMENT_OPEN"] = "Close Comment";  // untranslated
+Blockly.Msg["ICON_LABEL_DEFAULT"] = "Icon";  // untranslated
+Blockly.Msg["ICON_LABEL_MUTATOR_CLOSED"] = "Edit this block";  // untranslated
+Blockly.Msg["ICON_LABEL_MUTATOR_OPEN"] = "Close block editor";  // untranslated
+Blockly.Msg["ICON_LABEL_WARNING_CLOSED"] = "Open Warning";  // untranslated
+Blockly.Msg["ICON_LABEL_WARNING_OPEN"] = "Close Warning";  // untranslated
 Blockly.Msg["INLINE_INPUTS"] = "Inline Inputs";  // untranslated
+Blockly.Msg["INPUT_LABEL_EMPTY"] = "Empty";  // untranslated
+Blockly.Msg["INPUT_LABEL_END_STATEMENT"] = "End %1";  // untranslated
 Blockly.Msg["INPUT_LABEL_INDEX"] = "input %1";  // untranslated
+Blockly.Msg["INPUT_LABEL_STATEMENT"] = "command position";  // untranslated
+Blockly.Msg["INPUT_LABEL_VALUE"] = "value position";  // untranslated
 Blockly.Msg["INSERT_KEY"] = "Insert";  // untranslated
-Blockly.Msg["KEYBOARD_NAV_BLOCK_NAVIGATION_HINT"] = "Use the right arrow key to navigate inside of blocks";  // untranslated
-Blockly.Msg["KEYBOARD_NAV_CONSTRAINED_MOVE_HINT"] = "Use the arrow keys to move, then %1 to accept the position";  // untranslated
+Blockly.Msg["KEYBOARD_NAV_BLOCK_NAVIGATION_HINT"] = "Use %1 to navigate inside of blocks.";  // untranslated
+Blockly.Msg["KEYBOARD_NAV_CONSTRAINED_MOVE_HINT"] = "Use the arrow keys to move, then %1 to accept the position.";  // untranslated
 Blockly.Msg["KEYBOARD_NAV_COPIED_HINT"] = "Copied. Press %1 to paste.";  // untranslated
 Blockly.Msg["KEYBOARD_NAV_CUT_HINT"] = "Cut. Press %1 to paste.";  // untranslated
-Blockly.Msg["KEYBOARD_NAV_UNCONSTRAINED_MOVE_HINT"] = "Hold %1 and use arrow keys to move freely, then %2 to accept the position";  // untranslated
-Blockly.Msg["KEYBOARD_NAV_WORKSPACE_NAVIGATION_HINT"] = "Use the arrow keys to navigate";  // untranslated
+Blockly.Msg["KEYBOARD_NAV_UNCONSTRAINED_MOVE_HINT"] = "Hold %1 and use arrow keys to move freely, then %2 to accept the position.";  // untranslated
+Blockly.Msg["KEYBOARD_NAV_WORKSPACE_NAVIGATION_HINT"] = "Use the arrow keys to navigate.";  // untranslated
 Blockly.Msg["LINUX"] = "Linux";  // untranslated
 Blockly.Msg["LISTS_CREATE_EMPTY_HELPURL"] = "https://github.com/RaspberryPiFoundation/blockly/wiki/Lists#create-empty-list";  // untranslated
 Blockly.Msg["LISTS_CREATE_EMPTY_TITLE"] = "create empty list";  // untranslated
@@ -355,11 +374,13 @@ Blockly.Msg["NEW_STRING_VARIABLE"] = "Create string variable...";  // untranslat
 Blockly.Msg["NEW_VARIABLE"] = "Create variable...";  // untranslated
 Blockly.Msg["NEW_VARIABLE_TITLE"] = "New variable name:";  // untranslated
 Blockly.Msg["NEW_VARIABLE_TYPE_TITLE"] = "New variable type:";  // untranslated
+Blockly.Msg["NO_PARENT_ANNOUNCEMENT"] = "Current block has no parent";  // untranslated
 Blockly.Msg["OPEN_TRASH"] = "Open trash";  // untranslated
 Blockly.Msg["OPTION_KEY"] = "⌥ Option";  // untranslated
 Blockly.Msg["ORDINAL_NUMBER_SUFFIX"] = "";  // untranslated
 Blockly.Msg["PAGE_DOWN_KEY"] = "Page Down";  // untranslated
 Blockly.Msg["PAGE_UP_KEY"] = "Page Up";  // untranslated
+Blockly.Msg["PARENT_BLOCKS_ANNOUNCEMENT"] = "Parent blocks: %1";  // untranslated
 Blockly.Msg["PASTE_SHORTCUT"] = "Paste";  // untranslated
 Blockly.Msg["PAUSE_KEY"] = "Pause";  // untranslated
 Blockly.Msg["PROCEDURES_ALLOW_STATEMENTS"] = "allow statements";  // untranslated
@@ -394,6 +415,8 @@ Blockly.Msg["REMOVE_COMMENT"] = "Remove Comment";  // untranslated
 Blockly.Msg["RENAME_VARIABLE"] = "Rename the '%1' variable";  // untranslated
 Blockly.Msg["RENAME_VARIABLE_TITLE"] = "Rename all '%1' variables to:";  // untranslated
 Blockly.Msg["RESET_ZOOM"] = "Reset zoom";  // untranslated
+Blockly.Msg["SCREENREADER_MODE_DISABLED"] = "Screenreader mode is off, press %1 to turn it on";  // untranslated
+Blockly.Msg["SCREENREADER_MODE_ENABLED"] = "Screenreader mode is on, press %1 to turn it off";  // untranslated
 Blockly.Msg["SHIFT_KEY"] = "Shift";  // untranslated
 Blockly.Msg["SHORTCUTS_ABORT_MOVE"] = "Abort move";  // untranslated
 Blockly.Msg["SHORTCUTS_CLEANUP"] = "Clean up workspace";  // untranslated
@@ -403,6 +426,7 @@ Blockly.Msg["SHORTCUTS_DISCONNECT"] = "Disconnect block";  // untranslated
 Blockly.Msg["SHORTCUTS_DUPLICATE"] = "Duplicate";  // untranslated
 Blockly.Msg["SHORTCUTS_EDITING"] = "Editing";  // untranslated
 Blockly.Msg["SHORTCUTS_ESCAPE"] = "Exit";  // untranslated
+Blockly.Msg["SHORTCUTS_EXTENDED_INFORMATION"] = "Announce detailed information";  // untranslated
 Blockly.Msg["SHORTCUTS_FINISH_MOVE"] = "Finish move";  // untranslated
 Blockly.Msg["SHORTCUTS_FOCUS_TOOLBOX"] = "Focus toolbox";  // untranslated
 Blockly.Msg["SHORTCUTS_FOCUS_WORKSPACE"] = "Focus workspace";  // untranslated
@@ -419,6 +443,7 @@ Blockly.Msg["SHORTCUTS_SHOW_CONTEXT_MENU"] = "Show menu";  // untranslated
 Blockly.Msg["SHORTCUTS_SHOW_TOOLTIP"] = "Show tooltip";  // untranslated
 Blockly.Msg["SHORTCUTS_START_MOVE"] = "Start move";  // untranslated
 Blockly.Msg["SHORTCUTS_START_MOVE_STACK"] = "Start move stack";  // untranslated
+Blockly.Msg["SHORTCUTS_TOGGLE_SCREENREADER_MODE"] = "Toggle screenreader mode";  // untranslated
 Blockly.Msg["SPACE_KEY"] = "Space";  // untranslated
 Blockly.Msg["TAB_KEY"] = "Tab";  // untranslated
 Blockly.Msg["TEXT_APPEND_HELPURL"] = "https://github.com/RaspberryPiFoundation/blockly/wiki/Text#text-modification";  // untranslated

package/msg/ace.mjs

@@ -467,6 +467,7 @@ export const {
   SHORTCUTS_FOCUS_WORKSPACE,
   SHORTCUTS_FOCUS_TOOLBOX,
   SHORTCUTS_INFORMATION,
+  SHORTCUTS_EXTENDED_INFORMATION,
   SHORTCUTS_DISCONNECT,
   SHORTCUTS_NEXT_STACK,
   SHORTCUTS_PREVIOUS_STACK,
@@ -474,6 +475,7 @@ export const {
   SHORTCUTS_DUPLICATE,
   SHORTCUTS_CLEANUP,
   SHORTCUTS_SHOW_TOOLTIP,
+  SHORTCUTS_TOGGLE_SCREENREADER_MODE,
   KEYBOARD_NAV_UNCONSTRAINED_MOVE_HINT,
   KEYBOARD_NAV_CONSTRAINED_MOVE_HINT,
   KEYBOARD_NAV_COPIED_HINT,
@@ -497,17 +499,23 @@ export const {
   BLOCK_LABEL_REPLACEABLE,
   BLOCK_LABEL_HAS_INPUT,
   BLOCK_LABEL_HAS_INPUTS,
+  BLOCK_LABEL_HAS_BRANCHES,
   BLOCK_LABEL_STATEMENT,
   BLOCK_LABEL_CONTAINER,
   BLOCK_LABEL_VALUE,
   BLOCK_LABEL_STACK_BLOCKS,
   INPUT_LABEL_INDEX,
+  INPUT_LABEL_VALUE,
+  INPUT_LABEL_STATEMENT,
+  INPUT_LABEL_END_STATEMENT,
+  INPUT_LABEL_EMPTY,
   ANNOUNCE_MOVE_WORKSPACE,
   ANNOUNCE_MOVE_BEFORE,
   ANNOUNCE_MOVE_AFTER,
   ANNOUNCE_MOVE_INSIDE,
   ANNOUNCE_MOVE_AROUND,
   ANNOUNCE_MOVE_TO,
+  ANNOUNCE_MOVE_OF,
   ANNOUNCE_MOVE_CANCELED,
   FIELD_LABEL_EMPTY,
   ARIA_TYPE_FIELD_INPUT,
@@ -528,4 +536,21 @@ export const {
   ARIA_LABEL_BUTTON,
   ARIA_LABEL_HEADING,
   BUBBLE_LABEL_DEFAULT,
+  BUBBLE_LABEL_COMMENT,
+  BUBBLE_LABEL_WARNING,
+  ICON_LABEL_DEFAULT,
+  ICON_LABEL_COMMENT_CLOSED,
+  ICON_LABEL_COMMENT_OPEN,
+  ICON_LABEL_MUTATOR_CLOSED,
+  ICON_LABEL_MUTATOR_OPEN,
+  ICON_LABEL_WARNING_CLOSED,
+  ICON_LABEL_WARNING_OPEN,
+  ARIA_LABEL_COMMENT,
+  ARIA_LABEL_COMMENT_COLLAPSE,
+  ARIA_LABEL_COMMENT_EXPAND,
+  SCREENREADER_MODE_ENABLED,
+  SCREENREADER_MODE_DISABLED,
+  CURRENT_BLOCK_ANNOUNCEMENT,
+  PARENT_BLOCKS_ANNOUNCEMENT,
+  NO_PARENT_ANNOUNCEMENT,
 } = ace;