From 291ded8286e3e274f599150343e712c3fefb5ca5 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Wed, 22 May 2024 12:18:05 +0300
Subject: [PATCH] Add Command key detection logic for Mac

---
 rsconcept/frontend/src/app/Navigation/Navigation.tsx     | 9 +++++----
 rsconcept/frontend/src/app/Navigation/UserDropdown.tsx   | 2 +-
 rsconcept/frontend/src/components/RSInput/RSInput.tsx    | 6 +++---
 .../frontend/src/components/RefsInput/RefsInput.tsx      | 2 +-
 rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx | 2 +-
 .../RSFormPage/EditorConstituenta/EditorConstituenta.tsx | 2 +-
 .../src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx   | 2 +-
 .../src/pages/RSFormPage/EditorTermGraph/TermGraph.tsx   | 2 +-
 .../src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx  | 2 +-
 rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx   | 2 +-
 10 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/rsconcept/frontend/src/app/Navigation/Navigation.tsx b/rsconcept/frontend/src/app/Navigation/Navigation.tsx
index dfc38192..51378a27 100644
--- a/rsconcept/frontend/src/app/Navigation/Navigation.tsx
+++ b/rsconcept/frontend/src/app/Navigation/Navigation.tsx
@@ -17,10 +17,11 @@ function Navigation() {
   const router = useConceptNavigation();
   const { noNavigationAnimation } = useConceptOptions();
 
-  const navigateHome = (event: CProps.EventMouse) => router.push(urls.home, event.ctrlKey);
-  const navigateLibrary = (event: CProps.EventMouse) => router.push(urls.library, event.ctrlKey);
-  const navigateHelp = (event: CProps.EventMouse) => router.push(urls.manuals, event.ctrlKey);
-  const navigateCreateNew = (event: CProps.EventMouse) => router.push(urls.create_schema, event.ctrlKey);
+  const navigateHome = (event: CProps.EventMouse) => router.push(urls.home, event.ctrlKey || event.metaKey);
+  const navigateLibrary = (event: CProps.EventMouse) => router.push(urls.library, event.ctrlKey || event.metaKey);
+  const navigateHelp = (event: CProps.EventMouse) => router.push(urls.manuals, event.ctrlKey || event.metaKey);
+  const navigateCreateNew = (event: CProps.EventMouse) =>
+    router.push(urls.create_schema, event.ctrlKey || event.metaKey);
 
   return (
     <nav
diff --git a/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx b/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx
index 5d1b2aa1..a05af23e 100644
--- a/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx
+++ b/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx
@@ -30,7 +30,7 @@ function UserDropdown({ isOpen, hideDropdown }: UserDropdownProps) {
 
   function navigateProfile(event: CProps.EventMouse) {
     hideDropdown();
-    router.push(urls.profile, event.ctrlKey);
+    router.push(urls.profile, event.ctrlKey || event.metaKey);
   }
 
   function logoutAndRedirect() {
diff --git a/rsconcept/frontend/src/components/RSInput/RSInput.tsx b/rsconcept/frontend/src/components/RSInput/RSInput.tsx
index 4df5af9b..d20f5d8d 100644
--- a/rsconcept/frontend/src/components/RSInput/RSInput.tsx
+++ b/rsconcept/frontend/src/components/RSInput/RSInput.tsx
@@ -106,7 +106,7 @@ const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
           return;
         }
         const text = new RSTextWrapper(thisRef.current as Required<ReactCodeMirrorRef>);
-        if (event.ctrlKey && event.code === 'Space') {
+        if ((event.ctrlKey || event.metaKey) && event.code === 'Space') {
           const selection = text.getSelection();
           if (!selection.empty || !schema) {
             return;
@@ -126,14 +126,14 @@ const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
             event.preventDefault();
             event.stopPropagation();
           }
-        } else if (!event.ctrlKey) {
+        } else if (!(event.ctrlKey || event.metaKey)) {
           const newSymbol = getSymbolSubstitute(event.code, event.shiftKey);
           if (newSymbol) {
             text.replaceWith(newSymbol);
             event.preventDefault();
             event.stopPropagation();
           }
-        } else if (event.ctrlKey && event.code === 'KeyQ' && onAnalyze) {
+        } else if (event.code === 'KeyQ' && onAnalyze) {
           onAnalyze();
           event.preventDefault();
           event.stopPropagation();
diff --git a/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx b/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
index e10b93dc..f32af26a 100644
--- a/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
+++ b/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
@@ -139,7 +139,7 @@ const RefsInput = forwardRef<ReactCodeMirrorRef, RefsInputInputProps>(
           event.preventDefault();
           return;
         }
-        if (event.ctrlKey && event.code === 'Space') {
+        if ((event.ctrlKey || event.metaKey) && event.code === 'Space') {
           const wrap = new CodeMirrorWrapper(thisRef.current as Required<ReactCodeMirrorRef>);
           wrap.fixSelection(ReferenceTokens);
           const nodes = wrap.getEnvelopingNodes(ReferenceTokens);
diff --git a/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx b/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx
index 0c7fec48..5f0768b1 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx
@@ -36,7 +36,7 @@ function ViewLibrary({ items, resetQuery }: ViewLibraryProps) {
   const [itemsPerPage, setItemsPerPage] = useLocalStorage<number>(storage.libraryPagination, 50);
 
   function handleOpenItem(item: ILibraryItem, event: CProps.EventMouse) {
-    router.push(urls.schema(item.id), event.ctrlKey);
+    router.push(urls.schema(item.id), event.ctrlKey || event.metaKey);
   }
 
   const windowSize = useWindowSize();
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
index 69154099..bfabbcae 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
@@ -42,7 +42,7 @@ function EditorConstituenta({ activeCst, isModified, setIsModified, onOpenEdit }
     if (disabled) {
       return;
     }
-    if (event.ctrlKey && event.code === 'KeyS') {
+    if ((event.ctrlKey || event.metaKey) && event.code === 'KeyS') {
       if (isModified) {
         initiateSubmit();
       }
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx
index 4d2e4c80..65220651 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx
@@ -32,7 +32,7 @@ function EditorRSForm({ isModified, onDestroy, setIsModified }: EditorRSFormProp
   }
 
   function handleInput(event: React.KeyboardEvent<HTMLDivElement>) {
-    if (event.ctrlKey && event.code === 'KeyS') {
+    if ((event.ctrlKey || event.metaKey) && event.code === 'KeyS') {
       if (isModified) {
         initiateSubmit();
       }
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/TermGraph.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/TermGraph.tsx
index 6f64a7df..d8334c0a 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/TermGraph.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/TermGraph.tsx
@@ -80,7 +80,7 @@ function TermGraph({
 
   const handleNodeClick = useCallback(
     (node: GraphNode, _?: CollapseProps, event?: GraphMouseEvent) => {
-      if (event?.ctrlKey) {
+      if (event?.ctrlKey || event?.metaKey) {
         onSelectCentral(Number(node.id));
       } else if (selections.includes(node.id)) {
         onDeselect(Number(node.id));
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx
index 812fed0f..bb142b29 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx
@@ -37,7 +37,7 @@ function ViewHidden({ items, selected, toggleSelection, setFocus, schema, colori
 
   const handleClick = useCallback(
     (cstID: ConstituentaID, event: CProps.EventMouse) => {
-      if (event.ctrlKey) {
+      if (event.ctrlKey || event.metaKey) {
         setFocus(cstID);
       } else {
         toggleSelection(cstID);
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
index 3fec7227..777c80f1 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
@@ -268,7 +268,7 @@ function RSTabsMenu({ onDestroy }: RSTabsMenuProps) {
           hideTitle={accessMenu.isOpen}
           className='h-full px-2'
           icon={<IconArchive size='1.25rem' className='icon-primary' />}
-          onClick={event => controller.viewVersion(undefined, event.ctrlKey)}
+          onClick={event => controller.viewVersion(undefined, event.ctrlKey || event.metaKey)}
         />
       ) : null}