@pierre/diffs 1.3.6 → 1.4.0

package/dist/react/utils/useFileInstance.js

@@ -1,4 +1,6 @@
 import { areOptionsEqual } from "../../utils/areOptionsEqual.js";
+import { areFileTargetsEqual } from "../../utils/areFileTargetsEqual.js";
+import { getLineAnnotationName } from "../../utils/getLineAnnotationName.js";
 import { File } from "../../components/File.js";
 import { VirtualizedFile } from "../../components/VirtualizedFile.js";
 import { useStableCallback } from "./useStableCallback.js";
@@ -9,12 +11,35 @@ import { useVirtualizer } from "../Virtualizer.js";
 import { useCallback, useContext, useEffect, useLayoutEffect, useRef } from "react";
 //#region src/react/utils/useFileInstance.ts
 const useIsomorphicLayoutEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
-function useFileInstance({ file, options, editorOptions, lineAnnotations, selectedLines, prerenderedHTML, metrics, hasGutterRenderUtility, hasCustomHeader, disableWorkerPool, edit }) {
+function useFileInstance({ file, options, editorOptions, editStateKey, lineAnnotations, selectedLines, prerenderedHTML, metrics, hasGutterRenderUtility, hasCustomHeader, disableWorkerPool, edit, onEditChange: _onEditChange, onEditComplete: _onEditComplete }) {
 	const simpleVirtualizer = useVirtualizer();
 	const controlledSelection = selectedLines !== void 0;
 	const poolManager = useContext(WorkerPoolContext);
 	const createEditor = useCreateEditor();
+	const handleOnEditChange = useStableCallback((event) => _onEditChange?.(event));
+	const onEditChange = _onEditChange != null ? handleOnEditChange : void 0;
+	const acceptedCache = useRef(null);
+	const handleOnEditComplete = useStableCallback((event) => {
+		const decision = _onEditComplete?.(event) ?? "reject";
+		if (decision === "accept") acceptedCache.current = {
+			file: {
+				installed: event.file,
+				stale: event.originalFile
+			},
+			annotations: {
+				installed: event.lineAnnotations,
+				stale: event.originalLineAnnotations
+			}
+		};
+		return decision;
+	});
+	const onEditComplete = _onEditComplete != null ? handleOnEditComplete : void 0;
 	const instanceRef = useRef(null);
+	const disposeEditorRef = useRef(null);
+	const getEditor = useStableCallback(() => {
+		if (createEditor == null) throw new Error("File: EditContext is not attached");
+		return createEditor("file", editorOptions ?? {}, editStateKey);
+	});
 	const ref = useStableCallback((node) => {
 		if (node != null) {
 			if (instanceRef.current != null) throw new Error("File: An instance should not already exist when a node is created");
@@ -22,14 +47,19 @@ function useFileInstance({ file, options, editorOptions, lineAnnotations, select
 				controlledSelection,
 				hasCustomHeader,
 				hasGutterRenderUtility,
+				onEditChange,
+				onEditComplete,
 				options
 			}), simpleVirtualizer, metrics, !disableWorkerPool ? poolManager : void 0, true);
 			else instanceRef.current = new File(mergeFileOptions({
 				controlledSelection,
 				hasCustomHeader,
 				hasGutterRenderUtility,
+				onEditChange,
+				onEditComplete,
 				options
 			}), !disableWorkerPool ? poolManager : void 0, true);
+			if (edit && disposeEditorRef.current == null) disposeEditorRef.current = applyEdit(instanceRef.current, getEditor);
 			instanceRef.current.hydrate({
 				file,
 				fileContainer: node,
@@ -40,54 +70,83 @@ function useFileInstance({ file, options, editorOptions, lineAnnotations, select
 			if (instanceRef.current == null) throw new Error("File: A File instance should exist when unmounting");
 			instanceRef.current.cleanUp();
 			instanceRef.current = null;
+			disposeEditorRef.current = null;
 		}
 	});
 	useIsomorphicLayoutEffect(() => {
-		if (instanceRef.current == null) return;
+		const { current: instance } = instanceRef;
+		if (instance == null) return;
 		const newOptions = mergeFileOptions({
 			controlledSelection,
 			hasCustomHeader,
 			hasGutterRenderUtility,
+			onEditChange,
+			onEditComplete,
 			options
 		});
-		const forceRender = newOptions !== void 0 && !areOptionsEqual(instanceRef.current.options, newOptions);
-		instanceRef.current.setOptions(newOptions);
-		instanceRef.current.render({
-			file,
-			lineAnnotations,
+		const forceRender = newOptions !== void 0 && !areOptionsEqual(instance.options, newOptions);
+		instance.setOptions(newOptions);
+		if (!edit && disposeEditorRef.current != null) {
+			const { current: disposeEditor } = disposeEditorRef;
+			disposeEditorRef.current = null;
+			disposeEditor();
+		}
+		const resolved = resolveAcceptedValues(file, lineAnnotations, acceptedCache);
+		instance.render({
+			file: resolved.file,
+			lineAnnotations: resolved.lineAnnotations,
 			forceRender
 		});
-		if (selectedLines !== void 0) instanceRef.current.setSelectedLines(selectedLines);
+		if (selectedLines !== void 0) instance.setSelectedLines(selectedLines);
+		if (edit && disposeEditorRef.current == null) disposeEditorRef.current = applyEdit(instance, getEditor);
 	});
-	useIsomorphicLayoutEffect(() => {
-		if (edit && instanceRef.current != null) {
-			if (createEditor === void 0) throw new Error("File: EditContext is not attached");
-			const editor = createEditor(editorOptions ?? {});
-			if (editor == null) throw new Error("File: EditProvider.createEditor must return an editor instance");
-			try {
-				return editor.edit(instanceRef.current);
-			} catch (error) {
-				editor.cleanUp();
-				throw error;
-			}
-		}
-	}, [edit]);
 	return {
 		ref,
 		getHoveredLine: useCallback(() => {
 			return instanceRef.current?.getHoveredLine();
-		}, [])
+		}, []),
+		getAnnotationSlotName: useCallback((annotation) => instanceRef.current?.getAnnotationSlotName(annotation) ?? getLineAnnotationName(annotation), [])
+	};
+}
+function resolveAcceptedValues(file, lineAnnotations, acceptedCache) {
+	const { current: accepted } = acceptedCache;
+	if (accepted == null) return {
+		file,
+		lineAnnotations
+	};
+	const { file: acceptedFiles, annotations: acceptedAnnotations } = accepted;
+	let resolvedFile = file;
+	if (acceptedFiles != null) if (areFileTargetsEqual(file, acceptedFiles.stale)) resolvedFile = acceptedFiles.installed;
+	else accepted.file = null;
+	let resolvedAnnotations = lineAnnotations;
+	if (acceptedAnnotations != null) if (lineAnnotations === acceptedAnnotations.stale) resolvedAnnotations = acceptedAnnotations.installed;
+	else accepted.annotations = null;
+	if (accepted.file == null && accepted.annotations == null) acceptedCache.current = null;
+	return {
+		file: resolvedFile,
+		lineAnnotations: resolvedAnnotations
 	};
 }
-function mergeFileOptions({ options, controlledSelection, hasCustomHeader, hasGutterRenderUtility }) {
-	if (!(controlledSelection || hasGutterRenderUtility || hasCustomHeader)) return options;
+function mergeFileOptions({ options, controlledSelection, hasCustomHeader, hasGutterRenderUtility, onEditChange, onEditComplete }) {
+	if (!(controlledSelection || hasGutterRenderUtility || hasCustomHeader || onEditChange != null || onEditComplete != null)) return options;
 	return {
 		...options,
 		controlledSelection,
 		renderCustomHeader: hasCustomHeader ? noopRender : options?.renderCustomHeader,
-		renderGutterUtility: hasGutterRenderUtility ? noopRender : options?.renderGutterUtility
+		renderGutterUtility: hasGutterRenderUtility ? noopRender : options?.renderGutterUtility,
+		onEditChange,
+		onEditComplete
 	};
 }
+function applyEdit(instance, getEditor) {
+	const editor = getEditor();
+	try {
+		return editor.edit(instance);
+	} catch (error) {
+		editor.cleanUp();
+		throw error;
+	}
+}
 //#endregion
 export { useFileInstance };
 

package/dist/react/utils/useFileInstance.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFileInstance.js","names":[],"sources":["../../../src/react/utils/useFileInstance.ts"],"sourcesContent":["import {\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n} from 'react';\n\nimport { File, type FileOptions } from '../../components/File';\nimport { VirtualizedFile } from '../../components/VirtualizedFile';\nimport type { EditorOptions } from '../../edit';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type {\n  FileContents,\n  LineAnnotation,\n  SelectedLineRange,\n  VirtualFileMetrics,\n} from '../../types';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport { noopRender } from '../constants';\nimport { useCreateEditor } from '../EditContext';\nimport { useVirtualizer } from '../Virtualizer';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsomorphicLayoutEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface UseFileInstanceProps<LAnnotation> {\n  file: FileContents;\n  options: FileOptions<LAnnotation> | undefined;\n  editorOptions: EditorOptions<LAnnotation> | undefined;\n  lineAnnotations: LineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  metrics?: VirtualFileMetrics;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  disableWorkerPool: boolean;\n  edit: boolean;\n  onChange?: (\n    file: FileContents,\n    lineAnnotations?: LineAnnotation<LAnnotation>[]\n  ) => void;\n}\n\ninterface UseFileInstanceReturn {\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'file'> | undefined;\n}\n\nexport function useFileInstance<LAnnotation>({\n  file,\n  options,\n  editorOptions,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  metrics,\n  hasGutterRenderUtility,\n  hasCustomHeader,\n  disableWorkerPool,\n  edit,\n}: UseFileInstanceProps<LAnnotation>): UseFileInstanceReturn {\n  const simpleVirtualizer = useVirtualizer();\n  const controlledSelection = selectedLines !== undefined;\n  const poolManager = useContext(WorkerPoolContext);\n  const createEditor = useCreateEditor<LAnnotation>();\n  const instanceRef = useRef<\n    File<LAnnotation> | VirtualizedFile<LAnnotation> | null\n  >(null);\n  const ref = useStableCallback((node: HTMLElement | null) => {\n    if (node != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'File: An instance should not already exist when a node is created'\n        );\n      }\n      if (simpleVirtualizer != null) {\n        instanceRef.current = new VirtualizedFile(\n          mergeFileOptions({\n            controlledSelection,\n            hasCustomHeader,\n            hasGutterRenderUtility,\n            options,\n          }),\n          simpleVirtualizer,\n          metrics,\n          !disableWorkerPool ? poolManager : undefined,\n          true\n        );\n      } else {\n        instanceRef.current = new File(\n          mergeFileOptions({\n            controlledSelection,\n            hasCustomHeader,\n            hasGutterRenderUtility,\n            options,\n          }),\n          !disableWorkerPool ? poolManager : undefined,\n          true\n        );\n      }\n      void instanceRef.current.hydrate({\n        file,\n        fileContainer: node,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error('File: A File instance should exist when unmounting');\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n    }\n  });\n\n  useIsomorphicLayoutEffect(() => {\n    if (instanceRef.current == null) return;\n    const newOptions = mergeFileOptions({\n      controlledSelection,\n      hasCustomHeader,\n      hasGutterRenderUtility,\n      options,\n    });\n    // setOptions(undefined) is a no-op, so an undefined merge result never\n    // requires a forced render — comparing it against the instance's\n    // constructor-default options would force a full render on every commit.\n    const forceRender =\n      newOptions !== undefined &&\n      !areOptionsEqual(instanceRef.current.options, newOptions);\n    instanceRef.current.setOptions(newOptions);\n    void instanceRef.current.render({ file, lineAnnotations, forceRender });\n    if (selectedLines !== undefined) {\n      instanceRef.current.setSelectedLines(selectedLines);\n    }\n  });\n\n  useIsomorphicLayoutEffect(() => {\n    if (edit && instanceRef.current != null) {\n      if (createEditor === undefined) {\n        throw new Error('File: EditContext is not attached');\n      }\n      const editor = createEditor(editorOptions ?? {});\n      if (editor == null) {\n        throw new Error(\n          'File: EditProvider.createEditor must return an editor instance'\n        );\n      }\n      try {\n        return editor.edit(instanceRef.current);\n      } catch (error) {\n        editor.cleanUp();\n        throw error;\n      }\n    }\n    return undefined;\n  }, [edit]);\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'file'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n  return { ref, getHoveredLine };\n}\n\ninterface MergeFileOptionsProps<LAnnotation> {\n  options: FileOptions<LAnnotation> | undefined;\n  controlledSelection: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n}\n\nfunction mergeFileOptions<LAnnotation>({\n  options,\n  controlledSelection,\n  hasCustomHeader,\n  hasGutterRenderUtility,\n}: MergeFileOptionsProps<LAnnotation>): FileOptions<LAnnotation> | undefined {\n  const needsReactOverrides =\n    controlledSelection || hasGutterRenderUtility || hasCustomHeader;\n\n  if (!needsReactOverrides) {\n    return options;\n  }\n\n  return {\n    ...options,\n    controlledSelection,\n    renderCustomHeader: hasCustomHeader\n      ? noopRender\n      : options?.renderCustomHeader,\n    renderGutterUtility: hasGutterRenderUtility\n      ? noopRender\n      : options?.renderGutterUtility,\n  };\n}\n"],"mappings":";;;;;;;;;;AAyBA,MAAM,4BACJ,OAAO,WAAW,cAAc,YAAY;AAyB9C,SAAgB,gBAA6B,EAC3C,MACA,SACA,eACA,iBACA,eACA,iBACA,SACA,wBACA,iBACA,mBACA,QAC2D;CAC3D,MAAM,oBAAoB,eAAe;CACzC,MAAM,sBAAsB,kBAAkB,KAAA;CAC9C,MAAM,cAAc,WAAW,iBAAiB;CAChD,MAAM,eAAe,gBAA6B;CAClD,MAAM,cAAc,OAElB,IAAI;CACN,MAAM,MAAM,mBAAmB,SAA6B;EAC1D,IAAI,QAAQ,MAAM;GAChB,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,mEACF;GAEF,IAAI,qBAAqB,MACvB,YAAY,UAAU,IAAI,gBACxB,iBAAiB;IACf;IACA;IACA;IACA;GACF,CAAC,GACD,mBACA,SACA,CAAC,oBAAoB,cAAc,KAAA,GACnC,IACF;QAEA,YAAY,UAAU,IAAI,KACxB,iBAAiB;IACf;IACA;IACA;IACA;GACF,CAAC,GACD,CAAC,oBAAoB,cAAc,KAAA,GACnC,IACF;GAEF,YAAiB,QAAQ,QAAQ;IAC/B;IACA,eAAe;IACf;IACA;GACF,CAAC;EACH,OAAO;GACL,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MAAM,oDAAoD;GAEtE,YAAY,QAAQ,QAAQ;GAC5B,YAAY,UAAU;EACxB;CACF,CAAC;CAED,gCAAgC;EAC9B,IAAI,YAAY,WAAW,MAAM;EACjC,MAAM,aAAa,iBAAiB;GAClC;GACA;GACA;GACA;EACF,CAAC;EAID,MAAM,cACJ,eAAe,KAAA,KACf,CAAC,gBAAgB,YAAY,QAAQ,SAAS,UAAU;EAC1D,YAAY,QAAQ,WAAW,UAAU;EACzC,YAAiB,QAAQ,OAAO;GAAE;GAAM;GAAiB;EAAY,CAAC;EACtE,IAAI,kBAAkB,KAAA,GACpB,YAAY,QAAQ,iBAAiB,aAAa;CAEtD,CAAC;CAED,gCAAgC;EAC9B,IAAI,QAAQ,YAAY,WAAW,MAAM;GACvC,IAAI,iBAAiB,KAAA,GACnB,MAAM,IAAI,MAAM,mCAAmC;GAErD,MAAM,SAAS,aAAa,iBAAiB,CAAC,CAAC;GAC/C,IAAI,UAAU,MACZ,MAAM,IAAI,MACR,gEACF;GAEF,IAAI;IACF,OAAO,OAAO,KAAK,YAAY,OAAO;GACxC,SAAS,OAAO;IACd,OAAO,QAAQ;IACf,MAAM;GACR;EACF;CAEF,GAAG,CAAC,IAAI,CAAC;CAOT,OAAO;EAAE;EAAK,gBALS,kBAEN;GACf,OAAO,YAAY,SAAS,eAAe;EAC7C,GAAG,CAAC,CACuB;CAAE;AAC/B;AASA,SAAS,iBAA8B,EACrC,SACA,qBACA,iBACA,0BAC2E;CAI3E,IAAI,EAFF,uBAAuB,0BAA0B,kBAGjD,OAAO;CAGT,OAAO;EACL,GAAG;EACH;EACA,oBAAoB,kBAChB,aACA,SAAS;EACb,qBAAqB,yBACjB,aACA,SAAS;CACf;AACF"}
+{"version":3,"file":"useFileInstance.js","names":[],"sources":["../../../src/react/utils/useFileInstance.ts"],"sourcesContent":["import {\n  type RefObject,\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n} from 'react';\n\nimport {\n  File,\n  type FileEditChangeHandler,\n  type FileEditCompleteEvent,\n  type FileEditCompleteHandler,\n  type FileOptions,\n} from '../../components/File';\nimport { VirtualizedFile } from '../../components/VirtualizedFile';\nimport type { Editor, EditorChangeEvent, EditorOptions } from '../../edit';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type {\n  FileContents,\n  LineAnnotation,\n  SelectedLineRange,\n  VirtualFileMetrics,\n} from '../../types';\nimport { areFileTargetsEqual } from '../../utils/areFileTargetsEqual';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport { getLineAnnotationName } from '../../utils/getLineAnnotationName';\nimport { noopRender } from '../constants';\nimport { useCreateEditor } from '../EditContext';\nimport { useVirtualizer } from '../Virtualizer';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsomorphicLayoutEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface AcceptedCompletion<LAnnotation> {\n  file: {\n    installed: FileContents;\n    stale: FileContents;\n  } | null;\n  annotations: {\n    installed: LineAnnotation<LAnnotation>[] | undefined;\n    stale: LineAnnotation<LAnnotation>[];\n  } | null;\n}\n\ninterface UseFileInstanceProps<LAnnotation, Caret> {\n  file: FileContents;\n  options: FileOptions<LAnnotation, Caret> | undefined;\n  editorOptions: EditorOptions<'file', LAnnotation, Caret> | undefined;\n  editStateKey: string | undefined;\n  lineAnnotations: LineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  metrics?: VirtualFileMetrics;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  disableWorkerPool: boolean;\n  edit: boolean;\n  onEditChange?: FileEditChangeHandler<LAnnotation, Caret>;\n  onEditComplete?: FileEditCompleteHandler<LAnnotation, Caret>;\n}\n\ninterface UseFileInstanceReturn<LAnnotation> {\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'file'> | undefined;\n  getAnnotationSlotName(annotation: LineAnnotation<LAnnotation>): string;\n}\n\nexport function useFileInstance<LAnnotation, Caret>({\n  file,\n  options,\n  editorOptions,\n  editStateKey,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  metrics,\n  hasGutterRenderUtility,\n  hasCustomHeader,\n  disableWorkerPool,\n  edit,\n  onEditChange: _onEditChange,\n  onEditComplete: _onEditComplete,\n}: UseFileInstanceProps<\n  LAnnotation,\n  Caret\n>): UseFileInstanceReturn<LAnnotation> {\n  const simpleVirtualizer = useVirtualizer();\n  const controlledSelection = selectedLines !== undefined;\n  const poolManager = useContext(WorkerPoolContext);\n  const createEditor = useCreateEditor<LAnnotation, Caret>();\n  const handleOnEditChange = useStableCallback(\n    (event: EditorChangeEvent<'file', LAnnotation, Caret>) =>\n      _onEditChange?.(event)\n  );\n  const onEditChange = _onEditChange != null ? handleOnEditChange : undefined;\n  // An accepted completion installs its file on the instance immediately,\n  // but the file/lineAnnotations props stay pre-edit until the owner's state\n  // update lands. This holds the accepted values so the renders in between do\n  // not repaint pre-edit state.\n  const acceptedCache = useRef<AcceptedCompletion<LAnnotation> | null>(null);\n  const handleOnEditComplete = useStableCallback(\n    (event: FileEditCompleteEvent<LAnnotation, Caret>) => {\n      const decision = _onEditComplete?.(event) ?? 'reject';\n      if (decision === 'accept') {\n        acceptedCache.current = {\n          file: { installed: event.file, stale: event.originalFile },\n          annotations: {\n            installed: event.lineAnnotations,\n            stale: event.originalLineAnnotations,\n          },\n        };\n      }\n      return decision;\n    }\n  );\n  const onEditComplete =\n    _onEditComplete != null ? handleOnEditComplete : undefined;\n  const instanceRef = useRef<\n    File<LAnnotation, Caret> | VirtualizedFile<LAnnotation, Caret> | null\n  >(null);\n  const disposeEditorRef = useRef<() => void>(null);\n  const getEditor = useStableCallback(() => {\n    if (createEditor == null) {\n      throw new Error('File: EditContext is not attached');\n    }\n    return createEditor('file', editorOptions ?? {}, editStateKey);\n  });\n  const ref = useStableCallback((node: HTMLElement | null) => {\n    if (node != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'File: An instance should not already exist when a node is created'\n        );\n      }\n      if (simpleVirtualizer != null) {\n        instanceRef.current = new VirtualizedFile(\n          mergeFileOptions({\n            controlledSelection,\n            hasCustomHeader,\n            hasGutterRenderUtility,\n            onEditChange,\n            onEditComplete,\n            options,\n          }),\n          simpleVirtualizer,\n          metrics,\n          !disableWorkerPool ? poolManager : undefined,\n          true\n        );\n      } else {\n        instanceRef.current = new File(\n          mergeFileOptions({\n            controlledSelection,\n            hasCustomHeader,\n            hasGutterRenderUtility,\n            onEditChange,\n            onEditComplete,\n            options,\n          }),\n          !disableWorkerPool ? poolManager : undefined,\n          true\n        );\n      }\n      if (edit && disposeEditorRef.current == null) {\n        disposeEditorRef.current = applyEdit(instanceRef.current, getEditor);\n      }\n      void instanceRef.current.hydrate({\n        file,\n        fileContainer: node,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error('File: A File instance should exist when unmounting');\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n      disposeEditorRef.current = null;\n    }\n  });\n\n  useIsomorphicLayoutEffect(() => {\n    const { current: instance } = instanceRef;\n    if (instance == null) return;\n    const newOptions = mergeFileOptions({\n      controlledSelection,\n      hasCustomHeader,\n      hasGutterRenderUtility,\n      onEditChange,\n      onEditComplete,\n      options,\n    });\n    // setOptions(undefined) is a no-op, so an undefined merge result never\n    // requires a forced render — comparing it against the instance's\n    // constructor-default options would force a full render on every commit.\n    const forceRender =\n      newOptions !== undefined &&\n      !areOptionsEqual(instance.options, newOptions);\n    instance.setOptions(newOptions);\n    // Detach editor before rendering if required\n    if (!edit && disposeEditorRef.current != null) {\n      const { current: disposeEditor } = disposeEditorRef;\n      disposeEditorRef.current = null;\n      disposeEditor();\n    }\n    const resolved = resolveAcceptedValues(\n      file,\n      lineAnnotations,\n      acceptedCache\n    );\n    void instance.render({\n      file: resolved.file,\n      lineAnnotations: resolved.lineAnnotations,\n      forceRender,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n    // Attach editor after rendering if required\n    if (edit && disposeEditorRef.current == null) {\n      disposeEditorRef.current = applyEdit(instance, getEditor);\n    }\n  });\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'file'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n  const getAnnotationSlotName = useCallback(\n    (annotation: LineAnnotation<LAnnotation>): string =>\n      instanceRef.current?.getAnnotationSlotName(annotation) ??\n      getLineAnnotationName(annotation),\n    []\n  );\n  return { ref, getHoveredLine, getAnnotationSlotName };\n}\n\n// Return the installed values in place of props that still match their stale\n// counterparts. Any other prop value clears its half, and the ref clears once\n// both halves have.\nfunction resolveAcceptedValues<LAnnotation>(\n  file: FileContents,\n  lineAnnotations: LineAnnotation<LAnnotation>[] | undefined,\n  acceptedCache: RefObject<AcceptedCompletion<LAnnotation> | null>\n): {\n  file: FileContents;\n  lineAnnotations: LineAnnotation<LAnnotation>[] | undefined;\n} {\n  const { current: accepted } = acceptedCache;\n  if (accepted == null) {\n    return { file, lineAnnotations };\n  }\n  const { file: acceptedFiles, annotations: acceptedAnnotations } = accepted;\n  let resolvedFile = file;\n  if (acceptedFiles != null) {\n    if (areFileTargetsEqual(file, acceptedFiles.stale)) {\n      resolvedFile = acceptedFiles.installed;\n    } else {\n      accepted.file = null;\n    }\n  }\n  let resolvedAnnotations = lineAnnotations;\n  if (acceptedAnnotations != null) {\n    if (lineAnnotations === acceptedAnnotations.stale) {\n      resolvedAnnotations = acceptedAnnotations.installed;\n    } else {\n      accepted.annotations = null;\n    }\n  }\n  if (accepted.file == null && accepted.annotations == null) {\n    acceptedCache.current = null;\n  }\n  return { file: resolvedFile, lineAnnotations: resolvedAnnotations };\n}\n\ninterface MergeFileOptionsProps<LAnnotation, Caret> {\n  options: FileOptions<LAnnotation, Caret> | undefined;\n  controlledSelection: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  onEditChange: FileEditChangeHandler<LAnnotation, Caret> | undefined;\n  onEditComplete: FileEditCompleteHandler<LAnnotation, Caret> | undefined;\n}\n\nfunction mergeFileOptions<LAnnotation, Caret>({\n  options,\n  controlledSelection,\n  hasCustomHeader,\n  hasGutterRenderUtility,\n  onEditChange,\n  onEditComplete,\n}: MergeFileOptionsProps<LAnnotation, Caret>):\n  | FileOptions<LAnnotation, Caret>\n  | undefined {\n  const needsReactOverrides =\n    controlledSelection ||\n    hasGutterRenderUtility ||\n    hasCustomHeader ||\n    onEditChange != null ||\n    onEditComplete != null;\n\n  if (!needsReactOverrides) {\n    return options;\n  }\n\n  return {\n    ...options,\n    controlledSelection,\n    renderCustomHeader: hasCustomHeader\n      ? noopRender\n      : options?.renderCustomHeader,\n    renderGutterUtility: hasGutterRenderUtility\n      ? noopRender\n      : options?.renderGutterUtility,\n    onEditChange,\n    onEditComplete,\n  };\n}\n\nfunction applyEdit<LAnnotation, Caret>(\n  instance: File<LAnnotation, Caret>,\n  getEditor: () => Editor<'file', LAnnotation, Caret>\n): () => void {\n  const editor = getEditor();\n  try {\n    return editor.edit(instance);\n  } catch (error) {\n    editor.cleanUp();\n    throw error;\n  }\n}\n"],"mappings":"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"}

package/dist/renderers/DiffHunksRenderer.d.ts

@@ -1,5 +1,6 @@
 import { Element, ElementContent, Properties } from "../node_modules/.pnpm/@types_hast@3.0.4/node_modules/@types/hast/index.js";
-import { BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, CustomPreProperties, DiffLineAnnotation, DiffsHighlighter, DiffsTextDocument, ExpansionDirections, FileDiffMetadata, FileHeaderRenderMode, HighlightedToken, HunkData, HunkExpansionRegion, LineTypes, RenderDiffOptions, RenderRange, ThemedDiffResult } from "../types.js";
+import { BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, CustomPreProperties, DiffLineAnnotation, DiffsHighlighter, ExpansionDirections, FileDiffMetadata, FileHeaderRenderMode, HighlightedToken, HunkData, HunkExpansionRegion, LineTypes, RenderDiffOptions, RenderRange, ThemedDiffResult } from "../types.js";
+import { TextDocument } from "../editor/textDocument.js";
 import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
 import { DiffLineMetadata } from "../utils/iterateOverDiff.js";
 
@@ -52,6 +53,7 @@ interface SplitInjectedRowPlacement {
   after?: SplitInjectedRow[];
 }
 interface HunksRenderResult {
+  fileDiff: FileDiffMetadata;
   unifiedGutterAST: ElementContent[] | undefined;
   unifiedContentAST: ElementContent[] | undefined;
   deletionsGutterAST: ElementContent[] | undefined;
@@ -71,6 +73,7 @@ interface HunksRenderResult {
 }
 declare class DiffHunksRenderer<LAnnotation = undefined> {
   options: DiffHunksRendererOptions;
+  private annotationSlotName;
   private onRenderUpdate?;
   private workerManager?;
   readonly __id: string;
@@ -81,19 +84,22 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   private additionAnnotations;
   private computedLang;
   private renderCache;
+  private pendingHighlightResult;
+  private pendingStructuralRows;
   private editSessionActive;
-  constructor(options?: DiffHunksRendererOptions, onRenderUpdate?: (() => unknown) | undefined, workerManager?: WorkerPoolManager | undefined);
+  constructor(options?: DiffHunksRendererOptions, annotationSlotName?: (annotation: DiffLineAnnotation<LAnnotation>) => string, onRenderUpdate?: (() => unknown) | undefined, workerManager?: WorkerPoolManager | undefined);
   cleanUp(): void;
   recycle(): void;
   /**
    * Enter edit-session mode: hunk updates preserve the current region
    * skeleton instead of recomputing hunks, and rendering happens locally
    * with the token transformer forced on (worker-pool requests/results are
-   * suspended for this renderer). An empty additions document gets one row so
-   * the editor has a line for its caret. Called on every editor attach,
-   * including a re-attach after recycle.
+   * suspended for this renderer). When the session was freshly cloned from
+   * `externalDiff`, compatible highlighted markup is detached from its external
+   * cache owner so the editor can reuse it without mutating shared data. An
+   * empty additions document gets one row for the editor's caret.
    */
-  beginEditSession(): void;
+  beginEditSession(diff?: FileDiffMetadata, externalDiff?: FileDiffMetadata): void;
   /** Leave edit-session mode. The exit recompute is the host's concern. */
   endEditSession(): void;
   /**
@@ -101,14 +107,13 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
    */
   editorRenderReady(): boolean;
   /**
-   * Re-highlights the current diff in the background and swaps the fresh
-   * result in (with a re-render) once it completes. Needed after an edit
-   * session's exit recompute: session passes plain-fill shifted lines in the
-   * cached result, and the recompute mutates the diff in place (same object,
-   * same cacheKey), so identity/cacheKey checks would otherwise treat the
-   * stale highlight as current forever. The current result — content-correct,
-   * mostly highlighted — keeps rendering until the fresh one lands, so no
-   * interim paint drops highlighting.
+   * Re-highlights the current diff in the background and stages the fresh
+   * result for the next render. Needed after an edit session's exit recompute:
+   * session passes plain-fill shifted lines in the cached result, and the
+   * recompute mutates the keyless session diff in place, so object identity
+   * alone would otherwise treat the stale highlight as current forever. The
+   * current result — content-correct, mostly highlighted — keeps rendering
+   * until the fresh one is promoted, so no interim paint drops highlighting.
    */
   refreshHighlightedResult(): Promise<void>;
   private applyRefreshedResult;
@@ -130,8 +135,9 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
    */
   updateRenderCache(dirtyLines: Map<number, Array<HighlightedToken>>, themeType: 'dark' | 'light', lineCountChangeInFlight?: boolean): boolean;
   private applyExpansionRemap;
-  applyDocumentChange(textDocument: DiffsTextDocument): void;
+  applyDocumentChange(textDocument: TextDocument<'file-diff', LAnnotation>): void;
   private applySessionDocumentChange;
+  private applyRecomputePreservingSessionType;
   private markEditSessionPass;
   protected getUnifiedLineDecoration({
     lineType
@@ -149,6 +155,13 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   private getLocalHighlightTheme;
   getEffectiveCodeOptions(): Pick<BaseCodeOptions, 'theme' | 'tokenizeMaxLineLength'>;
   private getRenderOptions;
+  /**
+   * Returns the diff that the next synchronous render can commit without
+   * changing the renderer's current diff or render cache. Components use this
+   * to prepare state that must match the following DOM render.
+   */
+  getDiffForNextRender(diff: FileDiffMetadata): FileDiffMetadata;
+  private canRenderDiff;
   renderDiff(diff?: FileDiffMetadata | undefined, renderRange?: RenderRange): HunksRenderResult | undefined;
   asyncRender(diff: FileDiffMetadata, renderRange?: RenderRange): Promise<HunksRenderResult>;
   protected createPreElement(split: boolean, totalLines: number, customProperties?: CustomPreProperties): Element;
@@ -157,6 +170,7 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   onHighlightSuccess(diff: FileDiffMetadata, result: ThemedDiffResult, options: RenderDiffOptions, highlighted?: boolean): void;
   private applyHighlightResult;
   private getMatchingWorkerResultCache;
+  private getReadyRenderResult;
   private hasHighlightedRenderCache;
   onHighlightError(error: unknown): void;
   private getTokenizeMaxLength;
@@ -167,6 +181,7 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   renderPartialHTML(children: ElementContent[], columnType?: 'unified' | 'deletions' | 'additions'): string;
   private pushFileLevelAnnotations;
   private getAnnotations;
+  private getAnnotationNames;
   private renderHeader;
 }
 //#endregion

package/dist/renderers/DiffHunksRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DiffHunksRenderer.d.ts","names":[],"sources":["../../src/renderers/DiffHunksRenderer.ts"],"mappings":"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"}
+{"version":3,"file":"DiffHunksRenderer.d.ts","names":[],"sources":["../../src/renderers/DiffHunksRenderer.ts"],"mappings":"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"}