Skip to content

Commit 0e512db

Browse files
refactor(web): composer controls own their look instead of restyling ui components (pingdotgg#13209)
Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
1 parent 71c9b69 commit 0e512db

15 files changed

Lines changed: 100 additions & 137 deletions

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

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,14 +1100,8 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
11001100
render={
11011101
<ComposerControl
11021102
size={size}
1103-
className={cn(
1104-
"shrink-0 whitespace-nowrap",
1105-
props.interactionMode === "plan"
1106-
? "bg-accent text-accent-foreground hover:bg-accent/80"
1107-
: size === "xs"
1108-
? undefined
1109-
: "text-secondary-label hover:text-foreground",
1110-
)}
1103+
className="shrink-0 whitespace-nowrap"
1104+
aria-pressed={props.interactionMode === "plan"}
11111105
type="button"
11121106
onClick={props.onToggleInteractionMode}
11131107
aria-label={interactionModeTooltip}
@@ -1152,7 +1146,6 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
11521146
<ComposerSelectControl
11531147
data-composer-shortcut="composer.mode"
11541148
size={size}
1155-
className={size === "xs" ? undefined : "font-medium"}
11561149
aria-label="Runtime mode"
11571150
/>
11581151
}
@@ -4994,22 +4987,20 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
49944987
.slice(restingBlockDefs.length - restingHiddenBlockCount)
49954988
.map((def) => def.id);
49964989
const composerControls = showProviderUnavailable ? (
4997-
<Button
4990+
<ComposerControl
49984991
type="button"
4999-
size="sm"
5000-
variant="ghost"
50014992
disabled={!providerSetupInstanceId}
50024993
onClick={() => {
50034994
if (providerSetupInstanceId) {
50044995
onOpenProviderSetup(providerSetupInstanceId);
50054996
}
50064997
}}
50074998
data-chat-provider-unavailable="true"
5008-
className="shrink-0 gap-2 px-2 text-secondary-label sm:px-3"
4999+
className="shrink-0"
50095000
>
50105001
<CircleAlertIcon className="size-4" />
50115002
{providerSetupInstanceId ? "Open provider settings" : "No provider available"}
5012-
</Button>
5003+
</ComposerControl>
50135004
) : (
50145005
<>
50155006
{composerControlsInStrip && restingControlsHaveLeadingContext ? (
@@ -6590,9 +6581,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
65906581
<TooltipTrigger
65916582
render={
65926583
<Button
6593-
variant="ghost"
6584+
variant="overlay"
65946585
size="icon-xs"
6595-
className="absolute bottom-1 left-1 bg-background/85 hover:bg-background/95"
6586+
className="absolute bottom-1 left-1"
65966587
onClick={() =>
65976588
retryAttachmentUpload({
65986589
environmentId,
@@ -6609,19 +6600,23 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
66096600
<TooltipPopup side="top">{upload.reason}</TooltipPopup>
66106601
</Tooltip>
66116602
)}
6612-
<Button
6613-
variant="ghost"
6614-
size="icon-xs"
6603+
{/* Snap-shot frames reveal their remove button on hover or focus. */}
6604+
<span
66156605
className={cn(
6616-
"absolute right-1 top-1 bg-background/80 hover:bg-background/90",
6606+
"absolute right-1 top-1 flex",
66176607
image.source?.kind === "snap-shot" &&
6618-
"opacity-0 transition-opacity pointer-coarse:opacity-100 focus-visible:opacity-100 group-hover/attachment:opacity-100 group-focus-within/attachment:opacity-100",
6608+
"opacity-0 transition-opacity pointer-coarse:opacity-100 group-hover/attachment:opacity-100 group-focus-within/attachment:opacity-100",
66196609
)}
6620-
onClick={() => removeComposerImage(image.id)}
6621-
aria-label={`Remove ${image.name}`}
66226610
>
6623-
<XIcon />
6624-
</Button>
6611+
<Button
6612+
variant="media-close"
6613+
size="icon-xs"
6614+
onClick={() => removeComposerImage(image.id)}
6615+
aria-label={`Remove ${image.name}`}
6616+
>
6617+
<XIcon />
6618+
</Button>
6619+
</span>
66256620
</SnapShotAttachmentFrame>
66266621
);
66276622
})
@@ -6685,9 +6680,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
66856680
<TooltipTrigger
66866681
render={
66876682
<Button
6688-
variant="ghost"
6683+
variant="overlay"
66896684
size="icon-xs"
6690-
className="absolute bottom-1 left-1 bg-background/85 hover:bg-background/95"
6685+
className="absolute bottom-1 left-1"
66916686
onClick={() =>
66926687
retryAttachmentUpload({
66936688
environmentId,
@@ -6705,9 +6700,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
67056700
</Tooltip>
67066701
)}
67076702
<Button
6708-
variant="ghost"
6703+
variant="media-close"
67096704
size="icon-xs"
6710-
className="absolute right-1 top-1 bg-background/80 hover:bg-background/90"
6705+
className="absolute right-1 top-1"
67116706
onClick={() => removeComposerFileFromDraft(file.id)}
67126707
aria-label={`Remove ${file.name}`}
67136708
>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ export const CompactComposerControlsMenu = memo(function CompactComposerControls
3838
render={
3939
<ComposerControl
4040
size={size}
41-
variant="ghost"
42-
className={size === "xs" ? "shrink-0" : "shrink-0 px-2"}
41+
className="shrink-0"
4342
aria-label="More composer controls"
4443
data-composer-shortcut={
4544
props.traitsMenuContent ? "composer.mode composer.effort" : "composer.mode"

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

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,49 @@
1+
import { mergeProps } from "@base-ui/react/merge-props";
2+
import { Select as SelectPrimitive } from "@base-ui/react/select";
3+
import { useRender } from "@base-ui/react/use-render";
14
import type { ComponentProps } from "react";
25
import { ChevronDownIcon, type LucideIcon } from "lucide-react";
36

47
import { cn } from "~/lib/utils";
5-
import { Button } from "../ui/button";
6-
import { SelectTrigger } from "../ui/select";
78
import { Separator } from "../ui/separator";
89

910
export type ComposerControlSize = "sm" | "xs";
1011

11-
type ComposerControlProps = Omit<ComponentProps<typeof Button>, "size"> & {
12-
size?: ComposerControlSize;
13-
};
12+
/**
13+
* The composer toolbar's control look. `sm` is the expanded toolbar; `xs` is the dimmer resting
14+
* strip. `aria-pressed` marks a toggle that is on (plan mode). This is an app control, not a
15+
* restyled Button, so it owns its classes.
16+
*/
17+
function composerControlClassName(size: ComposerControlSize, className?: string) {
18+
return cn(
19+
"relative inline-flex shrink-0 cursor-pointer items-center justify-center whitespace-nowrap rounded-[var(--control-radius)] border border-transparent text-base outline-none hover:bg-accent data-pressed:bg-accent focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 data-disabled:pointer-events-none data-disabled:opacity-64 pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 [&:active:not([aria-haspopup])]:scale-[0.97] [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg]:-mx-0.5 [&_svg[data-composer-control-icon]]:mx-0 [&_svg:not([class*='text-'])]:text-[var(--control-icon-color)]",
20+
size === "xs"
21+
? "h-7 gap-1 px-[calc(--spacing(2)-1px)] font-normal text-muted-foreground/70 text-sm [--control-icon-color:currentColor] hover:text-foreground/80 sm:h-6 sm:text-xs [&_svg:not([class*='size-'])]:size-4 sm:[&_svg:not([class*='size-'])]:size-3.5 [&_svg[data-composer-control-chevron]]:ms-0 [&_svg[data-composer-control-chevron]]:-me-1"
22+
: "h-7 gap-1.5 px-2.5 font-medium text-secondary-label [--control-icon-color:var(--contrast-muted-foreground)] hover:text-foreground sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4",
23+
"aria-pressed:bg-accent aria-pressed:text-accent-foreground aria-pressed:hover:bg-accent/80",
24+
className,
25+
);
26+
}
1427

15-
type ComposerSelectControlProps = Omit<ComponentProps<typeof SelectTrigger>, "size"> & {
28+
type ComposerControlProps = useRender.ComponentProps<"button"> & {
1629
size?: ComposerControlSize;
1730
};
1831

19-
const composerControlClassName =
20-
"rounded-[var(--control-radius)] text-secondary-label transition-none hover:text-foreground [&_svg[data-composer-control-chevron]]:-mx-0.5 [&_svg[data-composer-control-icon]]:mx-0";
21-
const expandedComposerControlClassName = "h-7 min-h-7 gap-1.5 px-2.5";
22-
const restingComposerControlClassName =
23-
"[--control-icon-color:currentColor] font-normal text-muted-foreground/70 hover:text-foreground/80 [&_svg[data-composer-control-chevron]]:-me-1 [&_svg[data-composer-control-chevron]]:ms-0";
24-
2532
export function ComposerControl({
2633
className,
2734
size = "sm",
28-
variant = "ghost",
35+
render,
2936
...props
3037
}: ComposerControlProps) {
31-
return (
32-
<Button
33-
className={cn(
34-
composerControlClassName,
35-
size === "xs" ? restingComposerControlClassName : expandedComposerControlClassName,
36-
className,
37-
)}
38-
size={size}
39-
variant={variant}
40-
{...props}
41-
/>
42-
);
38+
const defaultProps = {
39+
className: composerControlClassName(size, className),
40+
type: render ? undefined : ("button" as const),
41+
};
42+
return useRender({
43+
defaultTagName: "button",
44+
props: mergeProps<"button">(defaultProps, props),
45+
render,
46+
});
4347
}
4448

4549
export function ComposerControlIcon({
@@ -105,21 +109,19 @@ export function ComposerControlSeparator({
105109

106110
export function ComposerSelectControl({
107111
className,
112+
children,
108113
size = "sm",
109-
variant = "ghost",
110114
...props
111-
}: ComposerSelectControlProps) {
115+
}: Omit<SelectPrimitive.Trigger.Props, "className"> & {
116+
className?: string | undefined;
117+
size?: ComposerControlSize;
118+
}) {
112119
return (
113-
<SelectTrigger
114-
className={cn(
115-
composerControlClassName,
116-
size === "xs" ? restingComposerControlClassName : expandedComposerControlClassName,
117-
className,
118-
)}
119-
icon={<ComposerControlChevron size={size} />}
120-
size={size}
121-
variant={variant}
122-
{...props}
123-
/>
120+
<SelectPrimitive.Trigger className={composerControlClassName(size, className)} {...props}>
121+
{children}
122+
<SelectPrimitive.Icon>
123+
<ComposerControlChevron size={size} />
124+
</SelectPrimitive.Icon>
125+
</SelectPrimitive.Trigger>
124126
);
125127
}

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

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ const formatPendingPrimaryActionLabel = (input: {
5252
return input.questionIndex > 0 ? "Submit answers" : "Submit answer";
5353
};
5454

55+
// The composer's labeled primary actions (Submit, Refine, Implement) share the send button's
56+
// message-action pill, so they are composer-owned buttons rather than restyled Buttons.
57+
const messageActionPillClassName =
58+
"inline-flex shrink-0 cursor-pointer items-center justify-center gap-1.5 whitespace-nowrap rounded-full bg-message-action font-medium text-base text-message-action-foreground shadow-xs shadow-message-action/24 outline-none hover:bg-message-action-hover focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 disabled:shadow-none sm:text-sm";
59+
5560
const preventPointerFocus: PointerEventHandler<HTMLElement> = (event) => {
5661
event.preventDefault();
5762
};
@@ -112,7 +117,6 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
112117
<Button
113118
size="icon-sm"
114119
variant="outline"
115-
className="rounded-full"
116120
{...pointerFocusProps}
117121
onClick={onPreviousPendingQuestion}
118122
disabled={pendingAction.isResponding}
@@ -124,7 +128,6 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
124128
<Button
125129
size="sm"
126130
variant="outline"
127-
className="rounded-full"
128131
{...pointerFocusProps}
129132
onClick={onPreviousPendingQuestion}
130133
disabled={pendingAction.isResponding}
@@ -133,13 +136,9 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
133136
</Button>
134137
)
135138
) : null}
136-
<Button
139+
<button
137140
type="submit"
138-
size="sm"
139-
className={cn(
140-
"rounded-full bg-message-action text-message-action-foreground hover:bg-message-action-hover",
141-
compact ? "px-3" : "px-4",
142-
)}
141+
className={cn(messageActionPillClassName, "h-8 sm:h-7", compact ? "px-3" : "px-4")}
143142
{...pointerFocusProps}
144143
disabled={
145144
isEnvironmentUnavailable ||
@@ -153,47 +152,44 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
153152
isResponding: pendingAction.isResponding,
154153
questionIndex: pendingAction.questionIndex,
155154
})}
156-
</Button>
155+
</button>
157156
</div>
158157
);
159158
}
160159

161160
if (showPlanFollowUpPrompt) {
162161
if (promptHasText) {
163162
return (
164-
<Button
163+
<button
165164
type="submit"
166-
size="sm"
167-
className={cn(
168-
"rounded-full bg-message-action text-message-action-foreground hover:bg-message-action-hover",
169-
compact ? "h-9 px-3 sm:h-8" : "h-9 px-4 sm:h-8",
170-
)}
165+
className={cn(messageActionPillClassName, "h-9 sm:h-8", compact ? "px-3" : "px-4")}
171166
{...pointerFocusProps}
172167
disabled={isSendBusy || isSendDisabled || isConnecting || isEnvironmentUnavailable}
173168
>
174169
{isConnecting || isSendBusy ? "Sending..." : "Refine"}
175-
</Button>
170+
</button>
176171
);
177172
}
178173

179174
return (
180175
<div data-chat-composer-implement-actions="true" className="flex items-center justify-end">
181-
<Button
176+
<button
182177
type="submit"
183-
size="sm"
184-
className="h-9 rounded-l-full rounded-r-none bg-message-action px-4 text-message-action-foreground hover:bg-message-action-hover sm:h-8"
178+
className={cn(messageActionPillClassName, "h-9 rounded-r-none px-4 sm:h-8")}
185179
{...pointerFocusProps}
186180
disabled={isSendBusy || isSendDisabled || isConnecting || isEnvironmentUnavailable}
187181
>
188182
{isConnecting || isSendBusy ? "Sending..." : "Implement"}
189-
</Button>
183+
</button>
190184
<Menu>
191185
<MenuTrigger
192186
render={
193-
<Button
194-
size="sm"
195-
variant="default"
196-
className="h-9 rounded-l-none rounded-r-full border-l-message-action-foreground/20 bg-message-action px-2 text-message-action-foreground hover:bg-message-action-hover sm:h-8"
187+
<button
188+
type="button"
189+
className={cn(
190+
messageActionPillClassName,
191+
"h-9 rounded-l-none border-l border-message-action-foreground/20 px-2 sm:h-8",
192+
)}
197193
aria-label="Implementation actions"
198194
{...pointerFocusProps}
199195
disabled={isSendBusy || isSendDisabled || isConnecting || isEnvironmentUnavailable}

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,9 @@ export const ModelListRow = memo(function ModelListRow(props: {
5353
value={modelPickerModelKey(props.instanceId, props.model.slug)}
5454
disabled={Boolean(props.disabledReason)}
5555
className={cn(
56-
"group relative w-full !min-w-0 max-w-full cursor-pointer rounded-md px-2 py-2 transition-[background-color,box-shadow,color]",
57-
"hover:bg-[color-mix(in_srgb,var(--popover)_90%,var(--contrast-foreground))] data-highlighted:bg-[color-mix(in_srgb,var(--popover)_90%,var(--contrast-foreground))] data-selected:bg-foreground/[0.08] data-selected:text-foreground data-selected:ring-0 [&[data-highlighted][data-selected]]:bg-[color-mix(in_srgb,var(--popover)_90%,var(--contrast-foreground))]",
56+
"group relative w-full !min-w-0 max-w-full cursor-pointer",
5857
props.disabledReason &&
59-
"data-disabled:pointer-events-auto data-disabled:cursor-not-allowed data-disabled:hover:bg-transparent",
58+
"data-disabled:pointer-events-auto data-disabled:cursor-not-allowed",
6059
)}
6160
>
6261
<div className="min-w-0 flex-1 text-left">
@@ -103,11 +102,8 @@ export const ModelListRow = memo(function ModelListRow(props: {
103102
render={
104103
<Button
105104
size="icon-xs"
106-
variant="ghost"
107-
className={cn(
108-
"-mr-1 shrink-0 text-muted-foreground/70 opacity-64 transition-[color,opacity] hover:text-foreground hover:opacity-100 group-hover:opacity-100",
109-
props.isFavorite && "text-foreground opacity-100",
110-
)}
105+
variant="ghost-muted"
106+
className="-mr-1 shrink-0"
111107
onClick={(event) => {
112108
event.stopPropagation();
113109
props.onToggleFavorite();

0 commit comments

Comments
 (0)