fix(Designer): Add Ctrl to our hotkeys bindings (#4678)

* fix(designer): fix issue where scope nodes didn't get focused when they were jumped to * small pr --------- Co-authored-by: Travis Harris <travisharris@microsoft.com> Co-authored-by: Travis Harris <hartra344@users.noreply.github.com>
Azure · Apr 23, 2024 · 851c9b6 · 851c9b6
1 parent 5676b12
commit 851c9b6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/libs/designer-ui/src/lib/card/scopeCard/index.tsx b/libs/designer-ui/src/lib/card/scopeCard/index.tsx
@@ -102,7 +102,7 @@ export const ScopeCard: React.FC<ScopeCardProps> = ({
                     <Icon
                       className={css('panel-card-v2-badge', 'active', darkBackground && 'darkBackground')}
                       {...iconProps}
-                      ariaLabel={`${title}: ${content}`}
+                      aria-label={`${title}: ${content}`}
                       tabIndex={0}
                     />
                   </div>

diff --git a/libs/designer/src/lib/core/actions/bjsworkflow/__test__/serializer.spec.ts b/libs/designer/src/lib/core/actions/bjsworkflow/__test__/serializer.spec.ts
@@ -1,3 +1,4 @@
+import { DynamicCallStatus } from '@microsoft/designer-ui';
 import type { SerializedParameter } from '../serializer';
 import { constructInputValues } from '../serializer';
 import { describe, vi, beforeEach, afterEach, beforeAll, afterAll, it, test, expect } from 'vitest';
@@ -213,7 +214,7 @@ describe('constructInputValues', () => {
   const rootArrayWithComplexObjectOpenApiParametersBase = [
     {
       dynamicData: {
-        status: 2,
+        status: DynamicCallStatus.SUCCEEDED,
       },
       editor: 'combobox',
       editorOptions: {

diff --git a/libs/designer/src/lib/ui/CustomNodes/OperationCardNode.tsx b/libs/designer/src/lib/ui/CustomNodes/OperationCardNode.tsx
@@ -229,7 +229,7 @@ const DefaultNode = ({ targetPosition = Position.Top, sourcePosition = Position.
   const resubmitClick = useCallback(() => {
     WorkflowService().resubmitWorkflow?.(runInstance?.name ?? '', [id]);
   }, [runInstance, id]);
-  const ref = useHotkeys('meta+c', copyClick, { preventDefault: true });
+  const ref = useHotkeys(['meta+c', 'ctrl+c'], copyClick, { preventDefault: true });
   const contextMenuItems: JSX.Element[] = useMemo(
     () => [
       <DeleteMenuItem key={'delete'} onClick={deleteClick} showKey />,

diff --git a/libs/designer/src/lib/ui/CustomNodes/ScopeCardNode.tsx b/libs/designer/src/lib/ui/CustomNodes/ScopeCardNode.tsx
@@ -193,7 +193,7 @@ const ScopeCardNode = ({ data, targetPosition = Position.Top, sourcePosition = P
     WorkflowService().resubmitWorkflow?.(runInstance?.name ?? '', [id]);
   }, [runInstance, id]);
 
-  const ref = useHotkeys('meta+c', copyClick, { preventDefault: true });
+  const ref = useHotkeys(['meta+c', 'ctrl+c'], copyClick, { preventDefault: true });
   const contextMenuItems: JSX.Element[] = useMemo(
     () => [
       <DeleteMenuItem key={'delete'} onClick={deleteClick} showKey />,

diff --git a/libs/designer/src/lib/ui/connections/dropzone.tsx b/libs/designer/src/lib/ui/connections/dropzone.tsx
@@ -175,7 +175,7 @@ export const DropZone: React.FC<DropZoneProps> = ({ graphId, parentId, childId,
   }, [dispatch, graphId, parentId]);
 
   const ref = useHotkeys(
-    'meta+v',
+    ['meta+v', 'ctrl+v'],
     async () => {
       const copiedNode = await retrieveClipboardData();
       const pasteEnabled = !!copiedNode;