Skip to content

Commit 6a2a9fb

Browse files
fix(mobile): showcase redraws keep the ready marker while they re-settle
Restore main's behavior: a ReviewSheet redraw or theme change while ready restarts the 500ms settle timer without hiding the marker; only losing readiness clears it. Read the render signal and its report count as one snapshot, and keep sceneFromPathname private to the model. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 9777275 commit 6a2a9fb

3 files changed

Lines changed: 20 additions & 32 deletions

File tree

‎apps/mobile/src/features/showcase/ShowcaseCaptureCoordinator.tsx‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ import {
3434
import { retryShowcaseOperation } from "./showcaseRetry";
3535
import {
3636
clearShowcaseRenderSignal,
37-
getShowcaseRenderReports,
38-
getShowcaseRenderSignal,
37+
getShowcaseRenderSnapshot,
3938
subscribeToShowcaseRenderSignal,
4039
} from "./showcaseRenderSignal";
4140
import { stageShowcaseAgentActivity } from "./stageShowcaseAgentActivity";
@@ -80,24 +79,16 @@ function EnabledShowcaseCaptureCoordinator(props: { readonly pathname: string })
8079
const [requestedScene, setRequestedScene] = useState<ShowcaseScene | null>(null);
8180
const [requestedTheme, setRequestedTheme] = useState<MobileThemeId | null>(null);
8281
const [themeRequestSettled, setThemeRequestSettled] = useState(false);
83-
const [marked, setMarked] = useState<{
84-
readonly key: string;
85-
readonly scene: ShowcaseScene;
86-
} | null>(null);
82+
const [readyScene, setReadyScene] = useState<ShowcaseScene | null>(null);
8783
const [orientationSettled, setOrientationSettled] = useState(false);
8884
const [agentActivityStaged, setAgentActivityStaged] = useState(false);
8985
const requestedSceneRef = useRef<ShowcaseScene | null>(null);
9086
// Read current entities without restarting on shell updates and re-entering open permission prompts.
9187
const readFixtureEntities = useEffectEvent(() => ({ threads, projects }));
92-
const renderSignal = useSyncExternalStore(
88+
const { signal: renderSignal, reports: renderReports } = useSyncExternalStore(
9389
subscribeToShowcaseRenderSignal,
94-
getShowcaseRenderSignal,
95-
getShowcaseRenderSignal,
96-
);
97-
const renderReports = useSyncExternalStore(
98-
subscribeToShowcaseRenderSignal,
99-
getShowcaseRenderReports,
100-
getShowcaseRenderReports,
90+
getShowcaseRenderSnapshot,
91+
getShowcaseRenderSnapshot,
10192
);
10293

10394
useEffect(() => {
@@ -293,9 +284,8 @@ function EnabledShowcaseCaptureCoordinator(props: { readonly pathname: string })
293284
renderSignal,
294285
renderReports,
295286
});
296-
// A marker belongs to the readiness it was settled for; any change hides it until it settles again.
297-
if (marked !== null && marked.key !== readinessKey) setMarked(null);
298-
const readyScene = marked?.scene ?? null;
287+
// Losing readiness hides the marker. A redraw or theme change while ready keeps it and re-settles.
288+
if (readinessKey === null && readyScene !== null) setReadyScene(null);
299289

300290
useEffect(() => {
301291
if (readinessKey === null || scene === null) return;
@@ -307,7 +297,7 @@ function EnabledShowcaseCaptureCoordinator(props: { readonly pathname: string })
307297
renderFrame = requestAnimationFrame(() => {
308298
readyFrame = requestAnimationFrame(() => {
309299
markNativeShowcaseReady(scene);
310-
setMarked({ key: readinessKey, scene });
300+
setReadyScene(scene);
311301
});
312302
});
313303
}, 500);

‎apps/mobile/src/features/showcase/showcaseCaptureModel.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { isShowcaseNativeContentReady, type ShowcaseRenderSignal } from "./showc
44

55
export const SHOWCASE_THREAD_ID = "remote-command-center";
66

7-
export function sceneFromPathname(pathname: string): ShowcaseScene | null {
7+
function sceneFromPathname(pathname: string): ShowcaseScene | null {
88
const routePath = pathname.split(/[?#]/u, 1)[0] ?? pathname;
99
if (routePath === "/settings" || routePath.endsWith("/settings/environments")) {
1010
return "environments";

‎apps/mobile/src/features/showcase/showcaseRenderSignal.ts‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ export type ShowcaseRenderSignal = Readonly<{
77
}>;
88

99
const listeners = new Set<() => void>();
10-
let renderSignal: ShowcaseRenderSignal | null = null;
11-
// A redraw can repeat the same scene and theme; counting reports lets it restart the settle delay.
12-
let renderReports = 0;
10+
export type ShowcaseRenderSnapshot = Readonly<{
11+
signal: ShowcaseRenderSignal | null;
12+
// A redraw can repeat the same scene and theme; counting reports lets it restart the settle delay.
13+
reports: number;
14+
}>;
1315

14-
export function getShowcaseRenderSignal(): ShowcaseRenderSignal | null {
15-
return renderSignal;
16-
}
16+
let snapshot: ShowcaseRenderSnapshot = { signal: null, reports: 0 };
1717

18-
export function getShowcaseRenderReports(): number {
19-
return renderReports;
18+
export function getShowcaseRenderSnapshot(): ShowcaseRenderSnapshot {
19+
return snapshot;
2020
}
2121

2222
export function subscribeToShowcaseRenderSignal(listener: () => void): () => void {
@@ -25,15 +25,13 @@ export function subscribeToShowcaseRenderSignal(listener: () => void): () => voi
2525
}
2626

2727
export function reportShowcaseSceneRendered(signal: ShowcaseRenderSignal): void {
28-
renderSignal = signal;
29-
renderReports += 1;
28+
snapshot = { signal, reports: snapshot.reports + 1 };
3029
for (const listener of listeners) listener();
3130
}
3231

3332
export function clearShowcaseRenderSignal(): void {
34-
if (renderSignal === null) return;
35-
renderSignal = null;
36-
renderReports += 1;
33+
if (snapshot.signal === null) return;
34+
snapshot = { signal: null, reports: snapshot.reports + 1 };
3735
for (const listener of listeners) listener();
3836
}
3937

0 commit comments

Comments
 (0)