chore: lint fixes

Author: BenHenning

src/actions/arrow_navigation.ts

@@ -54,6 +54,7 @@ export class ArrowNavigation {
       shortcut: ShortcutRegistry.KeyboardShortcut,
     ): boolean => {
       const toolbox = workspace.getToolbox() as Toolbox;
+      const flyout = workspace.getFlyout();
       let isHandled = false;
       switch (this.navigation.getState(workspace)) {
         case Constants.STATE.WORKSPACE:
@@ -70,7 +71,6 @@ export class ArrowNavigation {
         case Constants.STATE.TOOLBOX:
           // @ts-expect-error private method
           isHandled = toolbox && toolbox.selectChild();
-          const flyout = workspace.getFlyout();
           if (!isHandled && flyout) {
             Blockly.getFocusManager().focusTree(flyout.getWorkspace());
           }
@@ -174,18 +174,22 @@ export class ArrowNavigation {
               }
               return isHandled;
             case Constants.STATE.TOOLBOX:
-              if (!toolbox) return false;
-              if (!toolbox.getSelectedItem()) {
-                const firstItem = toolbox.getToolboxItems().find((item) => item.isSelectable()) ?? null;
-                toolbox.setSelectedItem(firstItem);
-                isHandled = true;
-              } else {
-                // @ts-expect-error private method
-                isHandled = toolbox.selectNext();
-              }
-              const selectedItem = toolbox.getSelectedItem();
-              if (selectedItem) {
-                Blockly.getFocusManager().focusNode(selectedItem);
+              if (toolbox) {
+                if (!toolbox.getSelectedItem()) {
+                  const firstItem =
+                    toolbox
+                      .getToolboxItems()
+                      .find((item) => item.isSelectable()) ?? null;
+                  toolbox.setSelectedItem(firstItem);
+                  isHandled = true;
+                } else {
+                  // @ts-expect-error private method
+                  isHandled = toolbox.selectNext();
+                }
+                const selectedItem = toolbox.getSelectedItem();
+                if (selectedItem) {
+                  Blockly.getFocusManager().focusNode(selectedItem);
+                }
               }
               return isHandled;
             default:
@@ -233,12 +237,13 @@ export class ArrowNavigation {
               }
               return isHandled;
             case Constants.STATE.TOOLBOX:
-              if (!toolbox) return false;
-              // @ts-expect-error private method
-              isHandled = toolbox.selectPrevious();
-              const selectedItem = toolbox.getSelectedItem();
-              if (selectedItem) {
-                Blockly.getFocusManager().focusNode(selectedItem);
+              if (toolbox) {
+                // @ts-expect-error private method
+                isHandled = toolbox.selectPrevious();
+                const selectedItem = toolbox.getSelectedItem();
+                if (selectedItem) {
+                  Blockly.getFocusManager().focusNode(selectedItem);
+                }
               }
               return isHandled;
             default:

src/actions/clipboard.ts

@@ -13,7 +13,7 @@ import {
   clipboard,
   ICopyData,
   LineCursor,
-  getFocusManager
+  getFocusManager,
 } from 'blockly';
 import * as Constants from '../constants';
 import type {BlockSvg, WorkspaceSvg} from 'blockly';

src/actions/enter.ts

@@ -14,7 +14,7 @@ import {
   Field,
   FlyoutButton,
   WorkspaceSvg,
-  getFocusManager
+  getFocusManager,
 } from 'blockly/core';
 
 import * as Constants from '../constants';

src/actions/exit.ts

@@ -8,7 +8,7 @@ import {
   ShortcutRegistry,
   utils as BlocklyUtils,
   getFocusManager,
-  Gesture
+  Gesture,
 } from 'blockly/core';
 
 import * as Constants from '../constants';

src/navigation_controller.ts

@@ -205,10 +205,9 @@ export class NavigationController {
       callback: (workspace) => {
         switch (this.navigation.getState(workspace)) {
           case Constants.STATE.WORKSPACE:
-            Blockly.getFocusManager()
-              .focusTree(
-                workspace.getToolbox() ?? workspace.getFlyout() ?? workspace
-              );
+            Blockly.getFocusManager().focusTree(
+              workspace.getToolbox() ?? workspace.getFlyout() ?? workspace,
+            );
             return true;
           default:
             return false;

test/index.html

@@ -97,39 +97,55 @@
         font-weight: bold;
       }
 
-      .blocklyActiveFocus:is(.blocklyField,.blocklyPath,.blocklyHighlightedConnectionPath) {
+      .blocklyActiveFocus:is(
+          .blocklyField,
+          .blocklyPath,
+          .blocklyHighlightedConnectionPath
+        ) {
         stroke: #ffa200;
         stroke-width: 3px;
         outline-width: 0px;
       }
-      .blocklyActiveFocus > .blocklyFlyoutBackground, .blocklyActiveFocus > .blocklyMainBackground {
+      .blocklyActiveFocus > .blocklyFlyoutBackground,
+      .blocklyActiveFocus > .blocklyMainBackground {
         stroke: #ffa200;
         stroke-width: 3px;
       }
-      .blocklyActiveFocus:is(.blocklyFlyout,.blocklyWorkspace) {
+      .blocklyActiveFocus:is(.blocklyFlyout, .blocklyWorkspace) {
         outline-width: 0px;
       }
-      .blocklyActiveFocus:is(.blocklyToolbox,.blocklyToolboxCategoryContainer) {
+      .blocklyActiveFocus:is(
+          .blocklyToolbox,
+          .blocklyToolboxCategoryContainer
+        ) {
         outline: 3px solid #ffa200;
       }
-      .blocklyPassiveFocus:is(.blocklyField,.blocklyPath,.blocklyHighlightedConnectionPath) {
+      .blocklyPassiveFocus:is(
+          .blocklyField,
+          .blocklyPath,
+          .blocklyHighlightedConnectionPath
+        ) {
         stroke: #ffa200;
         stroke-dasharray: 5px 3px;
         stroke-width: 3px;
       }
-      .blocklyPassiveFocus > .blocklyFlyoutBackground, .blocklyPassiveFocus > .blocklyMainBackground {
+      .blocklyPassiveFocus > .blocklyFlyoutBackground,
+      .blocklyPassiveFocus > .blocklyMainBackground {
         stroke: #ffa200;
         stroke-dasharray: 5px 3px;
         stroke-width: 3px;
       }
-      .blocklyPassiveFocus:is(.blocklyToolbox,.blocklyToolboxCategoryContainer) {
+      .blocklyPassiveFocus:is(
+          .blocklyToolbox,
+          .blocklyToolboxCategoryContainer
+        ) {
         border: 3px dashed #ffa200;
       }
       .blocklySelected:is(.blocklyPath) {
         stroke: #ffa200;
         stroke-width: 5;
       }
-      .blocklySelected>.blocklyPathLight {
+      .blocklySelected > .blocklyPathLight {
         display: none;
       }
     </style>