An AI-powered search engine with a generative UI
TypeScript generative-aigenerative-uinextjsollamareactsearxngshadcn-uitailwindcsstavilytypescriptupstashvercel-ai-sdk
feat: add keyboard shortcuts dialog (⌘/) (#819)
Yoshiki Miurac2129325da27
diff --git a/components/keyboard-shortcut-dialog.tsx b/components/keyboard-shortcut-dialog.tsxnew file mode 100644index 00000000..b877e00c--- /dev/null+++ b/components/keyboard-shortcut-dialog.tsx@@ -0,0 +1,83 @@+'use client'++import { useEffect, useState } from 'react'++import {+ formatShortcutKeys,+ SHORTCUT_EVENTS,+ type ShortcutDefinition,+ SHORTCUTS+} from '@/lib/keyboard-shortcuts'++import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogHeader,+ DialogTitle+} from './ui/dialog'++const shortcutList: ShortcutDefinition[] = Object.values(SHORTCUTS).filter(+ s => s.id !== 'showShortcuts'+)++function ShortcutKey({ children }: { children: string }) {+ return (+ <kbd className="inline-flex h-5 min-w-5 items-center justify-center rounded border border-border bg-muted px-1 font-mono text-[11px] text-muted-foreground">+ {children}+ </kbd>+ )+}++export function KeyboardShortcutDialog() {+ const [open, setOpen] = useState(false)++ useEffect(() => {+ const handler = () => setOpen(prev => !prev)+ window.addEventListener(SHORTCUT_EVENTS.showShortcuts, handler)+ return () =>+ window.removeEventListener(SHORTCUT_EVENTS.showShortcuts, handler)+ }, [])++ return (+ <Dialog open={open} onOpenChange={setOpen}>+ <DialogContent className="max-w-sm">+ <DialogHeader>+ <DialogTitle>Keyboard Shortcuts</DialogTitle>+ <DialogDescription className="sr-only">+ List of available keyboard shortcuts+ </DialogDescription>+ </DialogHeader>+ <div className="space-y-1">+ {shortcutList.map(shortcut => (+ <div+ key={shortcut.id}+ className="flex items-center justify-between rounded-md px-2 py-1.5"+ >+ <span className="text-sm text-foreground">+ {shortcut.description}+ </span>+ <div className="flex items-center gap-1">+ {formatShortcutKeys(shortcut).map((key, i) => (+ <ShortcutKey key={i}>{key}</ShortcutKey>+ ))}+ </div>+ </div>+ ))}+ <div className="border-t pt-1">+ <div className="flex items-center justify-between rounded-md px-2 py-1.5">+ <span className="text-sm text-foreground">+ {SHORTCUTS.showShortcuts.description}+ </span>+ <div className="flex items-center gap-1">+ {formatShortcutKeys(SHORTCUTS.showShortcuts).map((key, i) => (+ <ShortcutKey key={i}>{key}</ShortcutKey>+ ))}+ </div>+ </div>+ </div>+ </div>+ </DialogContent>+ </Dialog>+ )+}diff --git a/components/keyboard-shortcut-handler.tsx b/components/keyboard-shortcut-handler.tsxindex 40f3acdf..ef064346 100644--- a/components/keyboard-shortcut-handler.tsx+++ b/components/keyboard-shortcut-handler.tsx@@ -11,6 +11,7 @@ import { getCookie, setCookie } from '@/lib/utils/cookies'import { useKeyboardShortcut } from '@/hooks/use-keyboard-shortcut'import { useSidebar } from './ui/sidebar'+import { KeyboardShortcutDialog } from './keyboard-shortcut-dialog'const THEME_CYCLE: Record<string, string> = {dark: 'light',@@ -52,5 +53,9 @@ export function KeyboardShortcutHandler() {toast.info(`Search mode: ${SEARCH_MODE_LABELS[next]}`)})- return null+ useKeyboardShortcut(SHORTCUTS.showShortcuts, () => {+ window.dispatchEvent(new CustomEvent(SHORTCUT_EVENTS.showShortcuts))+ })++ return <KeyboardShortcutDialog />}diff --git a/lib/keyboard-shortcuts.ts b/lib/keyboard-shortcuts.tsindex 1972eda6..f8fbfb72 100644--- a/lib/keyboard-shortcuts.ts+++ b/lib/keyboard-shortcuts.ts@@ -3,6 +3,8 @@ export type ShortcutDefinition = {key: stringmeta: booleanshift: boolean+ /** If true, ignore shiftKey state when matching (for keys like / that require Shift on some layouts) */+ ignoreShift?: booleandescription: string}@@ -41,23 +43,46 @@ export const SHORTCUTS = {meta: true,shift: true,description: 'Toggle search mode'+ },+ showShortcuts: {+ id: 'showShortcuts',+ key: '/',+ meta: true,+ shift: false,+ ignoreShift: true,+ description: 'Show keyboard shortcuts'}} as const satisfies Record<string, ShortcutDefinition>export const SHORTCUT_EVENTS = {newChat: 'shortcut:new-chat',- copyMessage: 'shortcut:copy-message'+ copyMessage: 'shortcut:copy-message',+ showShortcuts: 'shortcut:show-shortcuts'} as const+export function formatShortcutKeys(shortcut: ShortcutDefinition): string[] {+ const isMac =+ typeof navigator !== 'undefined' &&+ navigator.userAgent.toLowerCase().includes('mac')+ const keys: string[] = []+ keys.push(isMac ? '⌘' : 'Ctrl')+ if (shortcut.shift) keys.push('Shift')+ keys.push(shortcut.key.toUpperCase())+ return keys+}+export function matchesShortcut(event: KeyboardEvent,shortcut: ShortcutDefinition): boolean {if (event.repeat) return falseif (event.altKey) return false+ const shiftMatch = shortcut.ignoreShift+ ? true+ : event.shiftKey === shortcut.shiftreturn (event.key.toLowerCase() === shortcut.key &&(event.metaKey || event.ctrlKey) === shortcut.meta &&- event.shiftKey === shortcut.shift+ shiftMatch)}