mirror of
https://github.com/supabase/supabase.git
synced 2026-05-08 18:00:20 -04:00
40791f9846
## Summary - Migrates all 11 `useHotKey` call sites across 9 files to `useShortcut`, backed by `SHORTCUT_DEFINITIONS` in `state/shortcuts/registry.ts`. - Adds 10 new registry entries (all `showInSettings: false` to keep behavior identical to today — these were not previously user-configurable). - Deletes `apps/studio/hooks/ui/useHotKey.ts`. - Simplifies `ActionBar.handleSave` — the legacy hook passed a `KeyboardEvent` the callback used for `preventDefault`/`stopPropagation` and a textarea-plain-Enter guard; all of that is redundant under `useShortcut` (TanStack handles default/propagation; `Mod+Enter` never fires on plain Enter). - Removes a stale commented-out `useHotKey` reference in `DataTableFilterCommand.tsx`. Part of FE-3025 (legacy hotkey hook cleanup). `useKeyboardShortcuts` in `grid/components/common/Hooks.tsx` will be migrated in a follow-up. ## Test plan All shortcuts should still fire with **Cmd** (macOS) / **Ctrl** (Win/Linux). **Table Editor — operation queue** (requires pending unsaved edits on a row) - [x] `Cmd+S` saves pending edits - [x] `Cmd+.` toggles the operation queue side panel - [x] `Cmd+Z` undoes the latest edit and re-fetches the affected table rows - [x] With no pending edits, none of the above fire (gated by `isEnabled`) **Table Editor — side panel editor forms** (row, table, column, policy, etc.) - [x] `Cmd+Enter` submits the form when the panel is visible - [x] Does not submit if the form is disabled/loading or the panel is hidden **Unified Logs — data table** - [x] `Cmd+B` toggles the filter controls sidebar (desktop) - [x] `Cmd+B` opens the filter drawer (mobile, `<sm` breakpoint) - [x] `Cmd+Esc` resets active column filters (reset button visible) - [x] `Cmd+U` resets column order + visibility - [x] `Cmd+J` toggles live mode **Unified Logs — reset focus** - [x] `Cmd+.` blurs the currently focused element / resets focus to body **AI Assistant panel** - [x] While editing a message, `Cmd+Esc` cancels the edit **Regression checks** - [x] `pnpm --filter=studio typecheck` passes (verified locally) - [x] None of the new shortcut entries appear in Account → Preferences → Keyboard shortcuts (all `showInSettings: false`) - [x] Existing shortcuts (`Cmd+K`, `Cmd+I`, `Cmd+E`, results copy/download) still work unchanged <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Refactor * Implemented a centralized keyboard shortcut registry system for managing shortcuts consistently across the application * Updated multiple UI components throughout the interface to use the new shortcut management system * All existing keyboard shortcuts continue to function without any changes in behavior or user experience ## Chores * Removed legacy keyboard shortcut hook implementation <!-- end of auto-generated comment: release notes by coderabbit.ai -->
86 lines
3.2 KiB
TypeScript
86 lines
3.2 KiB
TypeScript
import { PanelLeftClose, PanelLeftOpen } from 'lucide-react'
|
|
import { ReactNode, useMemo } from 'react'
|
|
import { Button, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
|
|
|
|
import { formatCompactNumber } from './DataTable.utils'
|
|
import { DataTableFilterControlsDrawer } from './DataTableFilters/DataTableFilterControlsDrawer'
|
|
import { DataTableResetButton } from './DataTableResetButton'
|
|
import { DataTableViewOptions } from './DataTableViewOptions'
|
|
import { Kbd } from './primitives/Kbd'
|
|
import { useDataTable } from './providers/DataTableProvider'
|
|
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
|
|
import { useShortcut } from '@/state/shortcuts/useShortcut'
|
|
|
|
interface DataTableToolbarProps {
|
|
renderActions?: () => ReactNode
|
|
isFilterBarOpen: boolean
|
|
setIsFilterBarOpen: React.Dispatch<React.SetStateAction<boolean>>
|
|
}
|
|
|
|
export function DataTableToolbar({
|
|
renderActions,
|
|
isFilterBarOpen,
|
|
setIsFilterBarOpen,
|
|
}: DataTableToolbarProps) {
|
|
const { table, isLoading, columnFilters } = useDataTable()
|
|
const filters = table.getState().columnFilters
|
|
|
|
useShortcut(SHORTCUT_IDS.DATA_TABLE_TOGGLE_FILTERS, () => setIsFilterBarOpen((prev) => !prev))
|
|
|
|
const rows = useMemo(
|
|
() => ({
|
|
total: table.getCoreRowModel().rows.length,
|
|
filtered: table.getFilteredRowModel().rows.length,
|
|
}),
|
|
[isLoading, columnFilters]
|
|
)
|
|
|
|
return (
|
|
<div className="flex flex-wrap items-center justify-between gap-4">
|
|
<div className="flex flex-wrap items-center gap-2">
|
|
<Tooltip>
|
|
<TooltipTrigger asChild>
|
|
<Button
|
|
size="tiny"
|
|
type="default"
|
|
icon={isFilterBarOpen ? <PanelLeftClose /> : <PanelLeftOpen />}
|
|
onClick={() => setIsFilterBarOpen((prev) => !prev)}
|
|
className="hidden sm:flex"
|
|
>
|
|
<span className="hidden md:block">{isFilterBarOpen ? 'Hide' : 'Show'} Controls</span>
|
|
</Button>
|
|
</TooltipTrigger>
|
|
<TooltipContent side="right">
|
|
<p>
|
|
Toggle controls with{' '}
|
|
<Kbd className="ml-1 text-muted-foreground group-hover:text-accent-foreground">
|
|
<span className="mr-1">⌘</span>
|
|
<span>B</span>
|
|
</Kbd>
|
|
</p>
|
|
</TooltipContent>
|
|
</Tooltip>
|
|
<div className="block sm:hidden">
|
|
<DataTableFilterControlsDrawer />
|
|
</div>
|
|
<div>
|
|
<p className="hidden text-sm text-muted-foreground sm:block">
|
|
<span className="font-mono font-medium">{formatCompactNumber(rows.filtered)}</span> of{' '}
|
|
<span className="font-mono font-medium">{formatCompactNumber(rows.total)}</span> row(s){' '}
|
|
<span className="sr-only sm:not-sr-only">filtered</span>
|
|
</p>
|
|
<p className="block text-sm text-muted-foreground sm:hidden">
|
|
<span className="font-mono font-medium">{formatCompactNumber(rows.filtered)}</span>{' '}
|
|
row(s)
|
|
</p>
|
|
</div>
|
|
</div>
|
|
<div className="ml-auto flex items-center gap-2">
|
|
{filters.length ? <DataTableResetButton /> : null}
|
|
{renderActions?.()}
|
|
<DataTableViewOptions />
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|