fix: sort shortcut

Signed-off-by: Innei <i@innei.in>
RSSNext · Aug 13, 2024 · 1f8e4a3 · 1f8e4a3
1 parent ba23dcf
commit 1f8e4a3
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 deletions.
diff --git a/src/renderer/src/hooks/biz/useFeedActions.tsx b/src/renderer/src/hooks/biz/useFeedActions.tsx
@@ -100,13 +100,7 @@ export const useFeedActions = ({
         type: "separator" as const,
         disabled: isEntryList,
       },
-      {
-        type: "text" as const,
-        label: "Copy Feed URL",
-        disabled: isEntryList,
-        shortcut: "Meta+C",
-        click: () => navigator.clipboard.writeText(feed.url),
-      },
+
       {
         type: "separator",
         disabled: isEntryList,
@@ -135,9 +129,17 @@ export const useFeedActions = ({
         type: "separator",
         disabled: isEntryList,
       },
+      {
+        type: "text" as const,
+        label: "Copy Feed URL",
+        disabled: isEntryList,
+        shortcut: "Meta+C",
+        click: () => navigator.clipboard.writeText(feed.url),
+      },
       {
         type: "text" as const,
         label: "Copy Feed ID",
+        shortcut: "Meta+Shift+C",
         disabled: isEntryList,
         click: () => {
           navigator.clipboard.writeText(feedId)

diff --git a/src/renderer/src/lib/native-menu.ts b/src/renderer/src/lib/native-menu.ts
@@ -16,11 +16,29 @@ export type NativeMenuItem =
   }
   | { type: "separator", disabled?: boolean }
 
+function sortShortcutsString(shortcut: string) {
+  // always order by Shift, Ctrl, Alt, Meta
+  const arr = shortcut.split("+")
+  const order = ["Shift", "Ctrl", "Alt", "Meta"]
+  arr.sort((a, b) => order.indexOf(a) - order.indexOf(b))
+
+  return arr.join("+")
+}
 export const showNativeMenu = async (
   items: Array<Nullable<NativeMenuItem | false>>,
   e?: MouseEvent | React.MouseEvent,
 ) => {
-  const nextItems = items.filter(Boolean) as NativeMenuItem[]
+  const nextItems = (items.filter(Boolean) as NativeMenuItem[]).map((item) => {
+    if (item.type === "text") {
+      return {
+        ...item,
+        shortcut: item.shortcut ?
+          sortShortcutsString(item.shortcut) :
+          undefined,
+      }
+    }
+    return item
+  }) as NativeMenuItem[]
 
   const el = e && e.currentTarget
 
@@ -99,6 +117,7 @@ export const showNativeMenu = async (
           enabled: item.enabled ?? (item.click !== undefined || !!item.submenu),
           click: undefined,
           submenu: item.submenu ? transformMenuItems(item.submenu) : undefined,
+          shortcut: item.shortcut?.replace("Meta", "CmdOrCtrl"),
         }
       }
       return item