Skip to content

Commit 3363b0b

Browse files
fix(ui): unnecessary dependency on tab selection in
useCanvasDeleteLayerHotkey
1 parent ea057d7 commit 3363b0b

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

invokeai/frontend/web/src/features/controlLayers/hooks/useCanvasDeleteLayerHotkey.ts

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,27 @@ import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
44
import { entityDeleted } from 'features/controlLayers/store/canvasSlice';
55
import { selectSelectedEntityIdentifier } from 'features/controlLayers/store/selectors';
66
import { useRegisteredHotkeys } from 'features/system/components/HotkeysModal/useHotkeyData';
7-
import { selectActiveTab, selectActiveTabCanvasRightPanel } from 'features/ui/store/uiSelectors';
8-
import { useCallback, useMemo } from 'react';
7+
import { selectActiveTabCanvasRightPanel } from 'features/ui/store/uiSelectors';
8+
import { useCallback } from 'react';
99

1010
export function useCanvasDeleteLayerHotkey() {
1111
useAssertSingleton(useCanvasDeleteLayerHotkey.name);
1212
const dispatch = useAppDispatch();
1313
const selectedEntityIdentifier = useAppSelector(selectSelectedEntityIdentifier);
1414
const isBusy = useCanvasIsBusy();
1515
const canvasRightPanelTab = useAppSelector(selectActiveTabCanvasRightPanel);
16-
const appTab = useAppSelector(selectActiveTab);
1716

1817
const deleteSelectedLayer = useCallback(() => {
19-
if (selectedEntityIdentifier === null) {
18+
if (selectedEntityIdentifier === null || isBusy || canvasRightPanelTab !== 'layers') {
2019
return;
2120
}
2221
dispatch(entityDeleted({ entityIdentifier: selectedEntityIdentifier }));
23-
}, [dispatch, selectedEntityIdentifier]);
24-
25-
const isDeleteEnabled = useMemo(
26-
() => selectedEntityIdentifier !== null && !isBusy && canvasRightPanelTab === 'layers' && appTab === 'canvas',
27-
[selectedEntityIdentifier, isBusy, canvasRightPanelTab, appTab]
28-
);
22+
}, [canvasRightPanelTab, dispatch, isBusy, selectedEntityIdentifier]);
2923

3024
useRegisteredHotkeys({
3125
id: 'deleteSelected',
3226
category: 'canvas',
3327
callback: deleteSelectedLayer,
34-
options: { enabled: isDeleteEnabled },
35-
dependencies: [isDeleteEnabled, deleteSelectedLayer],
28+
dependencies: [deleteSelectedLayer],
3629
});
3730
}

0 commit comments

Comments
 (0)