From b48fe2cb5cc6b8e855dc1b3dc705fbfc22050526 Mon Sep 17 00:00:00 2001 From: igorrCarvalho Date: Mon, 4 Mar 2024 16:43:26 -0300 Subject: [PATCH] Refactor: Make visual shortcut adapt to user OS --- .../components/menuBar/index.tsx | 24 ++++--- .../components/nodeToolbarComponent/index.tsx | 69 ++++++++++++++----- 2 files changed, 67 insertions(+), 26 deletions(-) diff --git a/src/frontend/src/components/headerComponent/components/menuBar/index.tsx b/src/frontend/src/components/headerComponent/components/menuBar/index.tsx index 42a8af71a..e21c13ba4 100644 --- a/src/frontend/src/components/headerComponent/components/menuBar/index.tsx +++ b/src/frontend/src/components/headerComponent/components/menuBar/index.tsx @@ -109,10 +109,14 @@ export const MenuBar = ({ > Undo - + {navigator.userAgent.toUpperCase().includes("MAC") ? ( + + ) : ( + Ctrl + + )} Z Redo - + {navigator.userAgent.toUpperCase().includes("MAC") ? ( + + ) : ( + Ctrl + + )} Y diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx index 83585c304..3d7d6610c 100644 --- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx @@ -420,10 +420,14 @@ export default function NodeToolbarComponent({ className="relative top-0.5 mr-2 h-4 w-4 " />{" "} Edit{" "} - + ) : ( + Ctrl + + )} E @@ -437,10 +441,14 @@ export default function NodeToolbarComponent({ className="relative top-0.5 mr-2 h-4 w-4 " />{" "} Save{" "} - + ) : ( + Ctrl + + )} S @@ -453,10 +461,14 @@ export default function NodeToolbarComponent({ className="relative top-0.5 mr-2 h-4 w-4 " />{" "} Save{" "} + {navigator.userAgent.toUpperCase().includes("MAC") ? ( + name="Command" + className="absolute right-[1.15rem] top-[0.65em] h-3.5 w-3.5 stroke-2" + > + ) : ( + Ctrl + + )} S @@ -469,10 +481,14 @@ export default function NodeToolbarComponent({ className="relative top-0.5 mr-2 h-4 w-4 " />{" "} Copy{" "} - + {navigator.userAgent.toUpperCase().includes("MAC") ? ( + + ) : ( + Ctrl + + )} C @@ -487,10 +503,15 @@ export default function NodeToolbarComponent({ className="relative top-0.5 -m-1 mr-1 h-6 w-6" />{" "} Share{" "} - + ) : ( + Ctrl + )} + {" "} Docs{" "} - + {navigator.userAgent.toUpperCase().includes("MAC") ? ( + + ) : ( + Ctrl + )} {showNode ? "Minimize" : "Expand"} - + ) : ( + Ctrl + + )} Q @@ -555,10 +584,14 @@ export default function NodeToolbarComponent({ className="relative top-0.5 mr-2 h-4 w-4 " />{" "} Ungroup{" "} - + ) : ( + Ctrl + + )} U