Skip to content
Merged
Show file tree
Hide file tree
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
62 changes: 48 additions & 14 deletions apps/demo/src/pages/DemoPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ type PerfMetrics = {

export default function DemoPage() {
const [state, setState] = useState<DemoState>(INITIAL_STATE);
const [isPreparing, setIsPreparing] = useState(false);
const [metrics, setMetrics] = useState<PerfMetrics>({
prepareTime: null,
commitTime: null,
Expand All @@ -32,19 +33,38 @@ export default function DemoPage() {

const dataset = useMemo(() => getDatasetByKey(state.dataset), [state.dataset]);

const diffData = useMemo(() => {
const prepareStart = performance.now();
const data = generateDiffText(dataset.lines);
const prepareEnd = performance.now();

prepareEndRef.current = prepareEnd;
const [diffData, setDiffData] = useState(() => {
const initialDataset = getDatasetByKey(INITIAL_STATE.dataset);
return generateDiffText(initialDataset.lines);
});

setMetrics((previous) => ({
...previous,
prepareTime: prepareEnd - prepareStart,
}));
useEffect(() => {
let cancelled = false;
const prepareStart = performance.now();

return data;
setIsPreparing(true);

const timer = window.setTimeout(() => {
const data = generateDiffText(dataset.lines);
const prepareEnd = performance.now();

if (cancelled) {
return;
}

prepareEndRef.current = prepareEnd;
setDiffData(data);
setMetrics((previous) => ({
...previous,
prepareTime: prepareEnd - prepareStart,
}));
setIsPreparing(false);
}, 0);

return () => {
cancelled = true;
window.clearTimeout(timer);
};
}, [dataset.lines]);

const updateStateWithPerfStart = (nextState: DemoState) => {
Expand All @@ -59,6 +79,10 @@ export default function DemoPage() {
};

useLayoutEffect(() => {
if (isPreparing) {
return;
}

const interactionStart = interactionStartRef.current;

if (interactionStart === null) {
Expand All @@ -73,7 +97,7 @@ export default function DemoPage() {
commitTime: prepareEnd === null ? null : commitMoment - prepareEnd,
totalTime: commitMoment - interactionStart,
}));
}, [diffData, state.contextLines, state.height]);
}, [diffData, state.contextLines, state.height, isPreparing]);

useEffect(() => {
if (interactionStartRef.current === null) {
Expand Down Expand Up @@ -117,13 +141,23 @@ export default function DemoPage() {
</div>
</div>

<div className="demo-viewer-card__body">
<div className="demo-viewer-card__body demo-viewer-card__body--relative">
<DiffViewer
original={diffData.oldText}
modified={diffData.newText}
height={state.height}
contextLines={state.contextLines}
/>
{isPreparing ? (
<div className="viewer-loading viewer-loading--overlay" aria-live="polite">
<span className="viewer-loading__spinner" aria-hidden />
<p className="viewer-loading__title">Preparing diff data…</p>
<p className="viewer-loading__text">
Large datasets like 100k lines can take a while. The viewer will update
automatically when preparation is complete.
</p>
</div>
) : null}
</div>
</section>
</div>
Expand All @@ -139,4 +173,4 @@ export default function DemoPage() {
</main>
</div>
);
}
}
11 changes: 10 additions & 1 deletion apps/demo/src/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,15 @@ select {
padding: 24px;
}

.viewer-loading--overlay {
position: absolute;
inset: 0;
min-height: 0;
margin: 0;
background: rgba(2, 6, 23, 0.8);
backdrop-filter: blur(2px);
}

.viewer-loading__spinner {
width: 36px;
height: 36px;
Expand All @@ -390,4 +399,4 @@ select {
to {
transform: rotate(360deg);
}
}
}
Loading