diff --git a/src/lib/helpers/commandCenter.ts b/src/lib/helpers/commandCenter.ts index 9e6b729f5..a5196b241 100644 --- a/src/lib/helpers/commandCenter.ts +++ b/src/lib/helpers/commandCenter.ts @@ -1,16 +1,12 @@ import { derived, writable } from 'svelte/store'; - -// type Key = 'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' | 'j' | 'k' -// | 'l' | 'm' | 'n' | 'o' | 'p' | 'q' | 'r' | 's' | 't' | 'u' | 'v' | 'w' | 'x' -// | 'y' | 'z' | 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'I' | 'J' | 'K' -// | 'L' | 'M' | 'N' | 'O' | 'P' | 'Q' | 'R' | 'S' | 'T' | 'U' | 'V' | 'W' | 'X' -// | 'Y' | 'Z' | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' +import { debounce } from './debounce'; export type Command = { keys: string[]; /* Ctrl on Windows/Linux, Meta on Mac */ - meta?: boolean; + ctrl?: boolean; shift?: boolean; + /* Alt on Windows/Linux, Option on Mac */ alt?: boolean; callback: () => void; label?: string; @@ -19,66 +15,39 @@ export type Command = { }; type CommandCenterState = { - commandMap: Map; + commandMap: Map; enabled: boolean; }; -export const commandCenter = (function init() { - const store = writable({ - commandMap: new Map(), - enabled: true - }); - - return { - ...store - }; -})(); +export const commandCenter = writable({ + commandMap: new Map(), + enabled: true +}); export const commands = derived(commandCenter, ($commandCenter) => { return Array.from($commandCenter.commandMap.values()).flat(); }); -function createRegisterProxy() { - return new Proxy( - {}, - { - get(_obj, field, receiver) { - if (field !== 'register') return; - return (newCommands: Command[]) => { - commandCenter.update((curr) => { - curr.commandMap.set(receiver, newCommands); - return curr; - }); - }; - } - } - ) as { register: (newCommands: Command[]) => void }; -} +export const registerCommand = { + subscribe(runner: (cb: (newCommands: Command[]) => void) => void) { + const uuid = crypto.randomUUID(); -export type RegisterProxy = ReturnType; - -export const cmdRegistrant = { - subscribe(runner: (proxy: RegisterProxy) => void) { - const proxy = createRegisterProxy(); - runner(proxy); + runner((newCommands: Command[]) => { + commandCenter.update((curr) => { + curr.commandMap.set(uuid, newCommands); + return curr; + }); + }); return () => { commandCenter.update((curr) => { - curr.commandMap.delete(proxy); + curr.commandMap.delete(uuid); return curr; }); }; } }; -const debounce = (fn: () => void, ms: number) => { - let timeout: NodeJS.Timeout; - return () => { - clearTimeout(timeout); - timeout = setTimeout(fn, ms); - }; -}; - export const commandCenterKeyDownHandler = derived(commandCenter, ({ commandMap, enabled }) => { const commandsArr = Array.from(commandMap.values()).flat(); const recentKeyCodes = new Set(); @@ -92,7 +61,7 @@ export const commandCenterKeyDownHandler = derived(commandCenter, ({ commandMap, for (const command of commandsArr) { if (command.disabled || (!enabled && !command.forceEnable)) continue; - const { keys, meta, shift, alt, callback } = command; + const { keys, ctrl: meta, shift, alt, callback } = command; const isMetaPressed = meta ? (isMac ? event.metaKey : event.ctrlKey) : true; const isShiftPressed = shift ? event.shiftKey : true; diff --git a/src/lib/helpers/debounce.ts b/src/lib/helpers/debounce.ts new file mode 100644 index 000000000..bc6942d12 --- /dev/null +++ b/src/lib/helpers/debounce.ts @@ -0,0 +1,7 @@ +export function debounce(fn: () => void, ms: number) { + let timeout: NodeJS.Timeout; + return () => { + clearTimeout(timeout); + timeout = setTimeout(fn, ms); + }; +} diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte index 60e25c92f..f2f21e417 100644 --- a/src/routes/console/+layout.svelte +++ b/src/routes/console/+layout.svelte @@ -16,17 +16,17 @@ import Create from './createOrganization.svelte'; import { goto } from '$app/navigation'; - import { cmdRegistrant, commandCenterKeyDownHandler } from '$lib/helpers/commandCenter'; + import { registerCommand, commandCenterKeyDownHandler } from '$lib/helpers/commandCenter'; import CommandCenter from './commandCenter.svelte'; - $: $cmdRegistrant.register([ + $: $registerCommand([ { label: 'Go to Account', callback: () => { goto('/console/account'); }, keys: ['a'], - meta: true, + ctrl: true, shift: true }, { diff --git a/src/routes/console/commandCenter.svelte b/src/routes/console/commandCenter.svelte index d40373f47..e39c113ca 100644 --- a/src/routes/console/commandCenter.svelte +++ b/src/routes/console/commandCenter.svelte @@ -1,19 +1,19 @@
diff --git a/src/routes/console/project-[project]/storage/+page.svelte b/src/routes/console/project-[project]/storage/+page.svelte index 4c01b8ad7..f805f326d 100644 --- a/src/routes/console/project-[project]/storage/+page.svelte +++ b/src/routes/console/project-[project]/storage/+page.svelte @@ -15,7 +15,7 @@ import { Button } from '$lib/elements/forms'; import { Container } from '$lib/layout'; import type { Models } from '@appwrite.io/console'; - import { projectRegistrant } from '../store'; + import { registerProjectCommand } from '../store'; import type { PageData } from './$types'; import Create from './create.svelte'; @@ -30,7 +30,7 @@ await goto(`${base}/console/project-${project}/storage/bucket-${event.detail.$id}`); } - $: $projectRegistrant.register([ + $: $registerProjectCommand([ { label: 'Create bucket', callback: () => { diff --git a/src/routes/console/project-[project]/store.ts b/src/routes/console/project-[project]/store.ts index 3444e7a3b..d932b663f 100644 --- a/src/routes/console/project-[project]/store.ts +++ b/src/routes/console/project-[project]/store.ts @@ -1,16 +1,15 @@ import { goto } from '$app/navigation'; import { page } from '$app/stores'; -import { cmdRegistrant, type Command } from '$lib/helpers/commandCenter'; +import { registerCommand, type Command } from '$lib/helpers/commandCenter'; import type { Models } from '@appwrite.io/console'; import type { BarSeriesOption } from 'echarts/charts'; -import { derived, writable } from 'svelte/store'; +import { derived, writable, type Readable } from 'svelte/store'; export const project = derived(page, ($page) => $page.data.project as Models.Project); -export const projectRegistrant = derived([project, cmdRegistrant], ([$project, $registrant]) => { - return { - register: (c: Command[] = []) => - $registrant.register([ +export const registerProjectCommand = derived([project, registerCommand], ([$project, $register]) => { + return (c: Command[] = []) => + $register([ ...[ { label: 'Go to Overview', @@ -51,8 +50,8 @@ export const projectRegistrant = derived([project, cmdRegistrant], ([$project, $ ], ...(c ?? []) ]) - }; -}); + +}) as Readable<(c?: Command[]) => void>; export const onboarding = derived( project,