diff --git a/frontend/src/features/canvas/components/IAICanvasToolbar/IAICanvasToolbar.tsx b/frontend/src/features/canvas/components/IAICanvasToolbar/IAICanvasToolbar.tsx index 9e0ac65504..7f154faadb 100644 --- a/frontend/src/features/canvas/components/IAICanvasToolbar/IAICanvasToolbar.tsx +++ b/frontend/src/features/canvas/components/IAICanvasToolbar/IAICanvasToolbar.tsx @@ -59,7 +59,7 @@ const IAICanvasOutpaintingControls = () => { const canvasBaseLayer = getCanvasBaseLayer(); useHotkeys( - ['m'], + ['v'], () => { handleSelectMoveTool(); }, @@ -193,8 +193,8 @@ const IAICanvasOutpaintingControls = () => { } data-selected={tool === 'move' || isStaging} onClick={handleSelectMoveTool} diff --git a/frontend/src/features/canvas/hooks/useCanvasHotkeys.ts b/frontend/src/features/canvas/hooks/useCanvasHotkeys.ts index cd7b103653..b9d251057b 100644 --- a/frontend/src/features/canvas/hooks/useCanvasHotkeys.ts +++ b/frontend/src/features/canvas/hooks/useCanvasHotkeys.ts @@ -5,7 +5,6 @@ import { activeTabNameSelector } from 'features/options/store/optionsSelectors'; import { setShouldShowBoundingBox, setTool, - toggleShouldLockBoundingBox, } from 'features/canvas/store/canvasSlice'; import { useAppDispatch, useAppSelector } from 'app/store'; import { useRef } from 'react'; @@ -47,18 +46,6 @@ const useInpaintingCanvasHotkeys = () => { const canvasStage = getCanvasStage(); - // Toggle lock bounding box - useHotkeys( - 'shift+w', - () => { - dispatch(toggleShouldLockBoundingBox()); - }, - { - preventDefault: true, - }, - [activeTabName] - ); - useHotkeys( 'shift+h', () => { diff --git a/frontend/src/features/system/components/HotkeysModal/HotkeysModal.tsx b/frontend/src/features/system/components/HotkeysModal/HotkeysModal.tsx index d6097a422f..a9858427f6 100644 --- a/frontend/src/features/system/components/HotkeysModal/HotkeysModal.tsx +++ b/frontend/src/features/system/components/HotkeysModal/HotkeysModal.tsx @@ -52,7 +52,7 @@ export default function HotkeysModal({ children }: HotkeysModalProps) { { title: 'Toggle Viewer', desc: 'Open and close Image Viewer', - hotkey: 'V', + hotkey: 'Z', }, { title: 'Toggle Gallery', @@ -161,7 +161,7 @@ export default function HotkeysModal({ children }: HotkeysModalProps) { { title: 'Move Tool', desc: 'Allows canvas navigation', - hotkey: 'M', + hotkey: 'V', }, { title: 'Quick Toggle Move', diff --git a/frontend/src/features/tabs/components/InvokeTabs.tsx b/frontend/src/features/tabs/components/InvokeTabs.tsx index b3d6863b7b..80797f942f 100644 --- a/frontend/src/features/tabs/components/InvokeTabs.tsx +++ b/frontend/src/features/tabs/components/InvokeTabs.tsx @@ -94,13 +94,9 @@ export default function InvokeTabs() { dispatch(setActiveTab(4)); }); - useHotkeys('6', () => { - dispatch(setActiveTab(5)); - }); - // Lightbox Hotkey useHotkeys( - 'v', + 'z', () => { dispatch(setIsLightBoxOpen(!isLightBoxOpen)); }, diff --git a/frontend/src/features/tabs/components/InvokeWorkarea.tsx b/frontend/src/features/tabs/components/InvokeWorkarea.tsx index 69e3967d65..1ca3da314a 100644 --- a/frontend/src/features/tabs/components/InvokeWorkarea.tsx +++ b/frontend/src/features/tabs/components/InvokeWorkarea.tsx @@ -1,7 +1,6 @@ import { Tooltip } from '@chakra-ui/react'; import { createSelector } from '@reduxjs/toolkit'; import { ReactNode } from 'react'; -import { useHotkeys } from 'react-hotkeys-hook'; import { VscSplitHorizontal } from 'react-icons/vsc'; import { RootState, useAppDispatch, useAppSelector } from 'app/store'; import ImageGallery from 'features/gallery/components/ImageGallery'; @@ -34,30 +33,14 @@ type InvokeWorkareaProps = { const InvokeWorkarea = (props: InvokeWorkareaProps) => { const dispatch = useAppDispatch(); const { optionsPanel, children, styleClass } = props; - const { - showDualDisplay, - isLightBoxOpen, - shouldShowDualDisplayButton, - } = useAppSelector(workareaSelector); + const { showDualDisplay, isLightBoxOpen, shouldShowDualDisplayButton } = + useAppSelector(workareaSelector); const handleDualDisplay = () => { dispatch(setShowDualDisplay(!showDualDisplay)); dispatch(setDoesCanvasNeedScaling(true)); }; - // Hotkeys - // Toggle split view - useHotkeys( - 'shift+j', - () => { - handleDualDisplay(); - }, - { - enabled: shouldShowDualDisplayButton, - }, - [showDualDisplay] - ); - return (