Skip to content

Commit 8c483f8

Browse files
refactor(web): composer mode controls and footer actions live in ComposerFooterControls
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 7ccabf4 commit 8c483f8

2 files changed

Lines changed: 230 additions & 226 deletions

File tree

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

Lines changed: 3 additions & 226 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ import {
105105
makeComposerMentionDragHandlers,
106106
} from "./composerMentionDrag";
107107
import {
108-
useComposerMenuProps,
109108
isInsideCollapsedComposerControls,
110109
isInsideRestingComposerControlScope,
111110
} from "./composerEventScope";
@@ -134,7 +133,6 @@ import {
134133
} from "../../promptStashStore";
135134
import { ComposerStashBadge } from "./ComposerStashBadge";
136135
import { ComposerStashMenu } from "./ComposerStashMenu";
137-
import { useComposerMenuState } from "./useComposerMenuState";
138136
import { useComposerTriggerState } from "./useComposerTriggerState";
139137
import { useComposerFocusState } from "./useComposerFocusState";
140138
import { useComposerMultilinePrompt } from "./useComposerMultilinePrompt";
@@ -288,15 +286,11 @@ import {
288286
ComposerRestingImagePreviews,
289287
} from "./ComposerAttachmentStrip";
290288
import { ComposerPrimaryActions } from "./ComposerPrimaryActions";
289+
import { ComposerFooterModeControls, ComposerFooterPrimaryActions } from "./ComposerFooterControls";
291290
import { ComposerPendingApprovalPanel } from "./ComposerPendingApprovalPanel";
292291
import { ComposerPendingUserInputPanel } from "./ComposerPendingUserInputPanel";
293292
import { ComposerPlanFollowUpBanner } from "./ComposerPlanFollowUpBanner";
294-
import {
295-
ComposerControl,
296-
ComposerControlIcon,
297-
ComposerControlSeparator,
298-
ComposerSelectControl,
299-
} from "./ComposerControl";
293+
import { ComposerControl, ComposerControlSeparator } from "./ComposerControl";
300294
import { resolveComposerMenuActiveItemId } from "./composerMenuHighlight";
301295
import { buildPullRequestReferenceContext } from "../pullRequest/pullRequestDetail.logic";
302296
import {
@@ -314,7 +308,6 @@ import {
314308
renderProviderTraitsMenuContent,
315309
renderProviderTraitsPicker,
316310
} from "./composerProviderState";
317-
import { ContextWindowMeter, ContextWindowMeterPlaceholder } from "./ContextWindowMeter";
318311
import {
319312
providerSupportsManualCompaction,
320313
resolveContextWindowModelDisplayName,
@@ -973,17 +966,9 @@ function ComposerCommandMenuLayer(props: { anchor: HTMLElement | null; children:
973966
);
974967
}
975968
import { Button } from "../ui/button";
976-
import { Select, SelectItem, SelectPopup, SelectValue } from "../ui/select";
977969
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
978970
import { toastManager } from "../ui/toast";
979-
import {
980-
BotIcon,
981-
CircleAlertIcon,
982-
PaperclipIcon,
983-
PencilRulerIcon,
984-
PlayIcon,
985-
ShieldIcon,
986-
} from "lucide-react";
971+
import { CircleAlertIcon, PaperclipIcon, PlayIcon, ShieldIcon } from "lucide-react";
987972
import { proposedPlanTitle } from "@t3tools/shared/proposedPlanText";
988973
import { hasProviderSetup } from "./ProviderStatusBanner";
989974
import {
@@ -1144,215 +1129,7 @@ function useRestingComposerControlsLayout(host: HTMLDivElement | null, useContro
11441129
};
11451130
}
11461131

1147-
type RuntimeModeOption = { mode: RuntimeMode } & (typeof runtimeModeConfig)[RuntimeMode];
11481132
const runtimeModeOptions = runtimeModes.map((mode) => ({ mode, ...runtimeModeConfig[mode] }));
1149-
const supervisedRuntimeModeOption = {
1150-
mode: "approval-required" as const,
1151-
...runtimeModeConfig["approval-required"],
1152-
};
1153-
const ComposerFooterModeControls = memo(function ComposerFooterModeControls(props: {
1154-
showInteractionModeToggle: boolean;
1155-
interactionMode: ProviderInteractionMode;
1156-
runtimeMode: RuntimeMode;
1157-
runtimeModeOptions: ReadonlyArray<RuntimeModeOption>;
1158-
size?: "sm" | "xs";
1159-
hidden?: boolean;
1160-
onToggleInteractionMode: () => void;
1161-
onRuntimeModeChange: (mode: RuntimeMode) => void;
1162-
}) {
1163-
const size = props.size ?? "sm";
1164-
const composerFloatingLayerProps = useComposerMenuProps();
1165-
const [open, setOpen] = useComposerMenuState(props.hidden);
1166-
const runtimeModeOption =
1167-
props.runtimeModeOptions.find((option) => option.mode === props.runtimeMode) ??
1168-
supervisedRuntimeModeOption;
1169-
const RuntimeModeIcon = runtimeModeOption.icon;
1170-
const interactionModeTooltip =
1171-
props.interactionMode === "plan"
1172-
? "Plan mode — click to return to normal build mode"
1173-
: "Default mode — click to enter plan mode";
1174-
1175-
const interactionModeToggle = props.showInteractionModeToggle ? (
1176-
<>
1177-
<ComposerControlSeparator size={size} />
1178-
<Tooltip>
1179-
<TooltipTrigger
1180-
render={
1181-
<ComposerControl
1182-
size={size}
1183-
className="shrink-0 whitespace-nowrap"
1184-
aria-pressed={props.interactionMode === "plan"}
1185-
type="button"
1186-
onClick={props.onToggleInteractionMode}
1187-
aria-label={interactionModeTooltip}
1188-
/>
1189-
}
1190-
>
1191-
{props.interactionMode === "plan" ? (
1192-
<ComposerControlIcon
1193-
icon={PencilRulerIcon}
1194-
size={size}
1195-
className="text-current opacity-100"
1196-
/>
1197-
) : (
1198-
<ComposerControlIcon
1199-
icon={BotIcon}
1200-
size={size}
1201-
opticalSize={size === "xs" ? "default" : "large"}
1202-
/>
1203-
)}
1204-
<span data-composer-control-label className="sr-only sm:not-sr-only">
1205-
{props.interactionMode === "plan" ? "Plan" : "Build"}
1206-
</span>
1207-
</TooltipTrigger>
1208-
<TooltipPopup side="top">{interactionModeTooltip}</TooltipPopup>
1209-
</Tooltip>
1210-
</>
1211-
) : null;
1212-
1213-
return (
1214-
<>
1215-
<ComposerControlSeparator size={size} />
1216-
1217-
<Tooltip>
1218-
<Select
1219-
open={open}
1220-
onOpenChange={setOpen}
1221-
value={props.runtimeMode}
1222-
onValueChange={(value) => props.onRuntimeModeChange(value!)}
1223-
>
1224-
<TooltipTrigger
1225-
render={
1226-
<ComposerSelectControl
1227-
data-composer-shortcut="composer.mode"
1228-
size={size}
1229-
aria-label="Runtime mode"
1230-
/>
1231-
}
1232-
>
1233-
<ComposerControlIcon icon={RuntimeModeIcon} size={size} />
1234-
<SelectValue data-composer-control-label>{runtimeModeOption.label}</SelectValue>
1235-
</TooltipTrigger>
1236-
<SelectPopup alignItemWithTrigger={false} {...composerFloatingLayerProps}>
1237-
{props.runtimeModeOptions.map((option) => {
1238-
const OptionIcon = option.icon;
1239-
return (
1240-
<SelectItem
1241-
key={option.mode}
1242-
value={option.mode}
1243-
hideIndicator
1244-
className="min-w-64"
1245-
>
1246-
<div className="flex min-w-0 items-center gap-3">
1247-
<div className="grid min-w-0 flex-1 gap-0.5">
1248-
<span className="inline-flex items-center gap-1.5 font-medium text-foreground">
1249-
<OptionIcon className="size-3.5 shrink-0 text-muted-foreground" />
1250-
{option.label}
1251-
</span>
1252-
<span className="text-muted-foreground text-xs leading-4">
1253-
{option.description}
1254-
</span>
1255-
</div>
1256-
</div>
1257-
</SelectItem>
1258-
);
1259-
})}
1260-
</SelectPopup>
1261-
</Select>
1262-
<TooltipPopup side="top">{runtimeModeOption.description}</TooltipPopup>
1263-
</Tooltip>
1264-
1265-
{interactionModeToggle}
1266-
</>
1267-
);
1268-
});
1269-
1270-
const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryActions(props: {
1271-
compact: boolean;
1272-
canOperateThread: boolean;
1273-
activeContextWindow: ContextWindowSnapshot | null;
1274-
reserveContextWindowMeter: boolean;
1275-
activeThreadModelDisplayName: string | null;
1276-
isPreparingWorktree: boolean;
1277-
pendingAction: {
1278-
questionIndex: number;
1279-
isLastQuestion: boolean;
1280-
canAdvance: boolean;
1281-
isResponding: boolean;
1282-
isComplete: boolean;
1283-
} | null;
1284-
isRunning: boolean;
1285-
canInterrupt: boolean;
1286-
followUpBehavior: "queue" | "steer";
1287-
canSteer: boolean;
1288-
alternateShortcutLabel: string | null;
1289-
showPlanFollowUpPrompt: boolean;
1290-
promptHasText: boolean;
1291-
isSendBusy: boolean;
1292-
sendDisabledReason: string | null;
1293-
isConnecting: boolean;
1294-
isEnvironmentUnavailable: boolean;
1295-
hasSendableContent: boolean;
1296-
canResume: boolean;
1297-
preserveComposerFocusOnPointerDown?: boolean;
1298-
isEditingQueuedMessage: boolean;
1299-
onSubmitMessage: React.MouseEventHandler<HTMLButtonElement>;
1300-
onResume: () => void;
1301-
onPreviousPendingQuestion: () => void;
1302-
onInterrupt: () => void;
1303-
onImplementPlanInNewThread: () => void;
1304-
onCompactContext?: (() => void) | undefined;
1305-
compactDisabled: boolean;
1306-
compactDisabledReason: string | null;
1307-
compactBeforeSendTokens: number | null;
1308-
keepFullHistory: boolean;
1309-
onToggleKeepFullHistory: () => void;
1310-
}) {
1311-
return (
1312-
<>
1313-
{props.activeContextWindow ? (
1314-
<ContextWindowMeter
1315-
usage={props.activeContextWindow}
1316-
modelDisplayName={props.activeThreadModelDisplayName}
1317-
onCompact={props.onCompactContext}
1318-
compactDisabled={props.compactDisabled}
1319-
compactDisabledReason={props.compactDisabledReason}
1320-
/>
1321-
) : props.reserveContextWindowMeter ? (
1322-
<ContextWindowMeterPlaceholder />
1323-
) : null}
1324-
<ComposerPrimaryActions
1325-
compact={props.compact}
1326-
canOperateThread={props.canOperateThread}
1327-
pendingAction={props.pendingAction}
1328-
isRunning={props.isRunning}
1329-
canInterrupt={props.canInterrupt}
1330-
followUpBehavior={props.followUpBehavior}
1331-
canSteer={props.canSteer}
1332-
alternateShortcutLabel={props.alternateShortcutLabel}
1333-
showPlanFollowUpPrompt={props.showPlanFollowUpPrompt}
1334-
promptHasText={props.promptHasText}
1335-
isSendBusy={props.isSendBusy}
1336-
sendDisabledReason={props.sendDisabledReason}
1337-
isConnecting={props.isConnecting}
1338-
isEnvironmentUnavailable={props.isEnvironmentUnavailable}
1339-
isPreparingWorktree={props.isPreparingWorktree}
1340-
hasSendableContent={props.hasSendableContent}
1341-
canResume={props.canResume}
1342-
preserveComposerFocusOnPointerDown={props.preserveComposerFocusOnPointerDown ?? false}
1343-
isEditingQueuedMessage={props.isEditingQueuedMessage}
1344-
onSubmitMessage={props.onSubmitMessage}
1345-
onResume={props.onResume}
1346-
onPreviousPendingQuestion={props.onPreviousPendingQuestion}
1347-
onInterrupt={props.onInterrupt}
1348-
onImplementPlanInNewThread={props.onImplementPlanInNewThread}
1349-
compactBeforeSendTokens={props.compactBeforeSendTokens}
1350-
keepFullHistory={props.keepFullHistory}
1351-
onToggleKeepFullHistory={props.onToggleKeepFullHistory}
1352-
/>
1353-
</>
1354-
);
1355-
});
13561133

13571134
export interface ChatComposerHandle {
13581135
focusAtEnd: () => void;

0 commit comments

Comments
 (0)