starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-24 18:31:16 +01:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Fix hotkey formatting

Browse Source
This commit is contained in:
Gregory Schier
2024-01-12 22:12:01 -08:00
parent 9c4cd898a2
commit b212b80927
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src-web/hooks/useHotKey.ts
View File

@@ -1,5 +1,6 @@
import type { OsType } from '@tauri-apps/api/os';
import { useEffect, useRef } from 'react';
import { capitalize } from '../lib/capitalize';
import { debounce } from '../lib/debounce';
import { useOsInfo } from './useOsInfo';
@@ -121,7 +122,7 @@ export function useHotKeyLabel(action: HotkeyAction): string {
return hotkeyLabels[action];
}
export function useFormattedHotkey(action: HotkeyAction | null): string | null {
export function useFormattedHotkey(action: HotkeyAction | null): string[] | null {
const osInfo = useOsInfo();
const trigger = action != null ? hotkeys[action]?.[0] ?? null : null;
if (trigger == null || osInfo == null) {
@@ -145,21 +146,21 @@ export function useFormattedHotkey(action: HotkeyAction | null): string | null {
} else if (p === 'Tab') {
labelParts.push('⇥');
} else {
labelParts.push(p.toUpperCase());
labelParts.push(capitalize(p));
}
} else {
if (p === 'CmdCtrl') {
labelParts.push('Ctrl');
} else {
labelParts.push(p);
labelParts.push(capitalize(p));
}
}
}
if (os === 'Darwin') {
return labelParts.join('');
return labelParts;
} else {
return labelParts.join('+');
return [labelParts.join('+')];
}
}