Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 21 additions & 19 deletions apps/web/src/components/pullRequest/guide/useGuideDiffFiles.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { FileDiffMetadata } from "@pierre/diffs";
import type { EnvironmentId, PullRequestRef } from "@t3tools/contracts";
import { useEffect, useState } from "react";
import { useState } from "react";

import { getRenderablePatch, resolveFileDiffPath } from "~/lib/diffRendering";
import { pullRequestEnvironment } from "~/state/pullRequests";
Expand All @@ -13,6 +13,7 @@ interface LoadedDiff {
readonly cursor: string | null;
readonly done: boolean;
readonly files: ReadonlyMap<string, FileDiffMetadata>;
readonly folded: unknown;
}

const NO_FILES: ReadonlyMap<string, FileDiffMetadata> = new Map();
Expand All @@ -34,9 +35,10 @@ export function useGuideDiffFiles({
cursor: null,
done: false,
files: NO_FILES,
folded: null,
});
const current: LoadedDiff =
loaded.key === key ? loaded : { key, cursor: null, done: false, files: NO_FILES };
loaded.key === key ? loaded : { key, cursor: null, done: false, files: NO_FILES, folded: null };
const missing = wantedPaths.some((path) => !current.files.has(path));
const loading = missing && !current.done;
const query = useEnvironmentQuery(
Expand All @@ -48,25 +50,25 @@ export function useGuideDiffFiles({
: null,
);

// Each page is folded in once, during the render that first sees it.
const data = query.data;
const cursor = current.cursor;
useEffect(() => {
if (data === null) return;
setLoaded((previous) => {
const base =
previous.key === key ? previous : { key, cursor: null, done: false, files: NO_FILES };
if (base.cursor !== cursor || base.done) return base;
const parsed = getRenderablePatch(
data.patch,
`pull-request-guide:${key}:${cursor ?? "first"}`,
);
const files = new Map(base.files);
if (parsed?.kind === "files") {
for (const file of parsed.files) files.set(resolveFileDiffPath(file), file);
}
return { key, cursor: data.nextCursor, done: data.nextCursor === null, files };
if (data !== null && !current.done && current.folded !== data) {
const parsed = getRenderablePatch(
data.patch,
`pull-request-guide:${key}:${current.cursor ?? "first"}`,
);
const files = new Map(current.files);
if (parsed?.kind === "files") {
for (const file of parsed.files) files.set(resolveFileDiffPath(file), file);
}
setLoaded({
key,
cursor: data.nextCursor,
done: data.nextCursor === null,
files,
folded: data,
});
}, [cursor, data, key]);
}

return {
files: current.files,
Expand Down
Loading