feat(maestro): wire React app as sole web entry point
Deletes the vanilla shell and mounts App.tsx on #root. main.ts and the 23 views it drove are gone; App.tsx composes the ported components — sidebar, multi-view, command bar, spawn modal, help and restart overlays, daemon link, drawer — around the catalog and layout stores. The pure parts of four deleted modules moved next to the components that still use them: the spawn-form model and spawnSimilar into components/spawn, the transcript's markdown/format helpers and the diff into components/structured, the help overlay's grouping into components/dialogs. Document-level event names now live in uiEvents.ts. Deduplicated two pairs the migration left side by side: the sidebar uses dialogs/KillDialog and common/ContextMenu. It also listens for the command bar's kill/rename events, which nothing had picked up since catalog.ts went away. styles.css stays as the token and base layer, with `#app` renamed to `#root` and the pane-body rules re-keyed off the classes the React panes actually carry. Closes #253
This commit is contained in:
@@ -2,8 +2,8 @@
|
||||
import { act, cleanup, fireEvent, render } from "@testing-library/react";
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||
|
||||
import { OPEN_SPAWN_EVENT, SPAWN_SIMILAR_EVENT } from "../../catalog.js";
|
||||
import { TOGGLE_DRAWER_EVENT } from "../../drawer.js";
|
||||
import { OPEN_SPAWN_EVENT, SPAWN_SIMILAR_EVENT } from "../../uiEvents.js";
|
||||
import { TOGGLE_DRAWER_EVENT } from "../../uiEvents.js";
|
||||
import { Drawer } from "./Drawer.js";
|
||||
|
||||
/** Force the mobile media query on, whatever happy-dom's viewport says
|
||||
|
||||
@@ -10,8 +10,7 @@
|
||||
import type { ReactNode } from "react";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
|
||||
import { OPEN_SPAWN_EVENT, SPAWN_SIMILAR_EVENT } from "../../catalog.js";
|
||||
import { TOGGLE_DRAWER_EVENT } from "../../drawer.js";
|
||||
import { OPEN_SPAWN_EVENT, SPAWN_SIMILAR_EVENT, TOGGLE_DRAWER_EVENT } from "../../uiEvents.js";
|
||||
|
||||
export interface DrawerProps {
|
||||
sidebar: ReactNode;
|
||||
|
||||
@@ -4,17 +4,26 @@
|
||||
// (#253) — this renders the tree itself: tabs, nested splits, pane chrome.
|
||||
|
||||
import type { ReactNode } from "react";
|
||||
import { useEffect, useRef } from "react";
|
||||
import { forwardRef, useEffect, useImperativeHandle, useRef } from "react";
|
||||
import { useStore } from "zustand";
|
||||
|
||||
import { activeTab, type Dir, type Node } from "../../layout.js";
|
||||
import { usePreview } from "../../hooks/usePreview.js";
|
||||
import type { LayoutStore, LayoutStoreApi } from "../../stores/layoutStore.js";
|
||||
import type { Session, Uuid } from "../../types.js";
|
||||
import { PaneContainer } from "./PaneContainer.js";
|
||||
import { PaneContainer, type PaneContainerHandle } from "./PaneContainer.js";
|
||||
import { PaneTitle } from "./PaneTitle.js";
|
||||
import { TabBar } from "./TabBar.js";
|
||||
|
||||
/** Reaching the focused pane from outside the tree — what the shell's
|
||||
* leader chords need (focus.toggle, the literal-byte escape hatches). */
|
||||
export interface MultiViewHandle {
|
||||
/** Hand the keyboard to the focused pane's terminal (or composer). */
|
||||
focusPane(): void;
|
||||
/** Type into the focused pane. A structured pane has no PTY and ignores it. */
|
||||
sendInput(data: string): void;
|
||||
}
|
||||
|
||||
export interface MultiViewProps {
|
||||
store: LayoutStoreApi;
|
||||
/** Live sessions, keyed by id — drives pane titles and (once known) boot
|
||||
@@ -24,9 +33,26 @@ export interface MultiViewProps {
|
||||
emptyState?: ReactNode;
|
||||
}
|
||||
|
||||
export function MultiView({ store, sessions, onDisconnect, emptyState }: MultiViewProps) {
|
||||
export const MultiView = forwardRef<MultiViewHandle, MultiViewProps>(function MultiView(
|
||||
{ store, sessions, onDisconnect, emptyState },
|
||||
ref,
|
||||
) {
|
||||
const layout = useStore(store, (s: LayoutStore) => s.layout);
|
||||
const tab = activeTab(layout);
|
||||
|
||||
// Live pane handles, keyed by leaf. Read at call time (not render time) so
|
||||
// the chords always reach whatever is focused right now.
|
||||
const panes = useRef(new Map<string, PaneContainerHandle>()).current;
|
||||
const focusedLeafRef = useRef<string | null>(null);
|
||||
focusedLeafRef.current = tab.focusedLeafId;
|
||||
useImperativeHandle(
|
||||
ref,
|
||||
() => ({
|
||||
focusPane: () => panes.get(focusedLeafRef.current ?? "")?.focusTerminal(),
|
||||
sendInput: (data: string) => panes.get(focusedLeafRef.current ?? "")?.sendInput(data),
|
||||
}),
|
||||
[panes],
|
||||
);
|
||||
const { previewedSessionId, commit: commitPreview } = usePreview({ store });
|
||||
const isPreviewing = previewedSessionId !== null;
|
||||
|
||||
@@ -45,6 +71,7 @@ export function MultiView({ store, sessions, onDisconnect, emptyState }: MultiVi
|
||||
<SplitNode
|
||||
node={tab.root}
|
||||
tab={tab}
|
||||
panes={panes}
|
||||
store={store}
|
||||
sessions={sessions}
|
||||
onDisconnect={onDisconnect}
|
||||
@@ -69,10 +96,12 @@ export function MultiView({ store, sessions, onDisconnect, emptyState }: MultiVi
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
interface TreeProps {
|
||||
tab: { id: string; focusedLeafId: string | null };
|
||||
/** Pane handles by leaf id — each `Pane` registers and unregisters its own. */
|
||||
panes: Map<string, PaneContainerHandle>;
|
||||
store: LayoutStoreApi;
|
||||
sessions?: ReadonlyMap<Uuid, Session>;
|
||||
onDisconnect?: (sessionId: Uuid) => void;
|
||||
@@ -145,6 +174,7 @@ function SplitContainer({ node, ...rest }: TreeProps & { node: Extract<Node, { k
|
||||
function Pane({
|
||||
leaf,
|
||||
isFocused,
|
||||
panes,
|
||||
store,
|
||||
sessions,
|
||||
onDisconnect,
|
||||
@@ -221,6 +251,10 @@ function Pane({
|
||||
<div className="mv-pane-host min-h-0 flex-1">
|
||||
{leaf.sessionId ? (
|
||||
<PaneContainer
|
||||
ref={(handle) => {
|
||||
if (handle) panes.set(leaf.id, handle);
|
||||
else panes.delete(leaf.id);
|
||||
}}
|
||||
sessionId={leaf.sessionId}
|
||||
session={session}
|
||||
focus={isFocused && previewedSessionId === null}
|
||||
|
||||
Reference in New Issue
Block a user