Skip to content

Commit c86c4f5

Browse files
authored
fix(desktop): refine focused thread dismissal targets (#2644)
1 parent 5ca36e7 commit c86c4f5

16 files changed

Lines changed: 164 additions & 53 deletions

‎desktop/src/app/AppShell.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ import { useDueReminderBadgeCount } from "@/features/reminders/hooks";
6868
import { RemindMeLaterProvider } from "@/features/reminders/ui/RemindMeLaterProvider";
6969
import { useReminderNotifications } from "@/features/reminders/useReminderNotifications";
7070
import { AppSidebar } from "@/features/sidebar/ui/AppSidebar";
71+
import { requestFocusedThreadClose } from "@/features/channels/focusedThreadCloseRequest";
7172
import { CommunityRail } from "@/features/sidebar/ui/CommunityRail";
7273
import { useChannelMutes } from "@/features/sidebar/lib/useChannelMutes";
7374
import { useChannelStars } from "@/features/sidebar/lib/useChannelStars";
@@ -844,6 +845,7 @@ export function AppShell() {
844845
addCommunityDialog.onOpenChange
845846
}
846847
onNewMessage={handleOpenNewDm}
848+
onBackgroundClick={requestFocusedThreadClose}
847849
onCreateChannelOpenChange={setIsCreateChannelOpen}
848850
onOpenAddCommunity={addCommunityDialog.openDialog}
849851
onSendFeedback={() => setIsSendFeedbackOpen(true)}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import assert from "node:assert/strict";
2+
import test from "node:test";
3+
4+
import {
5+
requestFocusedThreadClose,
6+
subscribeToFocusedThreadCloseRequest,
7+
} from "./focusedThreadCloseRequest.ts";
8+
9+
test("focus thread close requests reach active subscribers only", () => {
10+
let calls = 0;
11+
const unsubscribe = subscribeToFocusedThreadCloseRequest(() => {
12+
calls += 1;
13+
});
14+
15+
requestFocusedThreadClose();
16+
assert.equal(calls, 1);
17+
18+
unsubscribe();
19+
requestFocusedThreadClose();
20+
assert.equal(calls, 1);
21+
});
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
const listeners = new Set<() => void>();
2+
3+
/** Request dismissal of an open focus-mode thread drawer. */
4+
export function requestFocusedThreadClose(): void {
5+
for (const listener of listeners) {
6+
listener();
7+
}
8+
}
9+
10+
/** Subscribe the active channel surface to focus-mode dismissal requests. */
11+
export function subscribeToFocusedThreadCloseRequest(
12+
listener: () => void,
13+
): () => void {
14+
listeners.add(listener);
15+
return () => listeners.delete(listener);
16+
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -514,16 +514,16 @@ export const ChannelPane = React.memo(function ChannelPane({
514514
const isOverlay = useIsThreadPanelOverlay();
515515
const useSplitAuxiliaryPane = !isSinglePanelView && !isOverlay;
516516
const threadViewMode = useThreadViewMode();
517-
// Focus mode is a wide-viewport-only alternative to the split thread pane:
518-
// narrow viewports keep their existing single-panel / floating-overlay
519-
// behavior untouched. It applies to the thread panel only — channel
520-
// management, agent session and profile panels always use the split pane.
517+
// Focus mode only replaces the wide split thread pane; narrow threads and
518+
// other auxiliary panels keep their existing presentation.
521519
const useFocusThreadDrawer =
522520
threadViewMode === "focus" &&
523521
useSplitAuxiliaryPane &&
524522
(Boolean(threadHeadMessage) || shouldShowThreadSkeleton);
525-
const { channelIsCovered, markExitComplete } =
526-
useFocusDrawerPresence(useFocusThreadDrawer);
523+
const { channelIsCovered, markExitComplete } = useFocusDrawerPresence(
524+
useFocusThreadDrawer,
525+
onCloseThread,
526+
);
527527
const { changeThreadViewMode, layoutScrollTargetId, resolveScrollTarget } =
528528
useThreadViewModeSwitch({
529529
externalScrollTargetId: threadScrollTargetId,

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
THREAD_FOCUS_DRAWER_TRAVEL_PX,
66
THREAD_FOCUS_SLIVER_WIDTH_PX,
77
} from "@/features/channels/lib/threadFocusLayout";
8+
import { getThreadViewMode } from "@/features/channels/lib/threadViewModePreference";
89
import { cn } from "@/shared/lib/cn";
910

1011
type FocusThreadDrawerProps = {
@@ -167,7 +168,11 @@ export function FocusThreadDrawer({
167168
return () => {
168169
const previousFocus = previousFocusRef.current;
169170
requestAnimationFrame(() => {
170-
previousFocus?.focus({ preventScroll: true });
171+
// A real dismissal keeps focus mode selected; a presentation switch
172+
// has already selected split mode and owns focus inside the new panel.
173+
if (getThreadViewMode() === "focus") {
174+
previousFocus?.focus({ preventScroll: true });
175+
}
171176
});
172177
};
173178
}, []);
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import assert from "node:assert/strict";
2+
import test from "node:test";
3+
4+
import { shouldRestoreThreadToggleFocus } from "./ThreadViewModeToggle.tsx";
5+
6+
test("restores toggle focus for keyboard activation, not pointer clicks", () => {
7+
assert.equal(shouldRestoreThreadToggleFocus(0), true);
8+
assert.equal(shouldRestoreThreadToggleFocus(1), false);
9+
assert.equal(shouldRestoreThreadToggleFocus(2), false);
10+
});

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ import {
77
import { Button } from "@/shared/ui/button";
88
import { Tooltip, TooltipContent, TooltipTrigger } from "@/shared/ui/tooltip";
99

10+
/** Preserve focus only when activation did not come from a pointer click. */
11+
export function shouldRestoreThreadToggleFocus(clickDetail: number): boolean {
12+
return clickDetail === 0;
13+
}
14+
1015
/**
1116
* Both glyphs depict the layout the button switches *to*, never the current one.
1217
*
@@ -50,7 +55,7 @@ const THREAD_VIEW_MODE_TOGGLE = {
5055
export function ThreadViewModeToggle({
5156
onChange,
5257
}: {
53-
onChange: (mode: ThreadViewMode) => void;
58+
onChange: (mode: ThreadViewMode, restoreFocus: boolean) => void;
5459
}) {
5560
const viewMode = useThreadViewMode();
5661
const { icon: Icon, label, target } = THREAD_VIEW_MODE_TOGGLE[viewMode];
@@ -62,7 +67,9 @@ export function ThreadViewModeToggle({
6267
aria-label={label}
6368
className="shrink-0"
6469
data-testid="thread-view-mode-toggle"
65-
onClick={() => onChange(target)}
70+
onClick={(event) =>
71+
onChange(target, shouldRestoreThreadToggleFocus(event.detail))
72+
}
6673
size="icon"
6774
type="button"
6875
variant="ghost"

‎desktop/src/features/channels/ui/useFocusDrawerPresence.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
import * as React from "react";
22

3-
/** Keeps the covered channel inert until the focus drawer finishes exiting. */
4-
export function useFocusDrawerPresence(open: boolean) {
3+
import { subscribeToFocusedThreadCloseRequest } from "@/features/channels/focusedThreadCloseRequest";
4+
5+
/** Keeps the covered channel inert and owns external dismissal while open. */
6+
export function useFocusDrawerPresence(open: boolean, onClose: () => void) {
57
const [present, setPresent] = React.useState(false);
68

79
React.useEffect(() => {
810
if (open) setPresent(true);
911
}, [open]);
1012

13+
React.useEffect(() => {
14+
if (!open) return;
15+
return subscribeToFocusedThreadCloseRequest(onClose);
16+
}, [onClose, open]);
17+
1118
const markExitComplete = React.useCallback(() => setPresent(false), []);
1219
return {
1320
channelIsCovered: open || present,

‎desktop/src/features/channels/ui/useThreadViewModeSwitch.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export function useThreadViewModeSwitch({
4848
>(null);
4949

5050
const changeThreadViewMode = React.useCallback(
51-
(mode: ThreadViewMode) => {
51+
(mode: ThreadViewMode, restoreFocus: boolean) => {
5252
const body = document.querySelector<HTMLElement>(
5353
'[data-testid="message-thread-body"]',
5454
);
@@ -61,7 +61,9 @@ export function useThreadViewModeSwitch({
6161
requestAnimationFrame(() => {
6262
document
6363
.querySelector<HTMLElement>(
64-
'[data-testid="thread-view-mode-toggle"]',
64+
restoreFocus
65+
? '[data-testid="thread-view-mode-toggle"]'
66+
: '[data-testid="message-thread-body"]',
6567
)
6668
?.focus({ preventScroll: true });
6769
});

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,7 @@ export function MessageThreadPanel({
526526
data-buzz-conversation-scroll
527527
data-testid="message-thread-body"
528528
onScroll={onScroll}
529+
tabIndex={-1}
529530
ref={threadBodyRef}
530531
>
531532
<div

0 commit comments

Comments
 (0)