starred/yaak
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-20 00:24:24 +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

2
src-web/components/core/Button.tsx
View File

@@ -52,7 +52,7 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button
}: ButtonProps,
ref,
) {
const hotkeyTrigger = useFormattedHotkey(hotkeyAction ?? null);
const hotkeyTrigger = useFormattedHotkey(hotkeyAction ?? null)?.join('');
const fullTitle = hotkeyTrigger ? `${title} ${hotkeyTrigger}` : title;
const classes = useMemo(

8
src-web/components/core/HotKey.tsx
View File

@@ -12,8 +12,8 @@ interface Props {
export function HotKey({ action, className, variant }: Props) {
const osInfo = useOsInfo();
const label = useFormattedHotkey(action);
if (label === null || osInfo == null) {
const labelParts = useFormattedHotkey(action);
if (labelParts === null || osInfo == null) {
return null;
}
@@ -25,8 +25,8 @@ export function HotKey({ action, className, variant }: Props) {
'text-gray-1000 text-opacity-disabled',
)}
>
{label.split('').map((char, index) => (
<div key={index} className="w-[1.1em] text-center">
{labelParts.map((char, index) => (
<div key={index} className="min-w-[1.1em] text-center">
{char}
</div>
))}