Skip to content

Commit 360d2e5

Browse files
authored
Fix channel header shared blur layering (#1336)
Signed-off-by: Thomas Petersen <[email protected]>
1 parent bc92578 commit 360d2e5

15 files changed

Lines changed: 212 additions & 15 deletions

‎desktop/playwright.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export default defineConfig({
2222
"**/smoke.spec.ts",
2323
"**/navigation.spec.ts",
2424
"**/channels.spec.ts",
25+
"**/channel-shared-header-backdrop.spec.ts",
2526
"**/badge.spec.ts",
2627
"**/channel-browser.spec.ts",
2728
"**/messaging.spec.ts",

‎desktop/src/features/channels/ui/AgentSessionThreadPanel.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ type AgentSessionThreadPanelProps = {
3939
onBackToProfile: () => void;
4040
onClose: () => void;
4141
widthPx: number;
42+
transparentChrome?: boolean;
4243
};
4344

4445
export function AgentSessionThreadPanel({
@@ -52,6 +53,7 @@ export function AgentSessionThreadPanel({
5253
onBackToProfile,
5354
onClose,
5455
widthPx,
56+
transparentChrome = false,
5557
}: AgentSessionThreadPanelProps) {
5658
const isLive = isManagedAgentActive(agent);
5759
const isOverlay = useIsThreadPanelOverlay();
@@ -176,7 +178,9 @@ export function AgentSessionThreadPanel({
176178
if (isSplitLayout) {
177179
return (
178180
<div className="flex min-h-0 flex-1 flex-col">
179-
<AuxiliaryPanelHeader>{agentHeaderContent}</AuxiliaryPanelHeader>
181+
<AuxiliaryPanelHeader transparent={transparentChrome}>
182+
{agentHeaderContent}
183+
</AuxiliaryPanelHeader>
180184
{agentBody}
181185
</div>
182186
);

‎desktop/src/features/channels/ui/ChannelManagementAuxiliaryPanel.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ type ChannelManagementAuxiliaryPanelProps = {
1717
) => void;
1818
threadPanelWidthPx: number;
1919
useSplitAuxiliaryPane: boolean;
20+
transparentChrome?: boolean;
2021
};
2122

2223
export function ChannelManagementAuxiliaryPanel({
@@ -30,6 +31,7 @@ export function ChannelManagementAuxiliaryPanel({
3031
onThreadPanelResizeStart,
3132
threadPanelWidthPx,
3233
useSplitAuxiliaryPane,
34+
transparentChrome = false,
3335
}: ChannelManagementAuxiliaryPanelProps) {
3436
const panel = (
3537
<ChannelManagementSheet
@@ -44,6 +46,7 @@ export function ChannelManagementAuxiliaryPanel({
4446
}
4547
}}
4648
open={true}
49+
transparentChrome={transparentChrome}
4750
/>
4851
);
4952

‎desktop/src/features/channels/ui/ChannelManagementSheet.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ type ChannelManagementSheetProps = {
8888
onDeleted?: () => void;
8989
onOpenChange: (open: boolean) => void;
9090
open: boolean;
91+
transparentChrome?: boolean;
9192
};
9293

9394
const DEFAULT_EPHEMERAL_TTL_SECONDS = 7 * 24 * 60 * 60;
@@ -100,6 +101,7 @@ export function ChannelManagementSheet({
100101
onDeleted,
101102
onOpenChange,
102103
open,
104+
transparentChrome = false,
103105
}: ChannelManagementSheetProps) {
104106
const { isDark } = useTheme();
105107
const isSplitLayout = layout === "split";
@@ -348,6 +350,7 @@ export function ChannelManagementSheet({
348350
isDeleteDialogOpen={isDeleteDialogOpen}
349351
isOwner={isOwner}
350352
isSplitLayout={isSplitLayout}
353+
transparentChrome={transparentChrome}
351354
joinChannelMutation={joinChannelMutation}
352355
leaveChannelMutation={leaveChannelMutation}
353356
memberCount={memberCount}
@@ -628,6 +631,7 @@ type ChannelManagementPanelContentProps = {
628631
isDeleteDialogOpen: boolean;
629632
isOwner: boolean;
630633
isSplitLayout: boolean;
634+
transparentChrome?: boolean;
631635
joinChannelMutation: ChannelMutation;
632636
leaveChannelMutation: ChannelMutation;
633637
memberCount: number;
@@ -659,6 +663,7 @@ function ChannelManagementPanelContent({
659663
isDeleteDialogOpen,
660664
isOwner,
661665
isSplitLayout,
666+
transparentChrome = false,
662667
joinChannelMutation,
663668
leaveChannelMutation,
664669
memberCount,
@@ -680,7 +685,7 @@ function ChannelManagementPanelContent({
680685
return (
681686
<>
682687
{isSplitLayout ? (
683-
<AuxiliaryPanelHeader>
688+
<AuxiliaryPanelHeader transparent={transparentChrome}>
684689
<AuxiliaryPanelHeaderGroup>
685690
{activeView === "canvas" ? (
686691
<Button

‎desktop/src/features/channels/ui/ChannelPane.tsx‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,13 @@ export const ChannelPane = React.memo(function ChannelPane({
613613
}),
614614
[agentSessionAgents, openAgentSessionPubkey, profilePanelPubkey, profiles],
615615
);
616+
const hasSplitAuxiliaryPane =
617+
useSplitAuxiliaryPane &&
618+
(channelManagementOpen ||
619+
Boolean(threadHeadMessage) ||
620+
shouldShowThreadSkeleton ||
621+
Boolean(activeChannel && selectedAgent) ||
622+
Boolean(profilePanelPubkey));
616623
const wrapAux = (panel: React.ReactNode, testId: string) =>
617624
useSplitAuxiliaryPane ? (
618625
<RightAuxiliaryPane
@@ -628,7 +635,18 @@ export const ChannelPane = React.memo(function ChannelPane({
628635
panel
629636
);
630637
return (
631-
<div className="flex min-h-0 min-w-0 flex-1 flex-row overflow-hidden">
638+
<div className="relative flex min-h-0 min-w-0 flex-1 flex-row overflow-hidden">
639+
{!isSinglePanelView ? (
640+
<div
641+
aria-hidden="true"
642+
className={cn(
643+
"pointer-events-none absolute inset-x-0 top-0 z-30 bg-background/80 backdrop-blur-md supports-backdrop-filter:bg-background/70 dark:bg-background/70 dark:backdrop-blur-xl dark:supports-backdrop-filter:bg-background/55",
644+
channelChrome.headerHeight,
645+
)}
646+
data-testid="channel-shared-header-backdrop"
647+
/>
648+
) : null}
649+
632650
{!isSinglePanelView ? (
633651
<section
634652
aria-label="Channel messages and composer"
@@ -829,6 +847,7 @@ export const ChannelPane = React.memo(function ChannelPane({
829847
onThreadPanelResizeStart={onThreadPanelResizeStart}
830848
threadPanelWidthPx={threadPanelWidthPx}
831849
useSplitAuxiliaryPane={useSplitAuxiliaryPane}
850+
transparentChrome={hasSplitAuxiliaryPane}
832851
/>
833852
) : threadHeadMessage ? (
834853
(() => {
@@ -849,6 +868,7 @@ export const ChannelPane = React.memo(function ChannelPane({
849868
useSplitAuxiliaryPane ? false : isSinglePanelView
850869
}
851870
layout={useSplitAuxiliaryPane ? "split" : "standalone"}
871+
transparentChrome={useSplitAuxiliaryPane}
852872
onCancelEdit={onCancelEdit}
853873
onCancelReply={onCancelThreadReply}
854874
onClose={onCloseThread}
@@ -900,6 +920,7 @@ export const ChannelPane = React.memo(function ChannelPane({
900920
useSplitAuxiliaryPane ? false : isSinglePanelView
901921
}
902922
layout={useSplitAuxiliaryPane ? "split" : "standalone"}
923+
transparentChrome={useSplitAuxiliaryPane}
903924
onClose={onCloseThread}
904925
widthPx={threadPanelWidthPx}
905926
/>
@@ -929,6 +950,7 @@ export const ChannelPane = React.memo(function ChannelPane({
929950
useSplitAuxiliaryPane ? false : isSinglePanelView
930951
}
931952
layout={useSplitAuxiliaryPane ? "split" : "standalone"}
953+
transparentChrome={useSplitAuxiliaryPane}
932954
profiles={profiles}
933955
onBackToProfile={() => onOpenProfilePanel(selectedAgent.pubkey)}
934956
onClose={onCloseAgentSession}
@@ -946,6 +968,7 @@ export const ChannelPane = React.memo(function ChannelPane({
946968
useSplitAuxiliaryPane ? false : isSinglePanelView
947969
}
948970
layout={useSplitAuxiliaryPane ? "split" : "standalone"}
971+
transparentChrome={useSplitAuxiliaryPane}
949972
onClose={onCloseProfilePanel}
950973
onOpenDm={onOpenDm}
951974
onOpenProfile={onOpenProfilePanel}

‎desktop/src/features/channels/ui/ChannelScreen.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,7 @@ export function ChannelScreen({
725725
}}
726726
onToggleMembers={() => setIsMembersSidebarOpen((prev) => !prev)}
727727
showHeaderContent={!isSinglePanelView}
728+
transparentChrome={activeChannel?.channelType !== "forum"}
728729
/>
729730
);
730731

‎desktop/src/features/channels/ui/ChannelScreenHeader.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ type ChannelScreenHeaderProps = {
2626
isAddBotOpen?: boolean;
2727
isJoining?: boolean;
2828
showHeaderContent?: boolean;
29+
transparentChrome?: boolean;
2930
onAddBotOpenChange?: (open: boolean) => void;
3031
onJoinChannel?: () => Promise<void>;
3132
onManageChannel: () => void;
@@ -46,6 +47,7 @@ export function ChannelScreenHeader({
4647
isJoining = false,
4748
onAddBotOpenChange,
4849
showHeaderContent = true,
50+
transparentChrome = false,
4951
onJoinChannel,
5052
onManageChannel,
5153
onToggleMembers,
@@ -120,6 +122,7 @@ export function ChannelScreenHeader({
120122
/>
121123
}
122124
title={activeChannelTitle}
125+
transparentChrome={transparentChrome}
123126
visibility={activeChannel?.visibility}
124127
/>
125128
);

‎desktop/src/features/channels/ui/RightAuxiliaryPane.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import type * as React from "react";
22

33
import { THREAD_PANEL_MIN_WIDTH_PX } from "@/shared/hooks/useThreadPanelWidth";
44
import { cn } from "@/shared/lib/cn";
5-
import { PANEL_ENTER_MOTION_CLASS } from "@/shared/ui/OverlayPanelBackdrop";
65

76
type RightAuxiliaryPaneProps = {
87
canResetWidth: boolean;
@@ -26,8 +25,7 @@ export function RightAuxiliaryPane({
2625
return (
2726
<aside
2827
className={cn(
29-
"group/right-pane relative flex h-full shrink-0 flex-col overflow-hidden bg-background before:pointer-events-none before:absolute before:bottom-0 before:left-0 before:top-0 before:z-40 before:w-px before:bg-border/80 before:content-['']",
30-
PANEL_ENTER_MOTION_CLASS,
28+
"group/right-pane relative flex h-full shrink-0 flex-col overflow-hidden bg-background before:pointer-events-none before:absolute before:bottom-0 before:left-0 before:top-0 before:z-50 before:w-px before:bg-border/80 before:content-['']",
3129
)}
3230
data-testid={testId}
3331
style={{
@@ -39,7 +37,7 @@ export function RightAuxiliaryPane({
3937
>
4038
<button
4139
aria-label="Resize panel"
42-
className="peer/right-pane-resize group/right-pane-resize absolute inset-y-0 left-0 z-40 w-3 -translate-x-1/2 cursor-col-resize"
40+
className="peer/right-pane-resize group/right-pane-resize absolute inset-y-0 left-0 z-50 w-3 -translate-x-1/2 cursor-col-resize"
4341
data-testid="right-auxiliary-pane-resize-handle"
4442
onDoubleClick={canResetWidth ? onResetWidth : undefined}
4543
onPointerDown={onResizeStart}

‎desktop/src/features/chat/ui/ChatHeader.tsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ type ChatHeaderProps = {
3232
mode?: "home" | "channel" | "agents" | "workflows" | "pulse" | "projects";
3333
overlaysContent?: boolean;
3434
statusBadge?: React.ReactNode;
35+
/** Render the chrome wrapper without an individual backdrop when a parent supplies shared blur. */
36+
transparentChrome?: boolean;
3537
};
3638

3739
const HEADER_ICON_CLASS = "h-4 w-4 text-muted-foreground";
@@ -93,6 +95,7 @@ export function ChatHeader({
9395
mode = "channel",
9496
overlaysContent = false,
9597
statusBadge,
98+
transparentChrome = false,
9699
}: ChatHeaderProps) {
97100
const trimmedDescription = description?.trim() ?? "";
98101

@@ -171,7 +174,10 @@ export function ChatHeader({
171174
<div
172175
ref={chromeWrapperRef}
173176
className={cn(
174-
"pointer-events-none relative z-30 overflow-hidden rounded-tl-xl bg-background/80 backdrop-blur-md supports-backdrop-filter:bg-background/70 dark:bg-background/70 dark:backdrop-blur-xl dark:supports-backdrop-filter:bg-background/55",
177+
"pointer-events-none relative z-40 overflow-visible rounded-tl-xl",
178+
transparentChrome
179+
? "bg-transparent"
180+
: "bg-background/80 backdrop-blur-md supports-backdrop-filter:bg-background/70 dark:bg-background/70 dark:backdrop-blur-xl dark:supports-backdrop-filter:bg-background/55",
175181
channelChrome.negativeMargin,
176182
)}
177183
>

‎desktop/src/features/messages/ui/MessageThreadPanel.tsx‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ type MessageThreadPanelProps = {
8888
threadHeadVideoReviewContext?: VideoReviewContext;
8989
toolbarExtraActions?: React.ReactNode;
9090
widthPx: number;
91+
transparentChrome?: boolean;
9192
isFollowingThread?: boolean;
9293
isMessageUnreadById?: (messageId: string) => boolean;
9394
onFollowThread?: () => void;
@@ -103,6 +104,7 @@ type MessageThreadPanelSkeletonProps = {
103104
layout?: "standalone" | "split";
104105
onClose: () => void;
105106
widthPx: number;
107+
transparentChrome?: boolean;
106108
};
107109

108110
function canManageMessage(
@@ -225,6 +227,7 @@ export function MessageThreadPanelSkeleton({
225227
layout = "standalone",
226228
onClose,
227229
widthPx,
230+
transparentChrome = false,
228231
}: MessageThreadPanelSkeletonProps) {
229232
const isOverlay = useIsThreadPanelOverlay();
230233
const isFloatingOverlay = isOverlay && !isSinglePanelView;
@@ -296,7 +299,9 @@ export function MessageThreadPanelSkeleton({
296299
if (isSplitLayout) {
297300
return (
298301
<div className="relative flex min-h-0 flex-1 flex-col">
299-
<AuxiliaryPanelHeader>{threadHeaderContent}</AuxiliaryPanelHeader>
302+
<AuxiliaryPanelHeader transparent={transparentChrome}>
303+
{threadHeaderContent}
304+
</AuxiliaryPanelHeader>
300305
{threadBody}
301306
<ThreadComposerSkeleton />
302307
</div>
@@ -379,6 +384,7 @@ export function MessageThreadPanel({
379384
threadTypingPubkeys,
380385
toolbarExtraActions,
381386
widthPx,
387+
transparentChrome = false,
382388
}: MessageThreadPanelProps) {
383389
const threadBodyRef = React.useRef<HTMLDivElement>(null);
384390
const threadContentRef = React.useRef<HTMLDivElement>(null);
@@ -943,7 +949,9 @@ export function MessageThreadPanel({
943949
if (isSplitLayout) {
944950
return (
945951
<div className="relative flex min-h-0 flex-1 flex-col">
946-
<AuxiliaryPanelHeader>{threadHeaderContent}</AuxiliaryPanelHeader>
952+
<AuxiliaryPanelHeader transparent={transparentChrome}>
953+
{threadHeaderContent}
954+
</AuxiliaryPanelHeader>
947955
{threadScrollRegion}
948956
{threadFooter}
949957
</div>

0 commit comments

Comments
 (0)