Skip to content

fix,feat: canvas followups 13 #6893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 19, 2024
Merged

fix,feat: canvas followups 13 #6893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
633d40b
fix(ui): delete hotkey doesn't delete
psychedelicious Sep 19, 2024
23ccf51
fix(ui): isolate workflows & gallery hotkeys
psychedelicious Sep 19, 2024
bfba4b1
fix(ui): brush/eraser tool width hotkeys
psychedelicious Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolBrushWidth.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export const ToolBrushWidth = memo(() => {
}, [width]);

useRegisteredHotkeys({
id: 'incrementToolWidth',
id: 'decrementToolWidth',
category: 'canvas',
callback: decrement,
options: { enabled: isSelected && !imageViewer.isOpen },
Expand Down
2 changes: 1 addition & 1 deletion invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolEraserWidth.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export const ToolEraserWidth = memo(() => {
}, [width]);

useRegisteredHotkeys({
id: 'incrementToolWidth',
id: 'decrementToolWidth',
category: 'canvas',
callback: decrement,
options: { enabled: isSelected && !imageViewer.isOpen },
Expand Down
7 changes: 4 additions & 3 deletions invokeai/frontend/web/src/features/gallery/hooks/useGalleryHotkeys.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useStore } from '@nanostores/react';
import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
import { $activeScopes } from 'common/hooks/interactionScopes';
import { $activeScopes, INTERACTION_SCOPES } from 'common/hooks/interactionScopes';
import { useAssertSingleton } from 'common/hooks/useAssertSingleton';
import { $canvasRightPanelTab } from 'features/controlLayers/store/ephemeral';
import { imagesToDeleteSelected } from 'features/deleteImageModal/store/slice';
Expand Down Expand Up @@ -38,6 +38,7 @@ export const useGalleryHotkeys = () => {
const upDownHotkeysEnabled = useStore($upDownHotkeysEnabled);
const canvasRightPanelTab = useStore($canvasRightPanelTab);
const appTab = useAppSelector(selectActiveTab);
const isWorkflowsScopeActive = useStore(INTERACTION_SCOPES.workflows.$isActive);

// When we are on the canvas tab, we need to disable the delete hotkey when the user is focused on the layers tab in
// the right hand panel, because the same hotkey is used to delete layers.
Expand Down Expand Up @@ -212,7 +213,7 @@ export const useGalleryHotkeys = () => {
}
dispatch(imagesToDeleteSelected(selection));
},
options: { enabled: leftRightHotkeysEnabled && isDeleteEnabledByTab },
dependencies: [leftRightHotkeysEnabled, isDeleteEnabledByTab],
options: { enabled: leftRightHotkeysEnabled && isDeleteEnabledByTab && !isWorkflowsScopeActive },
dependencies: [leftRightHotkeysEnabled, isDeleteEnabledByTab, selection, isWorkflowsScopeActive],
});
};
6 changes: 4 additions & 2 deletions invokeai/frontend/web/src/features/nodes/components/flow/Flow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useGlobalMenuClose, useToken } from '@invoke-ai/ui-library';
import { useStore } from '@nanostores/react';
import { useAppDispatch, useAppSelector, useAppStore } from 'app/store/storeHooks';
import { INTERACTION_SCOPES, useScopeImperativeApi } from 'common/hooks/interactionScopes';
import { INTERACTION_SCOPES, useScopeImperativeApi, useScopeOnFocus } from 'common/hooks/interactionScopes';
import { useConnection } from 'features/nodes/hooks/useConnection';
import { useCopyPaste } from 'features/nodes/hooks/useCopyPaste';
import { useSyncExecutionState } from 'features/nodes/hooks/useExecutionState';
Expand Down Expand Up @@ -91,6 +91,7 @@ export const Flow = memo(() => {
const store = useAppStore();
const isWorkflowsActive = useStore(INTERACTION_SCOPES.workflows.$isActive);
const workflowsScopeApi = useScopeImperativeApi('workflows');
useScopeOnFocus('workflows', flowWrapper);

useWorkflowWatcher();
useSyncExecutionState();
Expand Down Expand Up @@ -318,7 +319,8 @@ export const Flow = memo(() => {
id: 'deleteSelection',
category: 'workflows',
callback: deleteSelection,
dependencies: [deleteSelection],
options: { preventDefault: true, enabled: isWorkflowsActive },
dependencies: [deleteSelection, isWorkflowsActive],
});

return (
Expand Down