Merge branch 'main' into introduce-initial-screen-reader-support

Author: BenHenning

.github/workflows/assign_reviewers.yml

@@ -0,0 +1,43 @@
+name: Assign requested reviewers
+
+# This workflow adds requested reviewers as assignees. If you remove a
+# requested reviewer, it will not remove them as an assignee.
+#
+# See https://github.com/google/blockly/issues/5643 for more
+# information on why this was added.
+#
+# N.B.: Runs with a read-write repo token.  Do not check out the
+# submitted branch!
+on:
+  pull_request_target:
+    types: [review_requested]
+
+jobs:
+  requested-reviewer:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Assign requested reviewer
+        uses: actions/github-script@v7
+        with:
+          script: |
+            try {
+              if (context.payload.pull_request === undefined) {
+              throw new Error("Can't get pull_request payload. " +
+                              'Check a request reviewer event was triggered.');
+              }
+              const reviewers = context.payload.pull_request.requested_reviewers;
+              // Assignees takes in a list of logins rather than the
+              // reviewer object.
+              const reviewerNames = reviewers.map(reviewer => reviewer.login);
+              const {number:issue_number} = context.payload.pull_request;
+              github.rest.issues.addAssignees({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: issue_number,
+                assignees: reviewerNames
+              });
+            } catch (error) {
+              core.setFailed(error.message);
+            }

README.md

@@ -81,6 +81,18 @@ const workspace = Blockly.inject('blocklyDiv', {
 const keyboardNav = new KeyboardNavigation(workspace);
 ```
 
+## Add shortcuts to page
+
+In order to see the keyboard help popup when the user presses /, you need to add an empty div element to the hosting page that has the Blockly div element with the id "shortcuts". The plugin will take care of layout and formatting.
+
+```html
+...
+<div id="shortcuts"></div>
+...
+<div id="blockly"></div>
+...
+```
+
 ### Usage with cross-tab-copy-paste plugin
 
 This plugin adds context menu items for copying & pasting. It also adds feedback to copying & pasting as toasts that are shown to the user upon successful copy or cut. It is compatible with the `@blockly/plugin-cross-tab-copy-paste` by following these steps:

package-lock.json

@@ -86,9 +86,7 @@ export class ActionMenu {
     // TODO(#362): Pass this through the precondition and callback instead of making it up.
     const menuOpenEvent = new KeyboardEvent('keydown');
 
-    const cursor = workspace.getCursor();
-    if (!cursor) throw new Error('workspace has no cursor');
-    const node = cursor.getCurNode();
+    const node = workspace.getCursor().getCurNode();
     if (!node) return false;
     // TODO(google/blockly#8847): Add typeguard for IContextMenu in core when this moves over
     if (

src/actions/action_menu.ts

@@ -38,11 +38,7 @@ export class ArrowNavigation {
     workspace: WorkspaceSvg,
     shortcut: ShortcutRegistry.KeyboardShortcut,
   ): boolean {
-    const cursor = workspace.getCursor();
-    if (!cursor || !cursor.getCurNode()) {
-      return false;
-    }
-    const curNode = cursor.getCurNode();
+    const curNode = workspace.getCursor().getCurNode();
     if (curNode instanceof Field) {
       return curNode.onShortcut(shortcut);
     }
@@ -70,7 +66,7 @@ export class ArrowNavigation {
             if (
               !this.navigation.defaultWorkspaceCursorPositionIfNeeded(workspace)
             ) {
-              workspace.getCursor()?.in();
+              workspace.getCursor().in();
             }
             isHandled = true;
           }
@@ -103,7 +99,7 @@ export class ArrowNavigation {
             if (
               !this.navigation.defaultWorkspaceCursorPositionIfNeeded(workspace)
             ) {
-              workspace.getCursor()?.out();
+              workspace.getCursor().out();
             }
             isHandled = true;
           }
@@ -169,7 +165,7 @@ export class ArrowNavigation {
                     workspace,
                   )
                 ) {
-                  workspace.getCursor()?.next();
+                  workspace.getCursor().next();
                 }
                 isHandled = true;
               }
@@ -182,7 +178,7 @@ export class ArrowNavigation {
                     workspace.targetWorkspace,
                   )
                 ) {
-                  workspace.getCursor()?.next();
+                  workspace.getCursor().next();
                 }
                 isHandled = true;
               }
@@ -232,7 +228,7 @@ export class ArrowNavigation {
                     'last',
                   )
                 ) {
-                  workspace.getCursor()?.prev();
+                  workspace.getCursor().prev();
                 }
                 isHandled = true;
               }
@@ -246,7 +242,7 @@ export class ArrowNavigation {
                     'last',
                   )
                 ) {
-                  workspace.getCursor()?.prev();
+                  workspace.getCursor().prev();
                 }
                 isHandled = true;
               }

src/actions/arrow_navigation.ts

@@ -78,7 +78,6 @@ export class DisconnectAction {
    */
   disconnectBlocks(workspace: WorkspaceSvg) {
     const cursor = workspace.getCursor();
-    if (!cursor) return;
     const curNode = cursor.getCurNode();
     if (!(curNode instanceof BlockSvg)) return;
 

src/actions/disconnect.ts

@@ -4,12 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  ContextMenuRegistry,
-  LineCursor,
-  Msg,
-  keyboardNavigationController,
-} from 'blockly';
+import {ContextMenuRegistry, Msg, keyboardNavigationController} from 'blockly';
 import {Navigation} from 'src/navigation';
 import {getMenuItem} from '../shortcut_formatting';
 import * as Constants from '../constants';
@@ -67,7 +62,7 @@ export class EditAction {
         if (!workspace || !this.navigation.canCurrentlyNavigate(workspace)) {
           return 'disabled';
         }
-        const cursor = workspace.getCursor() as LineCursor | null;
+        const cursor = workspace.getCursor();
         if (!cursor) return 'disabled';
         return cursor.atEndOfLine() ? 'hidden' : 'enabled';
       },

src/actions/edit.ts

@@ -18,6 +18,7 @@ import {
   renderManagement,
   comments,
   getFocusManager,
+  hasBubble,
 } from 'blockly/core';
 
 import type {Block} from 'blockly/core';
@@ -116,8 +117,7 @@ export class EnterAction {
   private shouldHandleEnterForWS(workspace: WorkspaceSvg): boolean {
     if (!this.navigation.canCurrentlyNavigate(workspace)) return false;
 
-    const cursor = workspace.getCursor();
-    const curNode = cursor?.getCurNode();
+    const curNode = workspace.getCursor().getCurNode();
     if (!curNode) return false;
     if (curNode instanceof Field) return curNode.isClickable();
     if (
@@ -143,7 +143,7 @@ export class EnterAction {
    */
   private handleEnterForWS(workspace: WorkspaceSvg): boolean {
     const cursor = workspace.getCursor();
-    const curNode = cursor?.getCurNode();
+    const curNode = cursor.getCurNode();
     if (!curNode) return false;
     if (curNode instanceof Field) {
       curNode.showEditor();
@@ -164,13 +164,11 @@ export class EnterAction {
       // opening a bubble of some sort. We then need to wait for the bubble to
       // appear before attempting to navigate into it.
       curNode.onClick();
-      // This currently only works for MutatorIcons.
-      // See icon_navigation_policy.
-      if (curNode instanceof icons.MutatorIcon) {
-        renderManagement.finishQueuedRenders().then(() => {
-          cursor?.in();
-        });
-      }
+      renderManagement.finishQueuedRenders().then(() => {
+        if (hasBubble(curNode) && curNode.bubbleIsVisible()) {
+          cursor.in();
+        }
+      });
       return true;
     } else if (curNode instanceof comments.CommentBarButton) {
       curNode.performAction();

src/actions/enter.ts

@@ -260,7 +260,7 @@ export class MoveActions {
     const node = getFocusManager().getFocusedNode();
     if (node instanceof comments.RenderedWorkspaceComment) return node;
 
-    let block = workspace?.getCursor()?.getSourceBlock();
+    let block = workspace.getCursor().getSourceBlock();
     if (!block) return undefined;
     while (block.isShadow()) {
       block = block.getParent();

src/actions/move.ts

@@ -161,7 +161,7 @@ export class Mover {
     // In case a block is detached, ensure that it still retains focus
     // (otherwise dragging will break). This is also the point a new block's
     // initial insert position is scrolled into view.
-    workspace.getCursor()?.setCurNode(draggable);
+    workspace.getCursor().setCurNode(draggable);
     draggable.getFocusableElement().addEventListener('blur', blurListener);
 
     // Register a keyboard shortcut under the key combos of all existing
@@ -258,7 +258,7 @@ export class Mover {
     );
 
     if (dragStrategy.moveType === MoveType.Insert && target) {
-      workspace.getCursor()?.setCurNode(target);
+      workspace.getCursor().setCurNode(target);
     }
 
     this.postDragEndCleanup(workspace, info);