fix: A few tests.

This also removes some unnecessary code and one TODO.

Author: BenHenning

src/aria_monkey_patches.js

@@ -27,14 +27,20 @@ document.createElementNS = function (namepspaceURI, qualifiedName) {
 };
 
 const oldElementSetAttribute = Element.prototype.setAttribute;
+// TODO: Replace these cases with property augmentation here so that all aria
+// behavior is defined within this file.
+const ariaAttributeAllowlist = ['aria-disabled', 'aria-selected'];
 
 Element.prototype.setAttribute = function (name, value) {
   // This is a hacky way to disable all aria changes in core Blockly since it's
   // easier to just undefine everything globally and then conditionally reenable
   // things with the correct definitions.
+  // TODO: Add an exemption for role here once all roles are properly defined
+  // within this file (see failing tests when role changes are ignored here).
   if (
     aria.isCurrentlyMutatingAriaProperty() ||
-    (name !== 'role' && !name.startsWith('aria-'))
+    ariaAttributeAllowlist.includes(name) ||
+    !name.startsWith('aria-')
   ) {
     oldElementSetAttribute.call(this, name, value);
   }

src/index.ts

@@ -66,16 +66,16 @@ export class KeyboardNavigation {
     workspace.addChangeListener(enableBlocksOnDrag);
 
     // Move the flyout for logical tab order.
-    // const flyout = workspace.getFlyout();
-    // if (flyout != null && flyout instanceof Blockly.Flyout) {
-    //   // This relies on internals.
-    //   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    //   const flyoutElement = ((flyout as any).svgGroup_ as SVGElement) ?? null;
-    //   flyoutElement?.parentElement?.insertBefore(
-    //     flyoutElement,
-    //     workspace.getParentSvg(),
-    //   );
-    // }
+    const flyout = workspace.getFlyout();
+    if (flyout != null && flyout instanceof Blockly.Flyout) {
+      // This relies on internals.
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const flyoutElement = ((flyout as any).svgGroup_ as SVGElement) ?? null;
+      flyoutElement?.parentElement?.insertBefore(
+        flyoutElement,
+        workspace.getParentSvg(),
+      );
+    }
 
     this.oldWorkspaceResize = workspace.resize;
     workspace.resize = () => {
@@ -296,7 +296,7 @@ export class KeyboardNavigation {
     stroke: var(--blockly-active-node-color);
     stroke-width: var(--blockly-selection-width);
   }
-  
+
   /* The workspace itself is the active node. */
   .blocklyKeyboardNavigation
     .blocklyBubble.blocklyActiveFocus

src/move_icon.ts

@@ -139,14 +139,4 @@ export class MoveIcon implements Blockly.IIcon, Blockly.IHasBubble {
   canBeFocused(): boolean {
     return false;
   }
-
-  /** See IFocusableNode.getAriaRole. */
-  getAriaRole(): Blockly.utils.aria.Role | null {
-    throw new Error('This node is not focusable.');
-  }
-
-  /** See IFocusableNode.getAriaLabel. */
-  getAriaLabel(): string {
-    throw new Error('This node is not focusable.');
-  }
 }

src/move_indicator.ts

@@ -172,14 +172,4 @@ export class MoveIndicatorBubble
   canBeFocused(): boolean {
     return false;
   }
-
-  /** See IFocusableNode.getAriaRole. */
-  getAriaRole(): Blockly.utils.aria.Role | null {
-    throw new Error('This node is not focusable.');
-  }
-
-  /** See IFocusableNode.getAriaLabel. */
-  getAriaLabel(): string {
-    throw new Error('This node is not focusable.');
-  }
 }

src/navigation_controller.ts

@@ -36,7 +36,6 @@ import {Mover} from './actions/mover';
 import {DuplicateAction} from './actions/duplicate';
 import {StackNavigationAction} from './actions/stack_navigation';
 
-// TODO: Implement unregistration.
 import './aria_monkey_patches';
 
 const KeyCodes = BlocklyUtils.KeyCodes;