Skip to content

Commit 022a670

Browse files
refactor: consolidate command palette open onto event bus, remove React context
Replace useOpenAddProjectCommandPalette() context hook with direct openCommandPalette({ open: 'add-project' }) bus calls across all consumers. Move isCommandPaletteOpen() into commandPaletteBus.ts. Delete commandPaletteContext.tsx and dead newThreadPickerBus.ts.
1 parent f8e6b3f commit 022a670

10 files changed

Lines changed: 42 additions & 73 deletions

File tree

‎apps/web/src/commandPaletteBus.ts‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// Tiny event bus allowing components (e.g. SidebarV2) to programmatically
2-
// open the command palette without owning its React state.
1+
// Tiny event bus allowing components to programmatically open the command palette
2+
// without owning its React state.
33
const COMMAND_PALETTE_OPEN_EVENT = "t3code:open-command-palette";
44

55
export interface CommandPaletteOpenDetail {
6-
readonly open?: "new-thread-in";
6+
readonly open?: "add-project" | "new-thread-in";
77
}
88

99
export function openCommandPalette(detail?: CommandPaletteOpenDetail): void {
@@ -21,3 +21,10 @@ export function onOpenCommandPalette(
2121
window.addEventListener(COMMAND_PALETTE_OPEN_EVENT, handler);
2222
return () => window.removeEventListener(COMMAND_PALETTE_OPEN_EVENT, handler);
2323
}
24+
25+
/** Read at event time so consumers do not subscribe to transient dialog state. */
26+
export function isCommandPaletteOpen(): boolean {
27+
return (
28+
typeof document !== "undefined" && document.querySelector("[data-command-palette]") !== null
29+
);
30+
}

‎apps/web/src/commandPaletteContext.tsx‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ import {
112112
} from "../types";
113113
import { useTheme } from "../hooks/useTheme";
114114
import { useTurnDiffSummaries } from "../hooks/useTurnDiffSummaries";
115-
import { isCommandPaletteOpen } from "../commandPaletteContext";
115+
import { isCommandPaletteOpen } from "../commandPaletteBus";
116116
import { buildTemporaryWorktreeBranchName } from "@t3tools/shared/git";
117117
import { useMediaQuery } from "../hooks/useMediaQuery";
118118
import { RIGHT_PANEL_INLINE_LAYOUT_MEDIA_QUERY } from "../rightPanelLayout";

‎apps/web/src/components/CommandPalette.tsx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import {
4343
type ReactNode,
4444
} from "react";
4545
import { useAtomValue } from "@effect/atom-react";
46-
import { OpenAddProjectCommandPaletteProvider } from "../commandPaletteContext";
46+
4747
import { isDesktopLocalConnectionTarget } from "../connection/desktopLocal";
4848
import { useDesktopLocalBootstraps } from "../connection/useDesktopLocalBootstraps";
4949
import { useHandleNewThread } from "../hooks/useHandleNewThread";
@@ -419,27 +419,27 @@ export function CommandPalette({ children }: { children: ReactNode }) {
419419
onOpenCommandPalette((detail) => {
420420
if (detail.open === "new-thread-in") {
421421
openNewThreadIn();
422+
} else if (detail.open === "add-project") {
423+
openAddProject();
422424
} else {
423425
setOpen(true);
424426
}
425427
}),
426-
[openNewThreadIn, setOpen],
428+
[openAddProject, openNewThreadIn, setOpen],
427429
);
428430

429431
return (
430-
<OpenAddProjectCommandPaletteProvider openAddProject={openAddProject}>
431-
<ComposerHandleContext value={composerHandleRef}>
432-
<CommandDialog open={state.open} onOpenChange={setOpen}>
433-
{children}
434-
<CommandPaletteDialog
435-
open={state.open}
436-
openIntent={state.openIntent}
437-
setOpen={setOpen}
438-
clearOpenIntent={clearOpenIntent}
439-
/>
440-
</CommandDialog>
441-
</ComposerHandleContext>
442-
</OpenAddProjectCommandPaletteProvider>
432+
<ComposerHandleContext value={composerHandleRef}>
433+
<CommandDialog open={state.open} onOpenChange={setOpen}>
434+
{children}
435+
<CommandPaletteDialog
436+
open={state.open}
437+
openIntent={state.openIntent}
438+
setOpen={setOpen}
439+
clearOpenIntent={clearOpenIntent}
440+
/>
441+
</CommandDialog>
442+
</ComposerHandleContext>
443443
);
444444
}
445445

‎apps/web/src/components/Sidebar.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ import {
177177
useSidebar,
178178
} from "./ui/sidebar";
179179
import { useThreadSelectionStore } from "../threadSelectionStore";
180-
import { useOpenAddProjectCommandPalette } from "../commandPaletteContext";
180+
import { openCommandPalette } from "../commandPaletteBus";
181181
import {
182182
archiveSelectedThreadEntries,
183183
buildMultiSelectThreadContextMenuItems,
@@ -3079,7 +3079,10 @@ export default function Sidebar() {
30793079
: false,
30803080
);
30813081
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
3082-
const openAddProjectCommandPalette = useOpenAddProjectCommandPalette();
3082+
const openAddProjectCommandPalette = useCallback(
3083+
() => openCommandPalette({ open: "add-project" }),
3084+
[],
3085+
);
30833086
const [expandedThreadListsByProject, setExpandedThreadListsByProject] = useState<
30843087
ReadonlySet<string>
30853088
>(() => new Set());

‎apps/web/src/components/SidebarV2.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ import { useUiStateStore } from "../uiStateStore";
5757
import { useThreadSelectionStore } from "../threadSelectionStore";
5858
import { useThreadActions } from "../hooks/useThreadActions";
5959
import { useHandleNewThread } from "../hooks/useHandleNewThread";
60-
import { useOpenAddProjectCommandPalette } from "../commandPaletteContext";
6160
import { openCommandPalette } from "../commandPaletteBus";
6261
import { startNewThreadFromContext } from "../lib/chatThreadActions";
6362
import { useClientSettings } from "../hooks/useSettings";
@@ -625,7 +624,10 @@ export default function SidebarV2() {
625624
reportFailure: false,
626625
});
627626
const newThreadContext = useHandleNewThread();
628-
const openAddProjectCommandPalette = useOpenAddProjectCommandPalette();
627+
const openAddProjectCommandPalette = useCallback(
628+
() => openCommandPalette({ open: "add-project" }),
629+
[],
630+
);
629631
const { environments } = useEnvironments();
630632
const primaryEnvironmentId = usePrimaryEnvironmentId();
631633
const clearSelection = useThreadSelectionStore((s) => s.clearSelection);

‎apps/web/src/components/chat/DraftHeroHeadline.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import type { ScopedProjectRef } from "@t3tools/contracts";
22
import { scopedProjectKey, scopeProjectRef } from "@t3tools/client-runtime/environment";
33
import { FolderPlusIcon } from "lucide-react";
4-
import { useMemo } from "react";
4+
import { useCallback, useMemo } from "react";
55

6-
import { useOpenAddProjectCommandPalette } from "~/commandPaletteContext";
6+
import { openCommandPalette } from "~/commandPaletteBus";
77
import { useNewThreadHandler } from "~/hooks/useHandleNewThread";
88
import { useProjects, useThreadShells } from "~/state/entities";
99
import { sortScopedProjectsForSidebar } from "../Sidebar.logic";
@@ -29,7 +29,7 @@ export function DraftHeroHeadline({
2929
const projects = useProjects();
3030
const threads = useThreadShells();
3131
const handleNewThread = useNewThreadHandler();
32-
const openAddProject = useOpenAddProjectCommandPalette();
32+
const openAddProject = useCallback(() => openCommandPalette({ open: "add-project" }), []);
3333

3434
const orderedProjects = useMemo(
3535
() => sortScopedProjectsForSidebar(projects, threads, "updated_at"),

‎apps/web/src/newThreadPickerBus.ts‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎apps/web/src/routes/_chat.index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { scopeProjectRef } from "@t3tools/client-runtime/environment";
22
import { createFileRoute, Link } from "@tanstack/react-router";
33
import { LinkIcon, PlusIcon, RotateCcwIcon } from "lucide-react";
4-
import { useEffect, useMemo, useRef, useState } from "react";
4+
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
55

6-
import { useOpenAddProjectCommandPalette } from "../commandPaletteContext";
6+
import { openCommandPalette } from "../commandPaletteBus";
77
import { sortScopedProjectsForSidebar } from "../components/Sidebar.logic";
88
import { Button } from "../components/ui/button";
99
import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from "../components/ui/empty";
@@ -105,7 +105,7 @@ function DraftStartError({ onRetry }: { readonly onRetry: () => void }) {
105105
}
106106

107107
function NoProjectsHero() {
108-
const openAddProject = useOpenAddProjectCommandPalette();
108+
const openAddProject = useCallback(() => openCommandPalette({ open: "add-project" }), []);
109109

110110
return (
111111
<SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground">

‎apps/web/src/routes/_chat.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Outlet, createFileRoute, redirect } from "@tanstack/react-router";
22
import { useAtomValue } from "@effect/atom-react";
33
import { useEffect } from "react";
44

5-
import { isCommandPaletteOpen } from "../commandPaletteContext";
5+
import { isCommandPaletteOpen } from "../commandPaletteBus";
66
import { useClientSettings } from "../hooks/useSettings";
77
import { openCommandPalette } from "../commandPaletteBus";
88
import { useProjects } from "../state/entities";

0 commit comments

Comments
 (0)