Skip to content

Commit e767f8a

Browse files
committed
fix(web): open side chats on slash menu selection and focus input
1 parent cefb544 commit e767f8a

5 files changed

Lines changed: 235 additions & 115 deletions

File tree

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

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import { ThreadId } from "@t3tools/contracts";
44
import { DEFAULT_CLIENT_SETTINGS } from "@t3tools/contracts/settings";
55
import type * as Context from "effect/Context";
66
import { expect, it, vi } from "vite-plus/test";
7-
import { page } from "vite-plus/test/browser";
7+
import { page, userEvent } from "vite-plus/test/browser";
88

9+
import "~/index.css";
910
import { AppRoot } from "~/AppRoot";
1011
// The route loads ChatView lazily, and its first transform (React Compiler over ~4k lines)
1112
// takes 6-11s; importing it here keeps that out of the test's timeout.
@@ -17,6 +18,7 @@ import {
1718
ENVIRONMENT_ID,
1819
PROJECT_ID,
1920
installFakeEnvironment,
21+
threadWithHistory,
2022
type FakeDriver,
2123
} from "../../test/fakeEnvironment";
2224
import { render } from "../../test/render";
@@ -31,6 +33,50 @@ vi.mock("../../../../packages/client-runtime/src/connection/driver.ts", async (i
3133
return { ...actual, layer: Layer.succeed(actual.ConnectionDriver, fakeDriver) };
3234
});
3335

36+
it.each(["sid", "btw"])("opens and focuses a side chat on selecting /%s once", async (command) => {
37+
const thread = threadWithHistory(`side-menu-${command}`, 1);
38+
using _environment = installFakeEnvironment([thread], { sideChats: true });
39+
__setClientSettingsForTests({
40+
...DEFAULT_CLIENT_SETTINGS,
41+
onboardingCompletedAt: "2026-01-01T00:00:00.000Z",
42+
});
43+
await page.viewport(1400, 900);
44+
const router = getRouter(
45+
createMemoryHistory({ initialEntries: [`/${ENVIRONMENT_ID}/${thread.id}`] }),
46+
);
47+
await router.load();
48+
const container = document.createElement("div");
49+
container.style.cssText = "height: 900px; width: 1400px;";
50+
await using screen = await render(<AppRoot router={router} />, {
51+
container,
52+
// AppRoot brings its own router.
53+
router: false,
54+
});
55+
const mainInput = screen.getByRole("textbox", { name: `Message ${thread.title}` });
56+
const sideInput = screen.getByRole("textbox", { name: "Message Side chat" });
57+
const sideOption = page.getByRole("option", {
58+
name: command === "sid" ? /^\/side / : /^\/btw /,
59+
});
60+
await expect.element(mainInput).toBeVisible();
61+
await userEvent.type(mainInput, `/${command} keep this question`);
62+
await userEvent.keyboard("{Home}{ArrowRight}{ArrowRight}{ArrowRight}{ArrowRight}");
63+
await sideOption.click();
64+
await expect
65+
.element(mainInput)
66+
.toHaveTextContent(`/${command === "sid" ? "side" : "btw"} keep this question`);
67+
await expect.element(sideInput).not.toBeInTheDocument();
68+
69+
await mainInput.fill("");
70+
await userEvent.type(mainInput, `/${command}`);
71+
await expect.element(sideOption).toBeVisible();
72+
await userEvent.keyboard("{Enter}");
73+
74+
await expect.element(sideInput, { timeout: 2000 }).toHaveFocus();
75+
await userEvent.keyboard("a side question");
76+
await expect.element(sideInput).toHaveTextContent("a side question");
77+
await expect.element(mainInput).toHaveTextContent("");
78+
});
79+
3480
vi.mock(import("~/rpc/requestLatencyState"), async (original) => ({
3581
...(await original()),
3682
trackRpcRequestSent: () => {},

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

Lines changed: 112 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1847,6 +1847,99 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
18471847
};
18481848
};
18491849

1850+
const blurMobileComposerAfterSend = () => {
1851+
if (!isSoftwareKeyboardOpen) return;
1852+
if (composerBlurFrameRef.current !== null) {
1853+
window.cancelAnimationFrame(composerBlurFrameRef.current);
1854+
composerBlurFrameRef.current = null;
1855+
}
1856+
const activeElement = document.activeElement;
1857+
if (activeElement instanceof HTMLElement) {
1858+
activeElement.blur();
1859+
}
1860+
setIsComposerFocused(false);
1861+
};
1862+
1863+
const shouldBlurMobileComposerOnSubmit = () => {
1864+
if (!isSoftwareKeyboardOpen) return false;
1865+
if (
1866+
isSendBusy ||
1867+
isSendDisabled ||
1868+
noProviderAvailable ||
1869+
environmentUnavailable !== null ||
1870+
phase === "running"
1871+
) {
1872+
return false;
1873+
}
1874+
if (activePendingProgress) {
1875+
return activePendingProgress.isLastQuestion && Boolean(activePendingResolvedAnswers);
1876+
}
1877+
return showPlanFollowUpPrompt || composerSendState.hasSendableContent;
1878+
};
1879+
1880+
const submitComposer = (
1881+
event?: { preventDefault: () => void },
1882+
dispatchMode?: ComposerDispatchMode,
1883+
submissionIntent?: ComposerSubmissionIntent,
1884+
) => {
1885+
if (
1886+
noProviderAvailable ||
1887+
isSendDisabled ||
1888+
!readEnvironmentScope(environmentId, AuthOrchestrationOperateScope)
1889+
) {
1890+
event?.preventDefault();
1891+
return;
1892+
}
1893+
// A send while a pasted image is still compressing would strand that image:
1894+
// the turn snapshot wouldn't include it, and it would surface in the *next*
1895+
// draft instead.
1896+
if (activeThreadId && countPreparingComposerImages(attachmentTargetKey) > 0) {
1897+
event?.preventDefault();
1898+
toastManager.add({
1899+
type: "info",
1900+
title: "Still compressing a pasted image.",
1901+
description: "Send again once its thumbnail appears.",
1902+
});
1903+
return;
1904+
}
1905+
if (pendingDraftWork.has(attachmentTargetKey)) {
1906+
event?.preventDefault();
1907+
toastManager.add({
1908+
type: "info",
1909+
title: "Still bringing attached context into this message.",
1910+
description: "Send again once its chip resolves.",
1911+
});
1912+
return;
1913+
}
1914+
const submission = submitComposerDraft({
1915+
prompt: promptRef.current,
1916+
submissionTarget: activePendingProgress ? "pending-user-input" : "provider-turn",
1917+
event,
1918+
onSend: (sendEvent) => {
1919+
providerInputRejectedRef.current = false;
1920+
onSend(
1921+
sendEvent,
1922+
dispatchMode ??
1923+
resolveComposerDispatchMode({
1924+
running: phase === "running",
1925+
alternateModifier: false,
1926+
activeTurnDefault: followUpBehavior,
1927+
canSteer: !isCompacting,
1928+
}),
1929+
submissionIntent,
1930+
);
1931+
return !providerInputRejectedRef.current;
1932+
},
1933+
});
1934+
setComposerSubmissionError(submission.validationMessage);
1935+
if (!submission.didDispatch) return;
1936+
onTypingGuardSend();
1937+
if (shouldBlurMobileComposerOnSubmit()) {
1938+
blurMobileComposerAfterSend();
1939+
}
1940+
};
1941+
const submitComposerStable = useStableCallback(submitComposer);
1942+
18501943
const { onUsageLimitsCommand } = props;
18511944
const onSelectComposerItem = (item: ComposerCommandItem) => {
18521945
if (composerSelectLockRef.current) return;
@@ -1886,13 +1979,28 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
18861979
}
18871980
if (item.command === "side" || item.command === "btw") {
18881981
if (props.sideChatDisabledReason) return;
1982+
const openImmediately =
1983+
snapshot.value.slice(0, trigger.rangeStart).trim() === "" &&
1984+
snapshot.value.slice(trigger.rangeEnd).trim() === "";
1985+
const replacement = `/${item.command} `;
1986+
const replacementRangeEnd = extendReplacementRangeForTrailingSpace(
1987+
snapshot.value,
1988+
trigger.rangeEnd,
1989+
replacement,
1990+
);
18891991
const applied = applyPromptReplacement(
18901992
trigger.rangeStart,
1891-
trigger.rangeEnd,
1892-
`/${item.command} `,
1893-
{ expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd) },
1993+
replacementRangeEnd,
1994+
replacement,
1995+
{
1996+
expectedText: snapshot.value.slice(trigger.rangeStart, replacementRangeEnd),
1997+
focusEditorAfterReplace: !openImmediately,
1998+
},
18941999
);
1895-
if (applied) setComposerHighlightedItemId(null);
2000+
if (applied) {
2001+
setComposerHighlightedItemId(null);
2002+
if (openImmediately) submitComposer();
2003+
}
18962004
return;
18972005
}
18982006
if (!planModeUiEnabled) return;
@@ -2037,98 +2145,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
20372145
setComposerHighlightedItemId(nextItem?.id ?? null);
20382146
};
20392147

2040-
const blurMobileComposerAfterSend = () => {
2041-
if (!isSoftwareKeyboardOpen) return;
2042-
if (composerBlurFrameRef.current !== null) {
2043-
window.cancelAnimationFrame(composerBlurFrameRef.current);
2044-
composerBlurFrameRef.current = null;
2045-
}
2046-
const activeElement = document.activeElement;
2047-
if (activeElement instanceof HTMLElement) {
2048-
activeElement.blur();
2049-
}
2050-
setIsComposerFocused(false);
2051-
};
2052-
2053-
const shouldBlurMobileComposerOnSubmit = () => {
2054-
if (!isSoftwareKeyboardOpen) return false;
2055-
if (
2056-
isSendBusy ||
2057-
isSendDisabled ||
2058-
noProviderAvailable ||
2059-
environmentUnavailable !== null ||
2060-
phase === "running"
2061-
) {
2062-
return false;
2063-
}
2064-
if (activePendingProgress) {
2065-
return activePendingProgress.isLastQuestion && Boolean(activePendingResolvedAnswers);
2066-
}
2067-
return showPlanFollowUpPrompt || composerSendState.hasSendableContent;
2068-
};
2069-
2070-
const submitComposer = (
2071-
event?: { preventDefault: () => void },
2072-
dispatchMode?: ComposerDispatchMode,
2073-
submissionIntent?: ComposerSubmissionIntent,
2074-
) => {
2075-
if (
2076-
noProviderAvailable ||
2077-
isSendDisabled ||
2078-
!readEnvironmentScope(environmentId, AuthOrchestrationOperateScope)
2079-
) {
2080-
event?.preventDefault();
2081-
return;
2082-
}
2083-
// A send while a pasted image is still compressing would strand that image:
2084-
// the turn snapshot wouldn't include it, and it would surface in the *next*
2085-
// draft instead.
2086-
if (activeThreadId && countPreparingComposerImages(attachmentTargetKey) > 0) {
2087-
event?.preventDefault();
2088-
toastManager.add({
2089-
type: "info",
2090-
title: "Still compressing a pasted image.",
2091-
description: "Send again once its thumbnail appears.",
2092-
});
2093-
return;
2094-
}
2095-
if (pendingDraftWork.has(attachmentTargetKey)) {
2096-
event?.preventDefault();
2097-
toastManager.add({
2098-
type: "info",
2099-
title: "Still bringing attached context into this message.",
2100-
description: "Send again once its chip resolves.",
2101-
});
2102-
return;
2103-
}
2104-
const submission = submitComposerDraft({
2105-
prompt: promptRef.current,
2106-
submissionTarget: activePendingProgress ? "pending-user-input" : "provider-turn",
2107-
event,
2108-
onSend: (sendEvent) => {
2109-
providerInputRejectedRef.current = false;
2110-
onSend(
2111-
sendEvent,
2112-
dispatchMode ??
2113-
resolveComposerDispatchMode({
2114-
running: phase === "running",
2115-
alternateModifier: false,
2116-
activeTurnDefault: followUpBehavior,
2117-
canSteer: !isCompacting,
2118-
}),
2119-
submissionIntent,
2120-
);
2121-
return !providerInputRejectedRef.current;
2122-
},
2123-
});
2124-
setComposerSubmissionError(submission.validationMessage);
2125-
if (!submission.didDispatch) return;
2126-
onTypingGuardSend();
2127-
if (shouldBlurMobileComposerOnSubmit()) {
2128-
blurMobileComposerAfterSend();
2129-
}
2130-
};
2131-
const submitComposerStable = useStableCallback(submitComposer);
21322148
const handleSubmitMessage = (event: React.MouseEvent<HTMLButtonElement>) => {
21332149
event.preventDefault();
21342150
submitComposer(

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ export function RightPanelSurfaceContent(props: {
176176
parentRef={threadRef}
177177
threadId={surface.threadId}
178178
parentPanel={props.sideChatParentPanel}
179+
visible={visible}
179180
onClose={() => onCloseSurface(surface)}
180181
/>
181182
);

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import {
1212
type ThreadId,
1313
} from "@t3tools/contracts";
1414
import { Trash2Icon, XIcon } from "lucide-react";
15-
import { useEffect, useState } from "react";
15+
import { useEffect, useRef, useState } from "react";
1616

17-
import { ComposerHandleContext } from "../../composerHandleContext";
17+
import { ComposerHandleContext, type ComposerHandleRef } from "../../composerHandleContext";
1818
import { useClientSettings } from "../../hooks/useSettings";
1919
import type { SideChatParentPanel } from "../../lib/sideChatPane";
2020
import { readLocalApi } from "../../localApi";
@@ -35,6 +35,7 @@ export default function SideChatPane(props: {
3535
readonly parentRef: ScopedThreadRef;
3636
readonly threadId: ThreadId;
3737
readonly parentPanel: SideChatParentPanel;
38+
readonly visible: boolean;
3839
readonly onClose: () => void;
3940
}) {
4041
const { parentRef, threadId } = props;
@@ -45,6 +46,14 @@ export default function SideChatPane(props: {
4546
[parentRef, threadId],
4647
);
4748
const shell = useQuietThreadShell(threadRef);
49+
const composerRef: ComposerHandleRef = useRef(null);
50+
const chatReady = shell !== null;
51+
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- focuses the embedded composer DOM after its side chat becomes visible
52+
useEffect(() => {
53+
if (!props.visible || !chatReady) return;
54+
const frame = window.requestAnimationFrame(() => composerRef.current?.focusAtEnd());
55+
return () => window.cancelAnimationFrame(frame);
56+
}, [chatReady, props.visible]);
4857
const parent = useQuietThreadShell(parentRef);
4958
const snapshotLoaded = useEnvironmentShellHasSnapshot(parentRef.environmentId);
5059
const projection = useQuietThreadProjection(shell === null ? null : threadRef)?.projection;
@@ -164,7 +173,7 @@ export default function SideChatPane(props: {
164173
) : null
165174
) : (
166175
<BackgroundThreadContext value>
167-
<ComposerHandleContext value={null}>
176+
<ComposerHandleContext value={composerRef}>
168177
<ChatView
169178
environmentId={parentRef.environmentId}
170179
threadId={threadId}

0 commit comments

Comments
 (0)