External/open-design
1
0
Fork 0
mirror of https://github.com/nexu-io/open-design.git synced 2026-10-27 09:51:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(web): restore previous source on failed srcDoc Reload

Browse Source 
Address PR #4652 review (Codex + PerishCode, both inline at FileViewer.tsx:7287):
when reloadHtmlPreview's setSource(null) cleared source but fetchProjectFileText
returned null (non-2xx, network error), the existing keep-last-good fetch-effect
guard left source as null and the iframe blank.

Capture the prior source into a ref before clearing; restore it from the null
branch of the fetch effect.

Refs #4650 #4652
This commit is contained in:
Christopher Beaulieu
2026-06-22 21:10:49 -04:00
parent 0c457606fc
commit 65fe10d1ae
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/src/components/FileViewer.tsx
+25 -1
View File
@@ -4894,6 +4894,11 @@ function HtmlViewer({
const manualEditStyleTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
const manualEditPreviewVersionRef = useRef(0);
const sourceRef = useRef<string | null>(source);
// Holds the last-good source snapshot taken just before reloadHtmlPreview
// clears source to null on the srcDoc path. The fetch effect restores this
// value if fetchProjectFileText returns null (non-2xx / transient network
// error), so the iframe never goes blank on a failed reload attempt.
const prevSourceBeforeReloadRef = useRef<string | null>(null);
const sourceFileKeyRef = useRef<string | null>(null);
const templateNameId = useId();
const templateDescriptionId = useId();
@@ -5217,7 +5222,20 @@ function HtmlViewer({
// Chokidar emits agent rewrites as unlink+add+change bursts; a
// transient null mid-burst would blank source → srcDoc empty →
// shell stays on prior frame. Keep the last good text instead.
if (text == null) return;
if (text == null) {
// A srcDoc Reload may have cleared source to null just before this
// fetch resolved. If the fetch failed (non-2xx, network error),
// restore the pre-reload source so the iframe doesn't go blank.
// prevSourceBeforeReloadRef is null on a normal file-change fetch,
// so this branch is a no-op outside of the Reload failure case.
if (prevSourceBeforeReloadRef.current != null) {
setSource(prevSourceBeforeReloadRef.current);
sourceRef.current = prevSourceBeforeReloadRef.current;
prevSourceBeforeReloadRef.current = null;
}
return;
}
prevSourceBeforeReloadRef.current = null;
sourceEverLoadedRef.current = true;
setSource(text);
sourceRef.current = text;
@@ -7280,6 +7298,12 @@ function HtmlViewer({
setInlinedSource(null);
setReloadKey((key) => key + 1);
if (!useUrlLoadPreview) {
// Capture the current source so the fetch effect can restore it if
// fetchProjectFileText returns null (non-2xx / transient network error).
// Without this, a failed reload leaves source null and the iframe blank
// because the existing keep-last-good guard in the fetch effect has
// nothing to fall back to (PR #4652).
prevSourceBeforeReloadRef.current = source;
// Clear source synchronously so previewSource becomes null and the
// srcDoc memo recomputes to '' before the async re-fetch resolves.
// Without this, the remounted iframe carries stale srcdoc content