Skip to content

Commit 72d4dc9

Browse files
t3dotggclaude
andauthored
fix(web): composer corners and context strip no longer show double edges (#25316)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 85f17ea commit 72d4dc9

3 files changed

Lines changed: 21 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function Shell({
2424
contextStrip && [
2525
"[--chat-composer-context-extension:2.25rem] sm:[--chat-composer-context-extension:2rem]",
2626
"supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:before:rounded-none",
27-
"before:[clip-path:shape(from_0_16px,curve_to_16px_0_with_0_7.16px/7.16px_0,line_to_calc(100%-16px)_0,curve_to_100%_16px_with_calc(100%-7.16px)_0/100%_7.16px,line_to_100%_calc(100%-var(--chat-composer-context-extension)-var(--chat-composer-drawer-inset)),curve_to_calc(100%-var(--chat-composer-drawer-inset))_calc(100%-var(--chat-composer-context-extension))_with_100%_calc(100%-var(--chat-composer-context-extension)-var(--chat-composer-drawer-inset)*0.4477)/calc(100%-var(--chat-composer-drawer-inset)*0.4477)_calc(100%-var(--chat-composer-context-extension)),line_to_calc(100%-var(--chat-composer-drawer-inset))_calc(100%-16px),curve_to_calc(100%-var(--chat-composer-drawer-inset)-16px)_100%_with_calc(100%-var(--chat-composer-drawer-inset))_calc(100%-7.16px)/calc(100%-var(--chat-composer-drawer-inset)-7.16px)_100%,line_to_calc(var(--chat-composer-drawer-inset)+16px)_100%,curve_to_var(--chat-composer-drawer-inset)_calc(100%-16px)_with_calc(var(--chat-composer-drawer-inset)+7.16px)_100%/var(--chat-composer-drawer-inset)_calc(100%-7.16px),line_to_var(--chat-composer-drawer-inset)_calc(100%-var(--chat-composer-context-extension)),curve_to_0_calc(100%-var(--chat-composer-context-extension)-var(--chat-composer-drawer-inset))_with_calc(var(--chat-composer-drawer-inset)*0.4477)_calc(100%-var(--chat-composer-context-extension))/0_calc(100%-var(--chat-composer-context-extension)-var(--chat-composer-drawer-inset)*0.4477),line_to_0_16px,close)]",
27+
"before:[clip-path:shape(from_0_16px,curve_to_16px_0_with_0_7.16px/7.16px_0,line_to_calc(100%-16px)_0,curve_to_100%_16px_with_calc(100%-7.16px)_0/100%_7.16px,line_to_100%_calc(100%-var(--chat-composer-context-extension)-16px),curve_to_calc(100%-16px)_calc(100%-var(--chat-composer-context-extension))_with_100%_calc(100%-var(--chat-composer-context-extension)-7.16px)/calc(100%-7.16px)_calc(100%-var(--chat-composer-context-extension)),line_to_calc(100%-var(--chat-composer-drawer-inset))_calc(100%-var(--chat-composer-context-extension)),line_to_calc(100%-var(--chat-composer-drawer-inset))_calc(100%-16px),curve_to_calc(100%-var(--chat-composer-drawer-inset)-16px)_100%_with_calc(100%-var(--chat-composer-drawer-inset))_calc(100%-7.16px)/calc(100%-var(--chat-composer-drawer-inset)-7.16px)_100%,line_to_calc(var(--chat-composer-drawer-inset)+16px)_100%,curve_to_var(--chat-composer-drawer-inset)_calc(100%-16px)_with_calc(var(--chat-composer-drawer-inset)+7.16px)_100%/var(--chat-composer-drawer-inset)_calc(100%-7.16px),line_to_var(--chat-composer-drawer-inset)_calc(100%-var(--chat-composer-context-extension)),line_to_16px_calc(100%-var(--chat-composer-context-extension)),curve_to_0_calc(100%-var(--chat-composer-context-extension)-16px)_with_7.16px_calc(100%-var(--chat-composer-context-extension))/0_calc(100%-var(--chat-composer-context-extension)-7.16px),line_to_0_16px,close)]",
2828
"not-supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:before:bottom-(--chat-composer-context-extension)",
2929
],
3030
className,
@@ -85,7 +85,7 @@ function ContextStrip({ className, ...props }: ComponentProps<"div">) {
8585
className={cn(
8686
"group/composer-context relative isolate mx-auto -mt-4 flex w-[calc(100%-2*var(--chat-composer-drawer-inset))] items-center gap-2 overflow-x-clip overflow-y-visible px-2 pt-5 pb-1",
8787
"before:absolute before:inset-0 before:-z-1 before:rounded-b-2xl before:border before:border-(--chat-composer-outline) before:mask-b-from-transparent before:mask-b-from-(position:--spacing-composer-seam) before:mask-b-to-black before:mask-b-to-(position:--spacing-composer-seam)",
88-
"before:bg-(--chat-composer-glass-surface) dark:before:bg-transparent dark:before:bg-composer-seam-below",
88+
"before:bg-(--chat-composer-glass-surface) dark:before:bg-transparent dark:before:bg-composer-seam-below dark:before:bg-origin-border",
8989
"group-has-data-[composer-banner-surface=attached]/composer-surface:before:bg-(--chat-composer-glass-surface)/(--glass-opacity) group-has-data-[composer-banner-surface=attached]/composer-surface:before:backdrop-blur-(--glass-blur) group-has-data-[composer-banner-surface=attached]/composer-surface:before:backdrop-saturate-(--glass-saturation)",
9090
"not-supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:before:bg-(--chat-composer-glass-surface)/(--glass-opacity) not-supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:before:backdrop-blur-(--glass-blur) not-supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:before:backdrop-saturate-(--glass-saturation)",
9191
className,

‎apps/web/src/lib/utils.test.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { describe, expect, it } from "vite-plus/test";
2+
3+
import { cn } from "./utils";
4+
5+
describe("cn", () => {
6+
it("keeps a background color next to a composer seam background image", () => {
7+
expect(cn("dark:before:bg-transparent dark:before:bg-composer-seam-below")).toBe(
8+
"dark:before:bg-transparent dark:before:bg-composer-seam-below",
9+
);
10+
});
11+
});

‎apps/web/src/lib/utils.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@ import * as Hex from "effect/encoding/Hex";
55
import { extendTailwindMerge } from "tailwind-merge";
66
import { DraftId } from "../composerDraftStore";
77

8-
// Register extra font sizes so tailwind-merge does not treat text-2xs as a color.
9-
const twMerge = extendTailwindMerge({ extend: { theme: { text: ["2xs", "3xs", "4xs", "5xs"] } } });
8+
// Register extra font sizes and background images so tailwind-merge does not
9+
// treat text-2xs or bg-composer-seam-below as colors.
10+
const twMerge = extendTailwindMerge({
11+
extend: {
12+
theme: { text: ["2xs", "3xs", "4xs", "5xs"] },
13+
classGroups: { "bg-image": [{ bg: ["composer-seam-below", "composer-seam-above"] }] },
14+
},
15+
});
1016

1117
export function cn(...inputs: CxOptions) {
1218
return twMerge(cx(inputs));

0 commit comments

Comments
 (0)