refactorio

webui/src/controls/inputs/GamepadInputManager.jsx

@@ -11,6 +11,7 @@ import {
 } from './gamepadBindings.js';
 import { subscribeGamepadHub } from './gamepadHub.js';
 import { isTextEntryActive } from './inputFocusUtils.js';
+import { useManualDockAssist } from '../../features/manualDockAssist/useManualDockAssist.js';
 
 const SOURCE = 'gamepad';
 const ZERO_VECTOR = { x: 0, y: 0, boost: false };
@@ -50,8 +51,6 @@ export default function GamepadInputManager() {
     state,
     actions: {
       setMode,
-      setManualDockAssistActive,
-      toggleManualDockAssist,
       setDriveVector,
       setAuxMotors,
       setServoAngle,
@@ -60,6 +59,7 @@ export default function GamepadInputManager() {
       registerInputState,
     },
   } = useControlSystem();
+  const dockAssist = useManualDockAssist();
   const { value: gamepadSettings, save: saveGamepadSettings } = useSettingsNamespace(
     'gamepad',
     GAMEPAD_SETTINGS_DEFAULTS,
@@ -245,7 +245,7 @@ export default function GamepadInputManager() {
       }
 
       if (outputs.buttons.driveMacro && handleButtonEdge('driveMacro', true)) {
-        setManualDockAssistActive(false);
+        dockAssist.exitAssist();
         setMode('drive');
         runMacro('drive-sequence');
       } else if (!outputs.buttons.driveMacro) {
@@ -253,7 +253,7 @@ export default function GamepadInputManager() {
       }
 
       if (outputs.buttons.dockMacro && handleButtonEdge('dockMacro', true)) {
-        toggleManualDockAssist();
+        dockAssist.toggleAssist();
       } else if (!outputs.buttons.dockMacro) {
         handleButtonEdge('dockMacro', false);
       }
@@ -290,12 +290,11 @@ export default function GamepadInputManager() {
     handleCameraAxis,
     registerInputState,
     runMacro,
-    setManualDockAssistActive,
     setAuxMotors,
     setDriveVector,
     setMode,
-    toggleManualDockAssist,
     toggleNightVision,
+    dockAssist,
   ]);
 
   return null;

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);