mirror of
https://github.com/supabase/supabase.git
synced 2026-06-18 05:33:50 +08:00
## Problem Our `<Button>` component breaks the default `button` contract by redefining the `type` prop to set its variant (`primary`, `default`, etc) instead of the button type (`submit`, `button`, etc). This is confusing and forces to write more code when using it with shadcn components that expect/inject the standard button props. ## Solution - rename the `type` prop to `variant` - rename the `htmlType` prop to `type` - propagate the changes where necessary - format code ## How to test As this is just prop renaming, if it builds it's ok --------- Co-authored-by: Ivan Vasilov <vasilov.ivan@gmail.com>
251 lines
7.6 KiB
TypeScript
251 lines
7.6 KiB
TypeScript
import { useHotkeyRegistrations, type SequenceRegistrationView } from '@tanstack/react-hotkeys'
|
|
import { CircleX } from 'lucide-react'
|
|
import { Fragment, useMemo, useState } from 'react'
|
|
import {
|
|
Button,
|
|
KeyboardShortcut,
|
|
Sheet,
|
|
SheetContent,
|
|
SheetDescription,
|
|
SheetHeader,
|
|
SheetSection,
|
|
SheetTitle,
|
|
} from 'ui'
|
|
import { Input } from 'ui-patterns/DataInputs/Input'
|
|
|
|
import { hotkeyToKeys } from '@/state/shortcuts/formatShortcut'
|
|
import {
|
|
SHORTCUT_REFERENCE_GROUP_LABELS,
|
|
SHORTCUT_REFERENCE_GROUP_ORDER,
|
|
SHORTCUT_REFERENCE_GROUPS,
|
|
} from '@/state/shortcuts/referenceGroups'
|
|
import type { ShortcutHotkeyMeta } from '@/state/shortcuts/types'
|
|
|
|
interface ShortcutsReferenceSheetProps {
|
|
open: boolean
|
|
onOpenChange: (open: boolean) => void
|
|
}
|
|
|
|
interface ActiveShortcutDefinition {
|
|
id: string
|
|
label: string
|
|
sequence: string[]
|
|
referenceGroup?: string
|
|
}
|
|
|
|
interface ShortcutGroup {
|
|
group: string
|
|
label: string
|
|
definitions: ActiveShortcutDefinition[]
|
|
}
|
|
|
|
const GROUP_LABELS: Record<string, string> = {
|
|
...SHORTCUT_REFERENCE_GROUP_LABELS,
|
|
'action-bar': 'Actions',
|
|
'advisors-page': 'Advisors',
|
|
'ai-assistant': 'AI Assistant',
|
|
'api-keys': 'API Keys',
|
|
'auth-users': 'Auth Users',
|
|
'command-menu': 'Command Menu',
|
|
'data-table': 'Data Tables',
|
|
'functions-detail': 'Edge Function Actions',
|
|
'functions-list': 'Edge Functions',
|
|
'functions-overview': 'Edge Function Overview',
|
|
'inline-editor': 'Inline Editor',
|
|
'list-page': 'List pages',
|
|
'platform-webhooks': 'Platform Webhooks',
|
|
'logs-preview': 'Logs Explorer',
|
|
'jwt-keys': 'JWT Keys',
|
|
'log-drains': 'Log Drains',
|
|
nav: 'Navigation',
|
|
'operation-queue': 'Operation Queue',
|
|
results: 'Results',
|
|
'realtime-inspector': 'Realtime Inspector',
|
|
'schema-visualizer': 'Schema Visualizer',
|
|
shortcuts: 'Shortcuts',
|
|
'sql-editor': 'SQL Editor',
|
|
'storage-buckets': 'Storage Buckets',
|
|
'storage-explorer': 'Storage File Explorer',
|
|
'table-editor': 'Table Editor',
|
|
'unified-logs': 'Logs',
|
|
}
|
|
|
|
const getGroupOrder = (group: string) => {
|
|
const index = SHORTCUT_REFERENCE_GROUP_ORDER.indexOf(group)
|
|
return index === -1 ? SHORTCUT_REFERENCE_GROUP_ORDER.length : index
|
|
}
|
|
|
|
const getGroupLabel = (group: string) => GROUP_LABELS[group] ?? group
|
|
|
|
const isScopedNavigationGroup = (group: string) =>
|
|
group.startsWith('navigation.') && group !== SHORTCUT_REFERENCE_GROUPS.NAVIGATION_GLOBAL
|
|
|
|
const normalizeSearchValue = (value: string) => value.trim().toLowerCase()
|
|
|
|
const toActiveDefinition = (
|
|
registration: SequenceRegistrationView
|
|
): ActiveShortcutDefinition | null => {
|
|
const meta = registration.options.meta as ShortcutHotkeyMeta | undefined
|
|
if (!meta?.id || !meta.name) return null
|
|
return {
|
|
id: meta.id,
|
|
label: meta.name,
|
|
sequence: registration.sequence,
|
|
referenceGroup: meta.referenceGroup,
|
|
}
|
|
}
|
|
|
|
const useActiveShortcuts = (): ActiveShortcutDefinition[] => {
|
|
const { sequences } = useHotkeyRegistrations()
|
|
|
|
return useMemo(() => {
|
|
const definitions: ActiveShortcutDefinition[] = []
|
|
const seen = new Set<string>()
|
|
|
|
for (const registration of sequences) {
|
|
if (registration.options.enabled === false) continue
|
|
const definition = toActiveDefinition(registration)
|
|
if (!definition) continue
|
|
if (seen.has(definition.id)) continue
|
|
seen.add(definition.id)
|
|
definitions.push(definition)
|
|
}
|
|
|
|
return definitions
|
|
}, [sequences])
|
|
}
|
|
|
|
const groupDefinitions = (activeShortcuts: ActiveShortcutDefinition[]): ShortcutGroup[] => {
|
|
const grouped = activeShortcuts.reduce<Record<string, ActiveShortcutDefinition[]>>(
|
|
(acc, definition) => {
|
|
const prefix = definition.referenceGroup ?? definition.id.split('.')[0]
|
|
acc[prefix] = acc[prefix] ?? []
|
|
acc[prefix].push(definition)
|
|
return acc
|
|
},
|
|
{}
|
|
)
|
|
|
|
const hasScopedNavigationGroup = Object.keys(grouped).some(isScopedNavigationGroup)
|
|
|
|
return Object.entries(grouped)
|
|
.map(([group, definitions]) => {
|
|
const label =
|
|
group === SHORTCUT_REFERENCE_GROUPS.NAVIGATION_GLOBAL && !hasScopedNavigationGroup
|
|
? 'Navigation'
|
|
: getGroupLabel(group)
|
|
|
|
return {
|
|
group,
|
|
label,
|
|
definitions,
|
|
}
|
|
})
|
|
.sort((a, b) => getGroupOrder(a.group) - getGroupOrder(b.group))
|
|
}
|
|
|
|
const filterGroups = (groups: ShortcutGroup[], search: string) => {
|
|
const normalizedSearch = normalizeSearchValue(search)
|
|
|
|
if (normalizedSearch.length === 0) return groups
|
|
|
|
return groups.reduce<ShortcutGroup[]>((acc, group) => {
|
|
if (normalizeSearchValue(group.label).includes(normalizedSearch)) {
|
|
acc.push(group)
|
|
return acc
|
|
}
|
|
|
|
const definitions = group.definitions.filter((definition) =>
|
|
normalizeSearchValue(definition.label).includes(normalizedSearch)
|
|
)
|
|
|
|
if (definitions.length > 0) {
|
|
acc.push({ ...group, definitions })
|
|
}
|
|
|
|
return acc
|
|
}, [])
|
|
}
|
|
|
|
const ShortcutSequence = ({ sequence }: Pick<ActiveShortcutDefinition, 'sequence'>) => (
|
|
<div className="flex items-center gap-1">
|
|
{sequence.map((step, index) => (
|
|
<Fragment key={`${step}-${index}`}>
|
|
{index > 0 && <span className="text-foreground-lighter text-[11px]">then</span>}
|
|
<KeyboardShortcut keys={hotkeyToKeys(step)} variant="pill" />
|
|
</Fragment>
|
|
))}
|
|
</div>
|
|
)
|
|
|
|
function ShortcutsReferenceSheetContent() {
|
|
const [search, setSearch] = useState('')
|
|
const activeShortcuts = useActiveShortcuts()
|
|
const groups = filterGroups(groupDefinitions(activeShortcuts), search)
|
|
|
|
return (
|
|
<>
|
|
<SheetHeader className="shrink-0 py-3">
|
|
<SheetTitle>Keyboard shortcuts</SheetTitle>
|
|
<SheetDescription className="sr-only">
|
|
Browse and search available keyboard shortcuts.
|
|
</SheetDescription>
|
|
</SheetHeader>
|
|
<div className="shrink-0 bg-studio px-5 pt-4 pb-4">
|
|
<Input
|
|
aria-label="Search shortcuts"
|
|
autoFocus
|
|
className="w-full"
|
|
onChange={(event) => setSearch(event.target.value)}
|
|
placeholder="Search shortcuts..."
|
|
value={search}
|
|
actions={
|
|
search ? (
|
|
<Button
|
|
aria-label="Clear search"
|
|
size="tiny"
|
|
variant="text"
|
|
icon={<CircleX size={14} />}
|
|
onClick={() => setSearch('')}
|
|
className="h-5 w-5 p-0"
|
|
/>
|
|
) : null
|
|
}
|
|
/>
|
|
</div>
|
|
<SheetSection className="flex flex-1 flex-col gap-6 overflow-y-auto px-5 py-4">
|
|
{groups.length === 0 ? (
|
|
<p className="text-sm text-foreground-muted">No matching shortcuts found</p>
|
|
) : (
|
|
groups.map(({ group, label, definitions }) => (
|
|
<section key={group} className="flex flex-col gap-2">
|
|
<h3 className="text-xs text-foreground-lighter uppercase tracking-wider">{label}</h3>
|
|
<ul className="flex flex-col">
|
|
{definitions.map((definition) => (
|
|
<li
|
|
key={definition.id}
|
|
className="flex min-h-10 items-center justify-between gap-4 border-b border-muted py-2 last:border-b-0"
|
|
>
|
|
<span className="text-sm text-foreground">{definition.label}</span>
|
|
<ShortcutSequence sequence={definition.sequence} />
|
|
</li>
|
|
))}
|
|
</ul>
|
|
</section>
|
|
))
|
|
)}
|
|
</SheetSection>
|
|
</>
|
|
)
|
|
}
|
|
|
|
export function ShortcutsReferenceSheet({ open, onOpenChange }: ShortcutsReferenceSheetProps) {
|
|
return (
|
|
<Sheet open={open} onOpenChange={onOpenChange}>
|
|
<SheetContent className="flex w-full flex-col gap-0 p-0 sm:max-w-[520px]">
|
|
{open && <ShortcutsReferenceSheetContent />}
|
|
</SheetContent>
|
|
</Sheet>
|
|
)
|
|
}
|