Skip to content

Commit e3de60d

Browse files
committed
fix(web): keep approval layout in shared banner variants
1 parent 0e1e1b2 commit e3de60d

2 files changed

Lines changed: 12 additions & 11 deletions

File tree

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6004,27 +6004,23 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
60046004
<ComposerBanner.Root
60056005
data-chat-composer-top-drawer="true"
60066006
variant={activePendingApproval ? "warning" : "info"}
6007-
className={
6008-
activePendingApproval
6009-
? "px-3 [--composer-banner-padding-block:--spacing(3)]"
6010-
: undefined
6011-
}
6007+
density={activePendingApproval ? "spacious" : "default"}
60126008
>
60136009
{activePendingApproval ? (
60146010
<ComposerBanner.Row
6015-
className="items-start gap-x-2 gap-y-3"
6011+
layout="approval"
60166012
data-chat-composer-collapsed-controls="true"
60176013
>
6018-
<ComposerBanner.Icon className="pt-0.5 text-warning [&>svg]:size-4">
6014+
<ComposerBanner.Icon>
60196015
<ShieldIcon />
60206016
</ComposerBanner.Icon>
6021-
<ComposerBanner.Content className="@max-[560px]:col-end-4">
6017+
<ComposerBanner.Content>
60226018
<ComposerPendingApprovalPanel
60236019
approval={activePendingApproval}
60246020
pendingCount={pendingApprovals.length}
60256021
/>
60266022
</ComposerBanner.Content>
6027-
<ComposerBanner.Actions className="gap-1.5 @max-[560px]:col-start-2 @max-[560px]:col-end-4 @max-[560px]:row-start-2 @max-[560px]:justify-start">
6023+
<ComposerBanner.Actions>
60286024
<ComposerPendingApprovalActions
60296025
requestId={activePendingApproval.requestId}
60306026
isResponding={respondingRequestIds.includes(

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ function Root({
153153
width = "fill",
154154
...props
155155
}: ComponentProps<"div"> & {
156-
density?: "default" | "comfortable";
156+
density?: "default" | "comfortable" | "spacious";
157157
placement?: "attached" | "floating";
158158
variant?: ComposerBannerVariant;
159159
width?: "fill" | "content";
@@ -163,6 +163,7 @@ function Root({
163163
className={cn(
164164
"min-w-0 px-1 pt-(--composer-banner-padding-block) pb-[calc(var(--chat-composer-attachment-overlap)+var(--composer-banner-padding-block))] text-xs/4 [--composer-banner-icon-column:--spacing(7)] [--composer-banner-padding-block:--spacing(1)] sm:[--composer-banner-icon-column:--spacing(6)]",
165165
density === "comfortable" && "[--composer-banner-padding-block:--spacing(1.25)]",
166+
density === "spacious" && "px-3 [--composer-banner-padding-block:--spacing(3)]",
166167
width === "content" ? "w-fit max-w-full flex-none" : "@container",
167168
className,
168169
)}
@@ -182,7 +183,7 @@ function Row({
182183
layout = "inline",
183184
...props
184185
}: useRender.ComponentProps<"div"> & {
185-
layout?: "inline" | "wrap-actions" | "wrap-actions-narrow";
186+
layout?: "inline" | "wrap-actions" | "wrap-actions-narrow" | "approval";
186187
}) {
187188
const rowProps = {
188189
className: cn(
@@ -193,6 +194,7 @@ function Row({
193194
"@max-[400px]:*:data-[slot=composer-banner-content]:min-h-(--composer-banner-icon-column)",
194195
layout === "wrap-actions-narrow" &&
195196
"@max-[320px]:*:data-[slot=composer-banner-content]:min-h-(--composer-banner-icon-column)",
197+
layout === "approval" && "items-start gap-x-2 gap-y-3",
196198
className,
197199
),
198200
"data-composer-banner-row": "true",
@@ -212,6 +214,7 @@ function Icon({ className, ...props }: ComponentProps<"span">) {
212214
data-slot="composer-banner-icon"
213215
className={cn(
214216
"col-start-1 row-start-1 flex w-(--composer-banner-icon-column) min-w-0 flex-none items-center justify-center text-muted-foreground [&>svg]:size-3",
217+
"group-data-[composer-banner-layout=approval]/banner-row:pt-0.5 group-data-[composer-banner-layout=approval]/banner-row:text-warning group-data-[composer-banner-layout=approval]/banner-row:[&>svg]:size-4",
215218
className,
216219
)}
217220
{...props}
@@ -225,6 +228,7 @@ function Content({ className, ...props }: ComponentProps<"span">) {
225228
data-slot="composer-banner-content"
226229
className={cn(
227230
"col-start-2 row-start-1 flex min-w-0 items-center gap-1 *:data-[slot=composer-banner-separator]:mx-0",
231+
"@max-[560px]:group-data-[composer-banner-layout=approval]/banner-row:col-end-4",
228232
"group-not-has-[>[data-slot=composer-banner-icon]]/banner-row:col-[1/3] group-not-has-[>[data-slot=composer-banner-icon]]/banner-row:ps-2 sm:group-not-has-[>[data-slot=composer-banner-icon]]/banner-row:ps-1.5",
229233
"group-not-has-[>[data-slot=composer-banner-icon],>[data-slot=composer-banner-actions]]/banner-row:pe-2 sm:group-not-has-[>[data-slot=composer-banner-icon],>[data-slot=composer-banner-actions]]/banner-row:pe-1.5",
230234
className,
@@ -252,6 +256,7 @@ function Actions({ className, ...props }: ComponentProps<"span">) {
252256
data-slot="composer-banner-actions"
253257
className={cn(
254258
"col-start-3 row-start-1 flex flex-wrap items-center justify-end gap-1",
259+
"group-data-[composer-banner-layout=approval]/banner-row:gap-1.5 @max-[560px]:group-data-[composer-banner-layout=approval]/banner-row:col-start-2 @max-[560px]:group-data-[composer-banner-layout=approval]/banner-row:col-end-4 @max-[560px]:group-data-[composer-banner-layout=approval]/banner-row:row-start-2 @max-[560px]:group-data-[composer-banner-layout=approval]/banner-row:justify-start",
255260
"@max-[400px]:group-data-[composer-banner-layout=wrap-actions]/banner-row:has-[>:nth-child(2)]:col-start-2 @max-[400px]:group-data-[composer-banner-layout=wrap-actions]/banner-row:has-[>:nth-child(2)]:col-end-4 @max-[400px]:group-data-[composer-banner-layout=wrap-actions]/banner-row:has-[>:nth-child(2)]:row-start-2 @max-[400px]:group-data-[composer-banner-layout=wrap-actions]/banner-row:has-[>:nth-child(2)]:-ms-2 @max-[400px]:group-data-[composer-banner-layout=wrap-actions]/banner-row:has-[>:nth-child(2)]:justify-start",
256261
"@max-[320px]:group-data-[composer-banner-layout=wrap-actions-narrow]/banner-row:has-[>:nth-child(2)]:col-start-2 @max-[320px]:group-data-[composer-banner-layout=wrap-actions-narrow]/banner-row:has-[>:nth-child(2)]:col-end-4 @max-[320px]:group-data-[composer-banner-layout=wrap-actions-narrow]/banner-row:has-[>:nth-child(2)]:row-start-2 @max-[320px]:group-data-[composer-banner-layout=wrap-actions-narrow]/banner-row:has-[>:nth-child(2)]:-ms-2 @max-[320px]:group-data-[composer-banner-layout=wrap-actions-narrow]/banner-row:has-[>:nth-child(2)]:justify-start",
257262
className,

0 commit comments

Comments
 (0)