fix: standardize control key naming across platforms, fixed #3860

Innei · Innei · commit 9dd5109bf8bc · 2025-06-04T20:20:45.000+08:00
- Updated the control key naming in the SpecialKeys object for Windows, macOS, and Linux to ensure consistency.
- Modified the transformShortcut function to replace "$mod" with "Control" instead of "Ctrl" for better clarity.
- Adjusted the key sorting order to reflect the updated naming convention.

Signed-off-by: Innei &lt;tukon479@gmail.com&gt;
diff --git a/packages/internal/components/src/ui/kbd/Kbd.tsx b/packages/internal/components/src/ui/kbd/Kbd.tsx
@@ -23,20 +23,23 @@ const SpecialKeys = {
   Windows: {
     meta: "⊞",
     ctrl: "Ctrl",
+    control: "Ctrl",
     alt: "Alt",
     shift: "Shift",
     escape: "Esc",
   },
   macOS: {
     meta: "⌘",
     ctrl: "⌃",
+    control: "⌃",
     alt: "⌥",
     shift: "⇧",
     escape: "⎋",
   },
   Linux: {
     meta: "Super",
     ctrl: "Ctrl",
+    control: "Ctrl",
     alt: "Alt",
     shift: "Shift",
     escape: "Escape",
diff --git a/packages/internal/utils/src/utils.ts b/packages/internal/utils/src/utils.ts
@@ -350,13 +350,13 @@ export function transformShortcut(shortcut: string, platform: OS = getOS()): str
   if (platform === "macOS") {
     return shortcut.replace("$mod", "Meta")
   }
-  return shortcut.replace("$mod", "Ctrl")
+  return shortcut.replace("$mod", "Control")
 }
 
 const F_KEY_REGEX = /^F(?:[1-9]|1[0-2])$/
 
 function getKeySortValue(key: string): number {
-  const order = ["Shift", "Ctrl", "Meta", "Alt"]
+  const order = ["Shift", "Control", "Meta", "Alt"]
 
   if (order.includes(key)) {
     return order.indexOf(key)

Original file line number	Diff line number	Diff line change
`@@ -350,13 +350,13 @@ export function transformShortcut(shortcut: string, platform: OS = getOS()): str`
`350`	`350`	`if (platform === "macOS") {`
`351`	`351`	`return shortcut.replace("$mod", "Meta")`
`352`	`352`	`}`
`353`		`- return shortcut.replace("$mod", "Ctrl")`
	`353`	`+ return shortcut.replace("$mod", "Control")`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`const F_KEY_REGEX = /^F(?:[1-9]\|1[0-2])$/`
`357`	`357`
`358`	`358`	`function getKeySortValue(key: string): number {`
`359`		`- const order = ["Shift", "Ctrl", "Meta", "Alt"]`
	`359`	`+ const order = ["Shift", "Control", "Meta", "Alt"]`
`360`	`360`
`361`	`361`	`if (order.includes(key)) {`
`362`	`362`	`return order.indexOf(key)`