From 9c4f3be0f3b377d33ca1d2ee6f6e7c242ad2645f Mon Sep 17 00:00:00 2001 From: NFish Date: Thu, 1 Aug 2024 12:57:30 +0800 Subject: [PATCH] Fix keyboard shortcut conflict between workflow and browser (#6863) --- web/app/components/workflow/index.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/web/app/components/workflow/index.tsx b/web/app/components/workflow/index.tsx index 0f69b56840..345ed46ff0 100644 --- a/web/app/components/workflow/index.tsx +++ b/web/app/components/workflow/index.tsx @@ -194,6 +194,10 @@ const Workflow: FC = memo(({ e.preventDefault() if ((e.key === 'z' || e.key === 'Z') && (e.ctrlKey || e.metaKey)) e.preventDefault() + if ((e.key === 'y' || e.key === 'Y') && (e.ctrlKey || e.metaKey)) + e.preventDefault() + if ((e.key === 's' || e.key === 'S') && (e.ctrlKey || e.metaKey)) + e.preventDefault() }) useEventListener('mousemove', (e) => { const containerClientRect = workflowContainerRef.current?.getBoundingClientRect() @@ -260,7 +264,7 @@ const Workflow: FC = memo(({ const { shortcutsEnabled: workflowHistoryShortcutsEnabled } = useWorkflowHistoryStore() - useKeyPress('delete', handleNodesDelete) + useKeyPress(['delete', 'backspace'], handleNodesDelete) useKeyPress(['delete', 'backspace'], handleEdgeDelete) useKeyPress(`${getKeyboardKeyCodeBySystem('ctrl')}.c`, (e) => { if (isEventTargetInputArea(e.target as HTMLElement)) @@ -310,7 +314,7 @@ const Workflow: FC = memo(({ > -
+
{