diff --git a/web/src/lib/components/repo/DiffCodeView.svelte b/web/src/lib/components/repo/DiffCodeView.svelte index bb5526789..1d65c3a88 100644 --- a/web/src/lib/components/repo/DiffCodeView.svelte +++ b/web/src/lib/components/repo/DiffCodeView.svelte @@ -66,6 +66,8 @@ diffStyle?: DiffStyle; wrap?: boolean; isOpen?: (key: string) => boolean; + /** whether this file's contents may be fetched in the background */ + loadContents?: (key: string) => boolean; onSetOpen?: (key: string, open: boolean) => void; onWant?: (key: string) => void; onFocus?: (key: string) => void; @@ -86,6 +88,7 @@ diffStyle = "unified", wrap = false, isOpen, + loadContents, onSetOpen, onWant, onFocus, @@ -358,7 +361,7 @@ Math.max(0, first - LOOKAHEAD_ITEMS), last + LOOKAHEAD_ITEMS )) { - if (!entry(file.key) && (isOpen?.(file.key) ?? true)) onWant(file.key); + if (!entry(file.key) && (loadContents?.(file.key) ?? true)) onWant(file.key); } }; diff --git a/web/src/lib/components/repo/DiffFiles.svelte b/web/src/lib/components/repo/DiffFiles.svelte index aec9a4be8..c28ea2def 100644 --- a/web/src/lib/components/repo/DiffFiles.svelte +++ b/web/src/lib/components/repo/DiffFiles.svelte @@ -30,12 +30,12 @@ wrap?: boolean; isOpen?: (key: string) => boolean; onSetOpen?: (key: string, open: boolean) => void; + /** whether this file's contents may be fetched in the background */ + loadContents?: (key: string) => boolean; /** the whole diff in one request, when the route knows where to get it */ patchUrl?: string; /** a patch already streaming in parallel with this diff's file list */ patch?: PatchStream; - /** holds the patch back until the page has gone idle */ - deferPatch?: boolean; dockTop?: () => number; onScrollExtent?: (max: number) => void; linkLines?: boolean; @@ -52,9 +52,9 @@ wrap = false, isOpen = () => true, onSetOpen, + loadContents, patchUrl, patch, - deferPatch = false, dockTop, onScrollExtent, linkLines = false, @@ -77,23 +77,7 @@ // the page one card at a time. flipped the moment the patch settles - what it // did not carry (an interdiff's rebased side, a root commit, a mirror that // refused) is fetched per file, which is what this queue is for - let released = $state(untrack(() => !deferPatch)); - let patchExpected = $state(untrack(() => released && Boolean(patch ?? patchUrl))); - - $effect(() => { - if (released) return; - if (!deferPatch) { - released = true; - return; - } - const release = () => (released = true); - if ("requestIdleCallback" in window) { - const handle = requestIdleCallback(release, { timeout: 2000 }); - return () => cancelIdleCallback(handle); - } - const handle = setTimeout(release, 500); - return () => clearTimeout(handle); - }); + let patchExpected = $state(untrack(() => Boolean(patch ?? patchUrl))); const queue = createDiffQueue({ deps: () => deps, @@ -131,7 +115,6 @@ }; $effect(() => { - if (!released) return; const stream = patch; const url = patchUrl; const controller = new AbortController(); @@ -247,6 +230,7 @@ {diffStyle} {wrap} {isOpen} + {loadContents} onSetOpen={(key, open) => { if (open) queue.prioritize(key); onSetOpen?.(key, open); diff --git a/web/src/lib/components/repo/DiffView.svelte b/web/src/lib/components/repo/DiffView.svelte index 182abd1b1..91937e712 100644 --- a/web/src/lib/components/repo/DiffView.svelte +++ b/web/src/lib/components/repo/DiffView.svelte @@ -405,14 +405,14 @@ {blobUrl} {diffStyle} {wrap} - {patch} - deferPatch={!allOpen} + patch={allOpen ? patch : undefined} {dockTop} onScrollExtent={(max) => (diffScroll = max)} bind:this={files} {isOpen} + loadContents={(key) => !foldedFiles.has(key)} onSetOpen={(key, open) => (openStates[key] = open)} - patchUrl={patchUrl ?? downloadUrls?.diff} + patchUrl={allOpen ? (patchUrl ?? downloadUrls?.diff) : undefined} {linkLines} {onQuoteLines} matches={finder.matches}