diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.hooks.ts b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.hooks.ts
index c8ef733224c..af67d64f4f0 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.hooks.ts
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.hooks.ts
@@ -2,17 +2,18 @@ import { useQueryState } from 'nuqs'
import { useEffect, useMemo, useRef } from 'react'
import { SEARCH_PARAMS_PARSER } from './UnifiedLogs.constants'
-import { useHotKey } from '@/hooks/ui/useHotKey'
+import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
+import { useShortcut } from '@/state/shortcuts/useShortcut'
export const useResetFocus = () => {
- useHotKey(() => {
+ useShortcut(SHORTCUT_IDS.UNIFIED_LOGS_RESET_FOCUS, () => {
// FIXME: some dedicated div[tabindex="0"] do not auto-unblur (e.g. the DataTableFilterResetButton)
// REMINDER: we cannot just document.activeElement?.blur(); as the next tab will focus the next element in line,
// which is not what we want. We want to reset entirely.
document.body.setAttribute('tabindex', '0')
document.body.focus()
document.body.removeAttribute('tabindex')
- }, '.')
+ })
}
export const useLiveMode = (data: TData[]) => {
diff --git a/apps/studio/components/ui/AIAssistantPanel/AIAssistant.tsx b/apps/studio/components/ui/AIAssistantPanel/AIAssistant.tsx
index 6c3dabef41c..04b994a3fcd 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AIAssistant.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/AIAssistant.tsx
@@ -35,7 +35,6 @@ import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
import { useOrgAiOptInLevel } from '@/hooks/misc/useOrgOptedIntoAi'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
-import { useHotKey } from '@/hooks/ui/useHotKey'
import {
DEFAULT_ASSISTANT_BASE_MODEL_ID,
defaultAssistantModelId,
@@ -47,6 +46,8 @@ import { uuidv4 } from '@/lib/helpers'
import { useTrack } from '@/lib/telemetry/track'
import type { AssistantModel } from '@/state/ai-assistant-state'
import { useAiAssistantState, useAiAssistantStateSnapshot } from '@/state/ai-assistant-state'
+import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
+import { useShortcut } from '@/state/shortcuts/useShortcut'
import { useSidebarManagerSnapshot } from '@/state/sidebar-manager-state'
import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2'
@@ -64,7 +65,7 @@ export const AIAssistant = ({ className }: AIAssistantProps) => {
const { data: selectedOrganization, isPending: isLoadingOrganization } =
useSelectedOrganizationQuery()
- useHotKey(() => cancelEdit(), 'Escape')
+ useShortcut(SHORTCUT_IDS.AI_ASSISTANT_CANCEL_EDIT, () => cancelEdit())
const disablePrompts = useFlag('disableAssistantPrompts')
const { snippets } = useSqlEditorV2StateSnapshot()
diff --git a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterCommand.tsx b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterCommand.tsx
index 16d87c701e7..4fa114167bf 100644
--- a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterCommand.tsx
+++ b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterCommand.tsx
@@ -66,9 +66,6 @@ export function DataTableFilterCommand({
(x) => typeof x.value === 'string' && currentWord.includes(`${x.value}:`)
)
- // [Joshen] Temporarily disabling as this conflicts with our current CMD K behaviour
- // useHotKey(() => setOpen((open) => !open), 'k')
-
useEffect(() => {
// TODO: we could check for ARRAY_DELIMITER or SLIDER_DELIMITER to auto-set filter when typing
if (currentWord !== '' && open) return
diff --git a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControlsDrawer.tsx b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControlsDrawer.tsx
index ec2ae977248..90ba86a9119 100644
--- a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControlsDrawer.tsx
+++ b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControlsDrawer.tsx
@@ -19,15 +19,16 @@ import {
import { useMediaQuery } from '../hooks/useMediaQuery'
import { Kbd } from '../primitives/Kbd'
import { DataTableFilterControls } from './DataTableFilterControls'
-import { useHotKey } from '@/hooks/ui/useHotKey'
+import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
+import { useShortcut } from '@/state/shortcuts/useShortcut'
export function DataTableFilterControlsDrawer() {
const triggerButtonRef = useRef(null)
const isMobile = useMediaQuery('(max-width: 640px)')
- useHotKey(() => {
+ useShortcut(SHORTCUT_IDS.DATA_TABLE_TOGGLE_FILTERS, () => {
triggerButtonRef.current?.click()
- }, 'b')
+ })
return (
diff --git a/apps/studio/components/ui/DataTable/DataTableInfinite.tsx b/apps/studio/components/ui/DataTable/DataTableInfinite.tsx
index 5da20eb0918..824cdfc4aa3 100644
--- a/apps/studio/components/ui/DataTable/DataTableInfinite.tsx
+++ b/apps/studio/components/ui/DataTable/DataTableInfinite.tsx
@@ -9,7 +9,8 @@ import { Button, cn } from 'ui'
import { formatCompactNumber } from './DataTable.utils'
import { useDataTable } from './providers/DataTableProvider'
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from './Table'
-import { useHotKey } from '@/hooks/ui/useHotKey'
+import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
+import { useShortcut } from '@/state/shortcuts/useShortcut'
// TODO: add a possible chartGroupBy
export interface DataTableInfiniteProps {
@@ -64,10 +65,10 @@ export function DataTableInfinite({
[fetchNextPage, isFetching, totalRows, totalRowsFetched]
)
- useHotKey(() => {
+ useShortcut(SHORTCUT_IDS.DATA_TABLE_RESET_COLUMNS, () => {
setColumnOrder([])
setColumnVisibility(defaultColumnVisibility)
- }, 'u')
+ })
return (
diff --git a/apps/studio/components/ui/DataTable/DataTableResetButton.tsx b/apps/studio/components/ui/DataTable/DataTableResetButton.tsx
index a2a2b379e1d..17ca6c33af1 100644
--- a/apps/studio/components/ui/DataTable/DataTableResetButton.tsx
+++ b/apps/studio/components/ui/DataTable/DataTableResetButton.tsx
@@ -3,11 +3,12 @@ import { Button, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
import { Kbd } from './primitives/Kbd'
import { useDataTable } from './providers/DataTableProvider'
-import { useHotKey } from '@/hooks/ui/useHotKey'
+import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
+import { useShortcut } from '@/state/shortcuts/useShortcut'
export function DataTableResetButton() {
const { table } = useDataTable()
- useHotKey(() => table.resetColumnFilters(), 'Escape')
+ useShortcut(SHORTCUT_IDS.DATA_TABLE_RESET_FILTERS, () => table.resetColumnFilters())
return (