refactorio

webui/src/controls/inputs/KeyboardInputManager.jsx

@@ -9,6 +9,7 @@ import { isKeyboardCaptureLocked } from './keyboardCaptureLock.js';
 import { isTextInputElement } from './inputFocusUtils.js';
 import { useSettingsNamespace } from '../../settings/index.js';
 import { INPUT_SETTINGS_DEFAULTS } from '../../settings/namespaces.js';
+import { useManualDockAssist } from '../../features/manualDockAssist/useManualDockAssist.js';
 import {
   SONG_DEFAULT_DURATION,
   SONG_DEFAULT_NOTE,
@@ -122,8 +123,6 @@ export default function KeyboardInputManager() {
     state,
     actions: {
       setMode,
-      setManualDockAssistActive,
-      toggleManualDockAssist,
       setDriveVector,
       setAuxMotors,
       nudgeServo,
@@ -139,6 +138,7 @@ export default function KeyboardInputManager() {
     },
   } = useControlSystem();
   const homeAssistant = useSessionSelector((state) => state.session?.homeAssistant || null);
+  const dockAssist = useManualDockAssist();
   const { homeAssistantSetState } = useSessionActions();
   const { focusChat, blurChat, isChatFocused } = useChat();
   const { value: inputSettings } = useSettingsNamespace('inputs', INPUT_SETTINGS_DEFAULTS);
@@ -374,11 +374,11 @@ export default function KeyboardInputManager() {
 
       if (newlyPressed.length > 0) {
         if (newlyPressed.some((token) => keymap.driveMacro?.has(token))) {
-          setManualDockAssistActive(false);
+          dockAssist.exitAssist();
           setMode('drive');
           runMacro('drive-sequence');
         } else if (newlyPressed.some((token) => keymap.dockMacro?.has(token))) {
-          toggleManualDockAssist();
+          dockAssist.toggleAssist();
         } else if (newlyPressed.some((token) => keymap.nightVisionToggle?.has(token))) {
           toggleNightVision();
         } else if (newlyPressed.some((token) => keymap.hornHonk?.has(token))) {
@@ -443,15 +443,14 @@ export default function KeyboardInputManager() {
     keymap.micPtt,
     resetAll,
     runMacro,
-    setManualDockAssistActive,
     setMicPttActive,
     setMode,
     stopAllMotion,
     stopSongLoop,
     startHorn,
     stopHorn,
-    toggleManualDockAssist,
     triggerHomeAssistantCycle,
+    dockAssist,
   ]);
 
   const latestResetAllRef = useRef(resetAll);