From 3e334a67ed43d11c6a5a331f82a847c07ff6175d Mon Sep 17 00:00:00 2001
From: David Luzar <5153846+dwelle@users.noreply.github.com>
Date: Thu, 28 Mar 2024 18:12:54 +0100
Subject: [PATCH] feat: show firefox-compatible command palette shortcut alias
 (#7825)

---
 packages/excalidraw/actions/shortcuts.ts      |  2 +-
 packages/excalidraw/components/App.tsx        |  3 +--
 packages/excalidraw/components/HelpDialog.tsx | 12 ++++++++----
 packages/excalidraw/locales/en.json           |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/excalidraw/actions/shortcuts.ts b/packages/excalidraw/actions/shortcuts.ts
index cbc25289f..3f1be97d5 100644
--- a/packages/excalidraw/actions/shortcuts.ts
+++ b/packages/excalidraw/actions/shortcuts.ts
@@ -60,8 +60,8 @@ const shortcutMap: Record<ShortcutName, string[]> = {
   clearCanvas: [getShortcutKey("CtrlOrCmd+Delete")],
   imageExport: [getShortcutKey("CtrlOrCmd+Shift+E")],
   commandPalette: [
-    getShortcutKey("CtrlOrCmd+Shift+P"),
     getShortcutKey("CtrlOrCmd+/"),
+    getShortcutKey("CtrlOrCmd+Shift+P"),
   ],
   cut: [getShortcutKey("CtrlOrCmd+X")],
   copy: [getShortcutKey("CtrlOrCmd+C")],
diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/components/App.tsx
index 00f60c23f..b33e04850 100644
--- a/packages/excalidraw/components/App.tsx
+++ b/packages/excalidraw/components/App.tsx
@@ -3755,8 +3755,7 @@ class App extends React.Component<AppProps, AppState> {
       ) {
         this.setToast({
           message: t("commandPalette.shortcutHint", {
-            shortcutOne: getShortcutFromShortcutName("commandPalette"),
-            shortcutTwo: getShortcutFromShortcutName("commandPalette", 1),
+            shortcut: getShortcutFromShortcutName("commandPalette"),
           }),
         });
         event.preventDefault();
diff --git a/packages/excalidraw/components/HelpDialog.tsx b/packages/excalidraw/components/HelpDialog.tsx
index 85f4fbaa6..6f539963b 100644
--- a/packages/excalidraw/components/HelpDialog.tsx
+++ b/packages/excalidraw/components/HelpDialog.tsx
@@ -281,10 +281,14 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
             />
             <Shortcut
               label={t("commandPalette.title")}
-              shortcuts={[
-                getShortcutFromShortcutName("commandPalette"),
-                getShortcutFromShortcutName("commandPalette", 1),
-              ]}
+              shortcuts={
+                isFirefox
+                  ? [getShortcutFromShortcutName("commandPalette")]
+                  : [
+                      getShortcutFromShortcutName("commandPalette"),
+                      getShortcutFromShortcutName("commandPalette", 1),
+                    ]
+              }
             />
           </ShortcutIsland>
           <ShortcutIsland
diff --git a/packages/excalidraw/locales/en.json b/packages/excalidraw/locales/en.json
index 42ebb0b9f..51af42c85 100644
--- a/packages/excalidraw/locales/en.json
+++ b/packages/excalidraw/locales/en.json
@@ -560,6 +560,6 @@
       "noMatch": "No matching commands..."
     },
     "itemNotAvailable": "Command is not available...",
-    "shortcutHint": "For Command palette, use {{shortcutOne}} or {{shortcutTwo}}"
+    "shortcutHint": "For Command palette, use {{shortcut}}"
   }
 }