chore: lint fixes.

core/blockly.ts

@@ -106,7 +106,11 @@ import {FlyoutItem} from './flyout_item.js';
 import {FlyoutMetricsManager} from './flyout_metrics_manager.js';
 import {FlyoutSeparator} from './flyout_separator.js';
 import {VerticalFlyout} from './flyout_vertical.js';
-import {FocusManager, getFocusManager, ReturnEphemeralFocus} from './focus_manager.js';
+import {
+  FocusManager,
+  ReturnEphemeralFocus,
+  getFocusManager,
+} from './focus_manager.js';
 import {CodeGenerator} from './generator.js';
 import {Gesture} from './gesture.js';
 import {Grid} from './grid.js';
@@ -523,7 +527,6 @@ export {
   FlyoutMetricsManager,
   FlyoutSeparator,
   FocusManager,
-  ReturnEphemeralFocus,
   CodeGenerator as Generator,
   Gesture,
   Grid,
@@ -588,6 +591,7 @@ export {
   Names,
   Options,
   RenderedConnection,
+  ReturnEphemeralFocus,
   Scrollbar,
   ScrollbarPair,
   SeparatorFlyoutInflater,

core/focus_manager.ts

@@ -6,8 +6,8 @@
 
 import type {IFocusableNode} from './interfaces/i_focusable_node.js';
 import type {IFocusableTree} from './interfaces/i_focusable_tree.js';
-import {FocusableTreeTraverser} from './utils/focusable_tree_traverser.js';
 import * as dom from './utils/dom.js';
+import {FocusableTreeTraverser} from './utils/focusable_tree_traverser.js';
 
 /**
  * Type declaration for returning focus to FocusManager upon completing an
@@ -81,7 +81,9 @@ export class FocusManager {
         // should claim the element.
         for (const tree of this.registeredTrees) {
           newNode = FocusableTreeTraverser.findFocusableNodeFor(
-            activeElement, tree);
+            activeElement,
+            tree,
+          );
           if (newNode) break;
         }
       }

core/utils/focusable_tree_traverser.ts

@@ -15,10 +15,8 @@ import * as dom from '../utils/dom.js';
 export class FocusableTreeTraverser {
   private static readonly ACTIVE_CLASS_NAME = 'blocklyActiveFocus';
   private static readonly PASSIVE_CSS_CLASS_NAME = 'blocklyPassiveFocus';
-  private static readonly ACTIVE_FOCUS_NODE_CSS_SELECTOR = (
-    `.${FocusableTreeTraverser.ACTIVE_CLASS_NAME}`);
-    private static readonly PASSIVE_FOCUS_NODE_CSS_SELECTOR = (
-    `.${FocusableTreeTraverser.PASSIVE_CSS_CLASS_NAME}`);
+  private static readonly ACTIVE_FOCUS_NODE_CSS_SELECTOR = `.${FocusableTreeTraverser.ACTIVE_CLASS_NAME}`;
+  private static readonly PASSIVE_FOCUS_NODE_CSS_SELECTOR = `.${FocusableTreeTraverser.PASSIVE_CSS_CLASS_NAME}`;
 
   /**
    * Returns the current IFocusableNode that is styled (and thus represented) as
@@ -46,7 +44,9 @@ export class FocusableTreeTraverser {
     const activeEl = root.querySelector(this.ACTIVE_FOCUS_NODE_CSS_SELECTOR);
     if (activeEl instanceof HTMLElement || activeEl instanceof SVGElement) {
       const active = FocusableTreeTraverser.findFocusableNodeFor(
-        activeEl, tree);
+        activeEl,
+        tree,
+      );
       if (active) return active;
     }
 
@@ -55,7 +55,9 @@ export class FocusableTreeTraverser {
     const passiveEl = root.querySelector(this.PASSIVE_FOCUS_NODE_CSS_SELECTOR);
     if (passiveEl instanceof HTMLElement || passiveEl instanceof SVGElement) {
       const passive = FocusableTreeTraverser.findFocusableNodeFor(
-        passiveEl, tree);
+        passiveEl,
+        tree,
+      );
       if (passive) return passive;
     }
 
@@ -87,11 +89,9 @@ export class FocusableTreeTraverser {
     tree: IFocusableTree,
   ): IFocusableNode | null {
     // First, match against subtrees.
-    const subTreeMatches = tree
-      .getNestedTrees()
-      .map((tree) => {
-        return FocusableTreeTraverser.findFocusableNodeFor(element, tree);
-      });
+    const subTreeMatches = tree.getNestedTrees().map((tree) => {
+      return FocusableTreeTraverser.findFocusableNodeFor(element, tree);
+    });
     if (subTreeMatches.findIndex((match) => !!match) !== -1) {
       // At least one subtree has a match for the element so it cannot be part
       // of the outer tree.

tests/mocha/focusable_tree_traverser_test.js

@@ -108,7 +108,10 @@ suite('FocusableTreeTraverser', function () {
     sharedTestTeardown.call(this);
 
     const removeFocusIndicators = function (element) {
-      element.classList.remove(FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME, FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
+      element.classList.remove(
+        FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME,
+        FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME,
+      );
     };
 
     // Ensure all node CSS styles are reset so that state isn't leaked between tests.
@@ -142,7 +145,9 @@ suite('FocusableTreeTraverser', function () {
     test('for tree with root active highlight returns root node', function () {
       const tree = this.testFocusableTree1;
       const rootNode = tree.getRootFocusableNode();
-      rootNode.getFocusableElement().classList.add(FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME);
+      rootNode
+        .getFocusableElement()
+        .classList.add(FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME);
 
       const finding = FocusableTreeTraverser.findFocusedNode(tree);
 
@@ -152,7 +157,9 @@ suite('FocusableTreeTraverser', function () {
     test('for tree with root passive highlight returns root node', function () {
       const tree = this.testFocusableTree1;
       const rootNode = tree.getRootFocusableNode();
-      rootNode.getFocusableElement().classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
+      rootNode
+        .getFocusableElement()
+        .classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
 
       const finding = FocusableTreeTraverser.findFocusedNode(tree);
 
@@ -162,7 +169,9 @@ suite('FocusableTreeTraverser', function () {
     test('for tree with node active highlight returns node', function () {
       const tree = this.testFocusableTree1;
       const node = this.testFocusableTree1Node1;
-      node.getFocusableElement().classList.add(FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME);
+      node
+        .getFocusableElement()
+        .classList.add(FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME);
 
       const finding = FocusableTreeTraverser.findFocusedNode(tree);
 
@@ -172,7 +181,9 @@ suite('FocusableTreeTraverser', function () {
     test('for tree with node passive highlight returns node', function () {
       const tree = this.testFocusableTree1;
       const node = this.testFocusableTree1Node1;
-      node.getFocusableElement().classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
+      node
+        .getFocusableElement()
+        .classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
 
       const finding = FocusableTreeTraverser.findFocusedNode(tree);
 
@@ -182,7 +193,9 @@ suite('FocusableTreeTraverser', function () {
     test('for tree with nested node active highlight returns node', function () {
       const tree = this.testFocusableTree1;
       const node = this.testFocusableTree1Node1Child1;
-      node.getFocusableElement().classList.add(FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME);
+      node
+        .getFocusableElement()
+        .classList.add(FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME);
 
       const finding = FocusableTreeTraverser.findFocusedNode(tree);
 
@@ -192,7 +205,9 @@ suite('FocusableTreeTraverser', function () {
     test('for tree with nested node passive highlight returns node', function () {
       const tree = this.testFocusableTree1;
       const node = this.testFocusableTree1Node1Child1;
-      node.getFocusableElement().classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
+      node
+        .getFocusableElement()
+        .classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
 
       const finding = FocusableTreeTraverser.findFocusedNode(tree);
 
@@ -202,7 +217,9 @@ suite('FocusableTreeTraverser', function () {
     test('for tree with nested tree root active no parent highlights returns root', function () {
       const tree = this.testFocusableNestedTree4;
       const rootNode = this.testFocusableNestedTree4.getRootFocusableNode();
-      rootNode.getFocusableElement().classList.add(FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME);
+      rootNode
+        .getFocusableElement()
+        .classList.add(FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME);
 
       const finding = FocusableTreeTraverser.findFocusedNode(tree);
 
@@ -212,7 +229,9 @@ suite('FocusableTreeTraverser', function () {
     test('for tree with nested tree root passive no parent highlights returns root', function () {
       const tree = this.testFocusableNestedTree4;
       const rootNode = this.testFocusableNestedTree4.getRootFocusableNode();
-      rootNode.getFocusableElement().classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
+      rootNode
+        .getFocusableElement()
+        .classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
 
       const finding = FocusableTreeTraverser.findFocusedNode(tree);
 
@@ -222,7 +241,9 @@ suite('FocusableTreeTraverser', function () {
     test('for tree with nested tree node active no parent highlights returns node', function () {
       const tree = this.testFocusableNestedTree4;
       const node = this.testFocusableNestedTree4Node1;
-      node.getFocusableElement().classList.add(FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME);
+      node
+        .getFocusableElement()
+        .classList.add(FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME);
 
       const finding = FocusableTreeTraverser.findFocusedNode(tree);
 
@@ -232,7 +253,9 @@ suite('FocusableTreeTraverser', function () {
     test('for tree with nested tree root passive no parent highlights returns null', function () {
       const tree = this.testFocusableNestedTree4;
       const node = this.testFocusableNestedTree4Node1;
-      node.getFocusableElement().classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
+      node
+        .getFocusableElement()
+        .classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
 
       const finding = FocusableTreeTraverser.findFocusedNode(tree);
 
@@ -245,7 +268,9 @@ suite('FocusableTreeTraverser', function () {
       this.testFocusableTree2Node1
         .getFocusableElement()
         .classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
-      rootNode.getFocusableElement().classList.add(FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME);
+      rootNode
+        .getFocusableElement()
+        .classList.add(FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME);
 
       const finding = FocusableTreeTraverser.findFocusedNode(
         this.testFocusableTree2,
@@ -260,7 +285,9 @@ suite('FocusableTreeTraverser', function () {
       this.testFocusableTree2Node1
         .getFocusableElement()
         .classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
-      rootNode.getFocusableElement().classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
+      rootNode
+        .getFocusableElement()
+        .classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
 
       const finding = FocusableTreeTraverser.findFocusedNode(
         this.testFocusableTree2,
@@ -275,7 +302,9 @@ suite('FocusableTreeTraverser', function () {
       this.testFocusableTree2Node1
         .getFocusableElement()
         .classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
-      node.getFocusableElement().classList.add(FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME);
+      node
+        .getFocusableElement()
+        .classList.add(FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME);
 
       const finding = FocusableTreeTraverser.findFocusedNode(
         this.testFocusableTree2,
@@ -290,7 +319,9 @@ suite('FocusableTreeTraverser', function () {
       this.testFocusableTree2Node1
         .getFocusableElement()
         .classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
-      node.getFocusableElement().classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
+      node
+        .getFocusableElement()
+        .classList.add(FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME);
 
       const finding = FocusableTreeTraverser.findFocusedNode(
         this.testFocusableTree2,