Skip to content

Commit 9c7bc87

Browse files
perf(web): sidebar retained git status lives in state
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 2e9550d commit 9c7bc87

2 files changed

Lines changed: 16 additions & 17 deletions

File tree

‎apps/web/reactCompiledFiles.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,5 @@ export const REACT_COMPILED_FILES = [
3737
"apps/web/src/panelAnimations.ts",
3838
"apps/web/src/hooks/useCopyToClipboard.ts",
3939
"apps/web/src/components/auth/PairingRouteSurface.tsx",
40+
"apps/web/src/components/Sidebar.logic.ts",
4041
] as const;

‎apps/web/src/components/Sidebar.logic.ts‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,12 @@ export function useSidebarRowSubscriptionLease(isActive: boolean): {
7171
} {
7272
const [row, setRow] = React.useState<HTMLElement | null>(null);
7373
const [isNearViewport, setIsNearViewport] = React.useState(isActive);
74+
// The active row stays leased after it deactivates until the observer reports.
75+
if (isActive && !isNearViewport) setIsNearViewport(true);
76+
const canObserve = typeof IntersectionObserver !== "undefined";
7477

7578
React.useEffect(() => {
76-
if (isActive) {
77-
setIsNearViewport(true);
78-
return;
79-
}
80-
if (row === null) return;
81-
if (typeof IntersectionObserver === "undefined") {
82-
setIsNearViewport(true);
83-
return;
84-
}
79+
if (isActive || row === null || !canObserve) return;
8580

8681
const scrollRoot = row.closest<HTMLElement>('[data-slot="scroll-area-viewport"]');
8782
const observer = new IntersectionObserver(
@@ -93,21 +88,24 @@ export function useSidebarRowSubscriptionLease(isActive: boolean): {
9388
);
9489
observer.observe(row);
9590
return () => observer.disconnect();
96-
}, [isActive, row]);
91+
}, [canObserve, isActive, row]);
9792

9893
return {
99-
leaseLiveStatus: isActive || isNearViewport,
94+
leaseLiveStatus: isActive || isNearViewport || !canObserve,
10095
rowRef: setRow,
10196
};
10297
}
10398

10499
export function useRetainedValue<T>(key: string | null, value: T | null): T | null {
105-
const retained = React.useRef<{ readonly key: string; readonly value: T } | null>(null);
106-
if (key !== null && value !== null) {
107-
retained.current = { key, value };
100+
const [retained, setRetained] = React.useState<{
101+
readonly key: string;
102+
readonly value: T;
103+
} | null>(null);
104+
if (key !== null && value !== null && (retained?.key !== key || retained.value !== value)) {
105+
setRetained({ key, value });
108106
}
109107
if (value !== null) return value;
110-
return key !== null && retained.current?.key === key ? retained.current.value : null;
108+
return key !== null && retained?.key === key ? retained.value : null;
111109
}
112110

113111
// Sidebar.motion handles ordinary section changes. Sortable transforms own
@@ -688,9 +686,9 @@ export function useThreadJumpHintVisibility(): {
688686
};
689687
}, []);
690688

691-
const updateThreadJumpHintsVisibility = React.useCallback((shouldShow: boolean) => {
689+
const updateThreadJumpHintsVisibility = (shouldShow: boolean) => {
692690
controllerRef.current?.sync(shouldShow);
693-
}, []);
691+
};
694692

695693
return {
696694
showThreadJumpHints,

0 commit comments

Comments
 (0)