From ba8bb83dc1517867be304eece23c80a9b9307908 Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Wed, 11 Nov 2026 20:01:34 -0800 Subject: [PATCH] fix(diffs): keep note sessions compiler compatible --- config/react-compiler-bailout-baseline.txt | 2 +- .../diff-comment-session-registry.test.tsx | 4 ++-- .../use-local-diff-comment-session.ts | 24 ++++++++++--------- .../combined-diff/CombinedDiffViewer.tsx | 11 +++++---- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/config/react-compiler-bailout-baseline.txt b/config/react-compiler-bailout-baseline.txt index 56d135eb9cc..3120c8d9d2c 100644 --- a/config/react-compiler-bailout-baseline.txt +++ b/config/react-compiler-bailout-baseline.txt @@ -79,7 +79,7 @@ 3 src/renderer/src/components/crash-report/use-crash-report-copy.ts 1 src/renderer/src/components/dashboard/useAgentBucketCounts.ts 1 src/renderer/src/components/dashboard/useLiveDashboardSnapshot.ts -2 src/renderer/src/components/diff-comments/DiffCommentCard.tsx +1 src/renderer/src/components/diff-comments/DiffCommentCard.tsx 5 src/renderer/src/components/diff-comments/DiffCommentPopover.tsx 1 src/renderer/src/components/diff-comments/diff-comment-draft-zone.ts 1 src/renderer/src/components/diff-comments/useDiffCommentDecorator.tsx diff --git a/src/renderer/src/components/diff-comments/diff-comment-session-registry.test.tsx b/src/renderer/src/components/diff-comments/diff-comment-session-registry.test.tsx index 119e523cc92..19f2653b3c8 100644 --- a/src/renderer/src/components/diff-comments/diff-comment-session-registry.test.tsx +++ b/src/renderer/src/components/diff-comments/diff-comment-session-registry.test.tsx @@ -4,7 +4,7 @@ import { Profiler, StrictMode } from 'react' import { act, cleanup, fireEvent, render, within } from '@testing-library/react' import { afterEach, expect, it, vi } from 'vitest' import { DiffCommentCard } from './DiffCommentCard' -import { DiffCommentFileSession } from './diff-comment-session' +import { DiffCommentFileSession, type DiffCommentDraftSession } from './diff-comment-session' import { DiffCommentSessionScope, useDiffCommentFileSession, @@ -211,7 +211,7 @@ it.each([ const a = file.openDraft({ lineNumber: 5 }, async () => request.promise)! a.setBody('Draft A') const pending = file.submitDraft(a, () => request.promise, 'Draft A') - let b = null + let b: DiffCommentDraftSession | null = null if (outcome.includes('b')) { b = file.openDraft({ lineNumber: 9 }, async () => true)! b.setBody('Draft B') diff --git a/src/renderer/src/components/diff-comments/use-local-diff-comment-session.ts b/src/renderer/src/components/diff-comments/use-local-diff-comment-session.ts index aa2d25852cf..a91600d3446 100644 --- a/src/renderer/src/components/diff-comments/use-local-diff-comment-session.ts +++ b/src/renderer/src/components/diff-comments/use-local-diff-comment-session.ts @@ -1,25 +1,27 @@ -import { useLayoutEffect, useRef } from 'react' +import { useLayoutEffect, useRef, useState } from 'react' export function useLocalDiffCommentSession( create: () => T, external?: T ): T { - const owned = useRef(null) - if (!external && !owned.current) { - owned.current = create() + const [local, setLocal] = useState(() => (external ? null : create())) + let owned = local + if (!external && !owned) { + owned = create() + setLocal(owned) } - const revision = useRef(0) - const local = owned.current + const revision = useRef({ value: 0 }) useLayoutEffect(() => { - const retained = ++revision.current + const lifetime = revision.current + const retained = ++lifetime.value return () => { // Effect replay reacquires the owner before actual teardown. queueMicrotask(() => { - if (revision.current === retained) { - local?.dispose() + if (lifetime.value === retained) { + owned?.dispose() } }) } - }, [local]) - return external ?? local! + }, [owned]) + return external ?? owned! } diff --git a/src/renderer/src/components/editor/combined-diff/CombinedDiffViewer.tsx b/src/renderer/src/components/editor/combined-diff/CombinedDiffViewer.tsx index 9f5ba1f1281..974ab8cc2a9 100644 --- a/src/renderer/src/components/editor/combined-diff/CombinedDiffViewer.tsx +++ b/src/renderer/src/components/editor/combined-diff/CombinedDiffViewer.tsx @@ -2,7 +2,7 @@ import { DiffCommentSessionScope } from '../../diff-comments/diff-comment-sessio import { useDiffCommentView } from '../../diff-comments/use-diff-comment-owner' import { diffCommentOwnerKey } from '@/store/slices/diff-comments/diff-comment-owner' import { editorViewPlacement } from '@/store/slices/editor/tabs/editor-view-placement' -import React, { useCallback, useMemo, useRef, useState } from 'react' +import React, { useCallback, useMemo, useState } from 'react' import { useAppStore } from '@/store' import { useWorkspaceFileBrowserActionPredicate } from '@/lib/browser/documents/file-preview' import { useVisibleWorktreeDiffComments } from '../../diff-comments/use-visible-worktree-diff-comments' @@ -48,10 +48,11 @@ type CombinedDiffViewerProps = { export default function CombinedDiffViewer(props: CombinedDiffViewerProps): React.JSX.Element { const { owner, comments } = useDiffCommentView(props.file.worktreeId, props.file) - const previousScope = useRef('unresolved') - const scope = owner ? diffCommentOwnerKey(owner) : previousScope.current - if (owner) { - previousScope.current = scope + const resolvedScope = owner ? diffCommentOwnerKey(owner) : null + const [previousScope, setPreviousScope] = useState(resolvedScope ?? 'unresolved') + const scope = resolvedScope ?? previousScope + if (scope !== previousScope) { + setPreviousScope(scope) } const knownNoteIds = useMemo( () => (comments ? new Set(comments.map((note) => note.id)) : undefined),