@pierre/diffs 1.3.6 → 1.4.0

package/dist/react/utils/renderFileChildren.d.ts

@@ -1,21 +1,22 @@
-import { FileContents } from "../../types.js";
+import { FileContents, LineAnnotation } from "../../types.js";
 import { GetHoveredLineResult } from "../../managers/InteractionManager.js";
 import { FileProps } from "../types.js";
 import { ReactNode } from "react";
 
 //#region src/react/utils/renderFileChildren.d.ts
-interface RenderFileChildrenProps<LAnnotation> {
+interface RenderFileChildrenProps<LAnnotation, Caret> {
   file: FileContents;
-  renderCustomHeader: FileProps<LAnnotation>['renderCustomHeader'];
-  renderHeaderPrefix: FileProps<LAnnotation>['renderHeaderPrefix'];
-  renderHeaderFilenameSuffix?: FileProps<LAnnotation>['renderHeaderFilenameSuffix'];
-  renderHeaderMetadata: FileProps<LAnnotation>['renderHeaderMetadata'];
-  renderAnnotation: FileProps<LAnnotation>['renderAnnotation'];
-  lineAnnotations: FileProps<LAnnotation>['lineAnnotations'];
-  renderGutterUtility: FileProps<LAnnotation>['renderGutterUtility'];
+  renderCustomHeader: FileProps<LAnnotation, Caret>['renderCustomHeader'];
+  renderHeaderPrefix: FileProps<LAnnotation, Caret>['renderHeaderPrefix'];
+  renderHeaderFilenameSuffix?: FileProps<LAnnotation, Caret>['renderHeaderFilenameSuffix'];
+  renderHeaderMetadata: FileProps<LAnnotation, Caret>['renderHeaderMetadata'];
+  renderAnnotation: FileProps<LAnnotation, Caret>['renderAnnotation'];
+  lineAnnotations: FileProps<LAnnotation, Caret>['lineAnnotations'];
+  renderGutterUtility: FileProps<LAnnotation, Caret>['renderGutterUtility'];
   getHoveredLine(): GetHoveredLineResult<'file'> | undefined;
+  getAnnotationSlotName?(annotation: LineAnnotation<LAnnotation>): string;
 }
-declare function renderFileChildren<LAnnotation>({
+declare function renderFileChildren<LAnnotation, Caret>({
   file,
   renderCustomHeader,
   renderHeaderPrefix,
@@ -24,8 +25,9 @@ declare function renderFileChildren<LAnnotation>({
   renderAnnotation,
   lineAnnotations,
   renderGutterUtility,
-  getHoveredLine
-}: RenderFileChildrenProps<LAnnotation>): ReactNode;
+  getHoveredLine,
+  getAnnotationSlotName
+}: RenderFileChildrenProps<LAnnotation, Caret>): ReactNode;
 //#endregion
 export { renderFileChildren };
 //# sourceMappingURL=renderFileChildren.d.ts.map

package/dist/react/utils/renderFileChildren.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderFileChildren.d.ts","names":[],"sources":["../../../src/react/utils/renderFileChildren.tsx"],"mappings":";;;;;;UAcU,uBAAA;EACR,IAAA,EAAM,YAAA;EACN,kBAAA,EAAoB,SAAA,CAAU,WAAA;EAC9B,kBAAA,EAAoB,SAAA,CAAU,WAAA;EAC9B,0BAAA,GAA6B,SAAA,CAAU,WAAA;EACvC,oBAAA,EAAsB,SAAA,CAAU,WAAA;EAChC,gBAAA,EAAkB,SAAA,CAAU,WAAA;EAC5B,eAAA,EAAiB,SAAA,CAAU,WAAA;EAC3B,mBAAA,EAAqB,SAAA,CAAU,WAAA;EAC/B,cAAA,IAAkB,oBAAA;AAAA;AAAA,iBAGJ,kBAAA;EACd,IAAA;EACA,kBAAA;EACA,kBAAA;EACA,0BAAA;EACA,oBAAA;EACA,gBAAA;EACA,eAAA;EACA,mBAAA;EACA;AAAA,GACC,uBAAA,CAAwB,WAAA,IAAe,SAAA"}
+{"version":3,"file":"renderFileChildren.d.ts","names":[],"sources":["../../../src/react/utils/renderFileChildren.tsx"],"mappings":";;;;;;UAcU,uBAAA;EACR,IAAA,EAAM,YAAA;EACN,kBAAA,EAAoB,SAAA,CAAU,WAAA,EAAa,KAAA;EAC3C,kBAAA,EAAoB,SAAA,CAAU,WAAA,EAAa,KAAA;EAC3C,0BAAA,GAA6B,SAAA,CAC3B,WAAA,EACA,KAAA;EAEF,oBAAA,EAAsB,SAAA,CAAU,WAAA,EAAa,KAAA;EAC7C,gBAAA,EAAkB,SAAA,CAAU,WAAA,EAAa,KAAA;EACzC,eAAA,EAAiB,SAAA,CAAU,WAAA,EAAa,KAAA;EACxC,mBAAA,EAAqB,SAAA,CAAU,WAAA,EAAa,KAAA;EAC5C,cAAA,IAAkB,oBAAA;EAClB,qBAAA,EAAuB,UAAA,EAAY,cAAA,CAAe,WAAA;AAAA;AAAA,iBAGpC,kBAAA;EACd,IAAA;EACA,kBAAA;EACA,kBAAA;EACA,0BAAA;EACA,oBAAA;EACA,gBAAA;EACA,eAAA;EACA,mBAAA;EACA,cAAA;EACA;AAAA,GACC,uBAAA,CAAwB,WAAA,EAAa,KAAA,IAAS,SAAA"}

package/dist/react/utils/renderFileChildren.js

@@ -3,7 +3,7 @@ import { getLineAnnotationName } from "../../utils/getLineAnnotationName.js";
 import { GutterUtilitySlotStyles } from "../constants.js";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 //#region src/react/utils/renderFileChildren.tsx
-function renderFileChildren({ file, renderCustomHeader, renderHeaderPrefix, renderHeaderFilenameSuffix, renderHeaderMetadata, renderAnnotation, lineAnnotations, renderGutterUtility, getHoveredLine }) {
+function renderFileChildren({ file, renderCustomHeader, renderHeaderPrefix, renderHeaderFilenameSuffix, renderHeaderMetadata, renderAnnotation, lineAnnotations, renderGutterUtility, getHoveredLine, getAnnotationSlotName = getLineAnnotationName }) {
 	const customHeader = renderCustomHeader?.(file);
 	const prefix = renderHeaderPrefix?.(file);
 	const suffix = renderHeaderFilenameSuffix?.(file);
@@ -27,7 +27,7 @@ function renderFileChildren({ file, renderCustomHeader, renderHeaderPrefix, rend
 			})
 		] }),
 		renderAnnotation != null && lineAnnotations?.map((annotation, index) => /* @__PURE__ */ jsx("div", {
-			slot: getLineAnnotationName(annotation),
+			slot: getAnnotationSlotName(annotation),
 			children: renderAnnotation(annotation)
 		}, index)),
 		renderGutterUtility != null && /* @__PURE__ */ jsx("div", {

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

@@ -1 +1 @@
-{"version":3,"file":"renderFileChildren.js","names":[],"sources":["../../../src/react/utils/renderFileChildren.tsx"],"sourcesContent":["import type { ReactNode } from 'react';\n\nimport {\n  CUSTOM_HEADER_SLOT_ID,\n  HEADER_FILENAME_SUFFIX_SLOT_ID,\n  HEADER_METADATA_SLOT_ID,\n  HEADER_PREFIX_SLOT_ID,\n} from '../../constants';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type { FileContents } from '../../types';\nimport { getLineAnnotationName } from '../../utils/getLineAnnotationName';\nimport { GutterUtilitySlotStyles } from '../constants';\nimport type { FileProps } from '../types';\n\ninterface RenderFileChildrenProps<LAnnotation> {\n  file: FileContents;\n  renderCustomHeader: FileProps<LAnnotation>['renderCustomHeader'];\n  renderHeaderPrefix: FileProps<LAnnotation>['renderHeaderPrefix'];\n  renderHeaderFilenameSuffix?: FileProps<LAnnotation>['renderHeaderFilenameSuffix'];\n  renderHeaderMetadata: FileProps<LAnnotation>['renderHeaderMetadata'];\n  renderAnnotation: FileProps<LAnnotation>['renderAnnotation'];\n  lineAnnotations: FileProps<LAnnotation>['lineAnnotations'];\n  renderGutterUtility: FileProps<LAnnotation>['renderGutterUtility'];\n  getHoveredLine(): GetHoveredLineResult<'file'> | undefined;\n}\n\nexport function renderFileChildren<LAnnotation>({\n  file,\n  renderCustomHeader,\n  renderHeaderPrefix,\n  renderHeaderFilenameSuffix,\n  renderHeaderMetadata,\n  renderAnnotation,\n  lineAnnotations,\n  renderGutterUtility,\n  getHoveredLine,\n}: RenderFileChildrenProps<LAnnotation>): ReactNode {\n  const customHeader = renderCustomHeader?.(file);\n  const prefix = renderHeaderPrefix?.(file);\n  const suffix = renderHeaderFilenameSuffix?.(file);\n  const metadata = renderHeaderMetadata?.(file);\n  return (\n    <>\n      {customHeader != null ? (\n        <div slot={CUSTOM_HEADER_SLOT_ID}>{customHeader}</div>\n      ) : (\n        <>\n          {prefix != null && <div slot={HEADER_PREFIX_SLOT_ID}>{prefix}</div>}\n          {suffix != null && (\n            <div slot={HEADER_FILENAME_SUFFIX_SLOT_ID}>{suffix}</div>\n          )}\n          {metadata != null && (\n            <div slot={HEADER_METADATA_SLOT_ID}>{metadata}</div>\n          )}\n        </>\n      )}\n      {renderAnnotation != null &&\n        lineAnnotations?.map((annotation, index) => (\n          <div key={index} slot={getLineAnnotationName(annotation)}>\n            {renderAnnotation(annotation)}\n          </div>\n        ))}\n      {renderGutterUtility != null && (\n        <div slot=\"gutter-utility-slot\" style={GutterUtilitySlotStyles}>\n          {renderGutterUtility(getHoveredLine)}\n        </div>\n      )}\n    </>\n  );\n}\n"],"mappings":";;;;;AA0BA,SAAgB,mBAAgC,EAC9C,MACA,oBACA,oBACA,4BACA,sBACA,kBACA,iBACA,qBACA,kBACkD;CAClD,MAAM,eAAe,qBAAqB,IAAI;CAC9C,MAAM,SAAS,qBAAqB,IAAI;CACxC,MAAM,SAAS,6BAA6B,IAAI;CAChD,MAAM,WAAW,uBAAuB,IAAI;CAC5C,OACE,qBAAA,UAAA,EAAA,UAAA;EACG,gBAAgB,OACf,oBAAC,OAAD;GAAK,MAAM;aAAwB;EAAkB,CAAA,IAErD,qBAAA,UAAA,EAAA,UAAA;GACG,UAAU,QAAQ,oBAAC,OAAD;IAAK,MAAA;cAA8B;GAAY,CAAA;GACjE,UAAU,QACT,oBAAC,OAAD;IAAK,MAAA;cAAuC;GAAY,CAAA;GAEzD,YAAY,QACX,oBAAC,OAAD;IAAK,MAAA;cAAgC;GAAc,CAAA;EAErD,EAAA,CAAA;EAEH,oBAAoB,QACnB,iBAAiB,KAAK,YAAY,UAChC,oBAAC,OAAD;GAAiB,MAAM,sBAAsB,UAAU;aACpD,iBAAiB,UAAU;EACzB,GAFK,KAEL,CACN;EACF,uBAAuB,QACtB,oBAAC,OAAD;GAAK,MAAK;GAAsB,OAAO;aACpC,oBAAoB,cAAc;EAChC,CAAA;CAEP,EAAA,CAAA;AAEN"}
+{"version":3,"file":"renderFileChildren.js","names":[],"sources":["../../../src/react/utils/renderFileChildren.tsx"],"sourcesContent":["import type { ReactNode } from 'react';\n\nimport {\n  CUSTOM_HEADER_SLOT_ID,\n  HEADER_FILENAME_SUFFIX_SLOT_ID,\n  HEADER_METADATA_SLOT_ID,\n  HEADER_PREFIX_SLOT_ID,\n} from '../../constants';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type { FileContents, LineAnnotation } from '../../types';\nimport { getLineAnnotationName } from '../../utils/getLineAnnotationName';\nimport { GutterUtilitySlotStyles } from '../constants';\nimport type { FileProps } from '../types';\n\ninterface RenderFileChildrenProps<LAnnotation, Caret> {\n  file: FileContents;\n  renderCustomHeader: FileProps<LAnnotation, Caret>['renderCustomHeader'];\n  renderHeaderPrefix: FileProps<LAnnotation, Caret>['renderHeaderPrefix'];\n  renderHeaderFilenameSuffix?: FileProps<\n    LAnnotation,\n    Caret\n  >['renderHeaderFilenameSuffix'];\n  renderHeaderMetadata: FileProps<LAnnotation, Caret>['renderHeaderMetadata'];\n  renderAnnotation: FileProps<LAnnotation, Caret>['renderAnnotation'];\n  lineAnnotations: FileProps<LAnnotation, Caret>['lineAnnotations'];\n  renderGutterUtility: FileProps<LAnnotation, Caret>['renderGutterUtility'];\n  getHoveredLine(): GetHoveredLineResult<'file'> | undefined;\n  getAnnotationSlotName?(annotation: LineAnnotation<LAnnotation>): string;\n}\n\nexport function renderFileChildren<LAnnotation, Caret>({\n  file,\n  renderCustomHeader,\n  renderHeaderPrefix,\n  renderHeaderFilenameSuffix,\n  renderHeaderMetadata,\n  renderAnnotation,\n  lineAnnotations,\n  renderGutterUtility,\n  getHoveredLine,\n  getAnnotationSlotName = getLineAnnotationName,\n}: RenderFileChildrenProps<LAnnotation, Caret>): ReactNode {\n  const customHeader = renderCustomHeader?.(file);\n  const prefix = renderHeaderPrefix?.(file);\n  const suffix = renderHeaderFilenameSuffix?.(file);\n  const metadata = renderHeaderMetadata?.(file);\n  return (\n    <>\n      {customHeader != null ? (\n        <div slot={CUSTOM_HEADER_SLOT_ID}>{customHeader}</div>\n      ) : (\n        <>\n          {prefix != null && <div slot={HEADER_PREFIX_SLOT_ID}>{prefix}</div>}\n          {suffix != null && (\n            <div slot={HEADER_FILENAME_SUFFIX_SLOT_ID}>{suffix}</div>\n          )}\n          {metadata != null && (\n            <div slot={HEADER_METADATA_SLOT_ID}>{metadata}</div>\n          )}\n        </>\n      )}\n      {renderAnnotation != null &&\n        lineAnnotations?.map((annotation, index) => (\n          <div key={index} slot={getAnnotationSlotName(annotation)}>\n            {renderAnnotation(annotation)}\n          </div>\n        ))}\n      {renderGutterUtility != null && (\n        <div slot=\"gutter-utility-slot\" style={GutterUtilitySlotStyles}>\n          {renderGutterUtility(getHoveredLine)}\n        </div>\n      )}\n    </>\n  );\n}\n"],"mappings":";;;;;AA8BA,SAAgB,mBAAuC,EACrD,MACA,oBACA,oBACA,4BACA,sBACA,kBACA,iBACA,qBACA,gBACA,wBAAwB,yBACiC;CACzD,MAAM,eAAe,qBAAqB,IAAI;CAC9C,MAAM,SAAS,qBAAqB,IAAI;CACxC,MAAM,SAAS,6BAA6B,IAAI;CAChD,MAAM,WAAW,uBAAuB,IAAI;CAC5C,OACE,qBAAA,UAAA,EAAA,UAAA;EACG,gBAAgB,OACf,oBAAC,OAAD;GAAK,MAAM;aAAwB;EAAkB,CAAA,IAErD,qBAAA,UAAA,EAAA,UAAA;GACG,UAAU,QAAQ,oBAAC,OAAD;IAAK,MAAA;cAA8B;GAAY,CAAA;GACjE,UAAU,QACT,oBAAC,OAAD;IAAK,MAAA;cAAuC;GAAY,CAAA;GAEzD,YAAY,QACX,oBAAC,OAAD;IAAK,MAAA;cAAgC;GAAc,CAAA;EAErD,EAAA,CAAA;EAEH,oBAAoB,QACnB,iBAAiB,KAAK,YAAY,UAChC,oBAAC,OAAD;GAAiB,MAAM,sBAAsB,UAAU;aACpD,iBAAiB,UAAU;EACzB,GAFK,KAEL,CACN;EACF,uBAAuB,QACtB,oBAAC,OAAD;GAAK,MAAK;GAAsB,OAAO;aACpC,oBAAoB,cAAc;EAChC,CAAA;CAEP,EAAA,CAAA;AAEN"}

package/dist/react/utils/useFileDiffInstance.d.ts

@@ -1,12 +1,15 @@
-import { DiffLineAnnotation, FileDiffMetadata, SelectedLineRange, VirtualFileMetrics } from "../../types.js";
+import { DiffLineAnnotation, FileContents, FileDiffMetadata, SelectedLineRange, VirtualFileMetrics } from "../../types.js";
 import { GetHoveredLineResult } from "../../managers/InteractionManager.js";
-import { FileDiffOptions } from "../../components/FileDiff.js";
+import { FileDiffEditChangeHandler, FileDiffEditCompleteHandler, FileDiffOptions } from "../../components/FileDiff.js";
 import { EditorOptions } from "../../editor/editor.js";
 //#region src/react/utils/useFileDiffInstance.d.ts
-interface UseFileDiffInstanceProps<LAnnotation> {
-  fileDiff: FileDiffMetadata;
-  options: FileDiffOptions<LAnnotation> | undefined;
-  editorOptions: EditorOptions<LAnnotation> | undefined;
+interface UseFileDiffInstanceProps<LAnnotation, Caret> {
+  fileDiff?: FileDiffMetadata;
+  oldFile?: FileContents | null;
+  newFile?: FileContents | null;
+  options: FileDiffOptions<LAnnotation, Caret> | undefined;
+  editorOptions: EditorOptions<'file-diff', LAnnotation, Caret> | undefined;
+  editStateKey: string | undefined;
   lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;
   selectedLines: SelectedLineRange | null | undefined;
   prerenderedHTML: string | undefined;
@@ -15,15 +18,22 @@ interface UseFileDiffInstanceProps<LAnnotation> {
   hasCustomHeader: boolean;
   disableWorkerPool: boolean;
   edit: boolean;
+  onEditChange?: FileDiffEditChangeHandler<LAnnotation, Caret>;
+  onEditComplete?: FileDiffEditCompleteHandler<LAnnotation, Caret>;
 }
-interface UseFileDiffInstanceReturn {
+interface UseFileDiffInstanceReturn<LAnnotation> {
+  fileDiff: FileDiffMetadata;
   ref(node: HTMLElement | null): void;
   getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;
+  getAnnotationSlotName(annotation: DiffLineAnnotation<LAnnotation>): string;
 }
-declare function useFileDiffInstance<LAnnotation>({
+declare function useFileDiffInstance<LAnnotation, Caret>({
   fileDiff,
+  oldFile,
+  newFile,
   options,
   editorOptions,
+  editStateKey,
   lineAnnotations,
   selectedLines,
   prerenderedHTML,
@@ -31,8 +41,10 @@ declare function useFileDiffInstance<LAnnotation>({
   hasGutterRenderUtility,
   hasCustomHeader,
   disableWorkerPool,
-  edit
-}: UseFileDiffInstanceProps<LAnnotation>): UseFileDiffInstanceReturn;
+  edit,
+  onEditChange: _onEditChange,
+  onEditComplete: _onEditComplete
+}: UseFileDiffInstanceProps<LAnnotation, Caret>): UseFileDiffInstanceReturn<LAnnotation>;
 //#endregion
 export { useFileDiffInstance };
 //# sourceMappingURL=useFileDiffInstance.d.ts.map

package/dist/react/utils/useFileDiffInstance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFileDiffInstance.d.ts","names":[],"sources":["../../../src/react/utils/useFileDiffInstance.ts"],"mappings":";;;;;UA4BU,wBAAA;EACR,QAAA,EAAU,gBAAA;EACV,OAAA,EAAS,eAAA,CAAgB,WAAA;EACzB,aAAA,EAAe,aAAA,CAAc,WAAA;EAC7B,eAAA,EAAiB,kBAAA,CAAmB,WAAA;EACpC,aAAA,EAAe,iBAAA;EACf,eAAA;EACA,OAAA,GAAU,kBAAA;EACV,sBAAA;EACA,eAAA;EACA,iBAAA;EACA,IAAA;AAAA;AAAA,UAGQ,yBAAA;EACR,GAAA,CAAI,IAAA,EAAM,WAAA;EACV,cAAA,IAAkB,oBAAoB;AAAA;AAAA,iBAGxB,mBAAA;EACd,QAAA;EACA,OAAA;EACA,aAAA;EACA,eAAA;EACA,aAAA;EACA,eAAA;EACA,OAAA;EACA,sBAAA;EACA,eAAA;EACA,iBAAA;EACA;AAAA,GACC,wBAAA,CAAyB,WAAA,IAAe,yBAAA"}
+{"version":3,"file":"useFileDiffInstance.d.ts","names":[],"sources":["../../../src/react/utils/useFileDiffInstance.ts"],"mappings":";;;;;UA8DU,wBAAA;EACR,QAAA,GAAW,gBAAA;EACX,OAAA,GAAU,YAAA;EACV,OAAA,GAAU,YAAA;EACV,OAAA,EAAS,eAAA,CAAgB,WAAA,EAAa,KAAA;EACtC,aAAA,EAAe,aAAA,cAA2B,WAAA,EAAa,KAAA;EACvD,YAAA;EACA,eAAA,EAAiB,kBAAA,CAAmB,WAAA;EACpC,aAAA,EAAe,iBAAA;EACf,eAAA;EACA,OAAA,GAAU,kBAAA;EACV,sBAAA;EACA,eAAA;EACA,iBAAA;EACA,IAAA;EACA,YAAA,GAAe,yBAAA,CAA0B,WAAA,EAAa,KAAA;EACtD,cAAA,GAAiB,2BAAA,CAA4B,WAAA,EAAa,KAAA;AAAA;AAAA,UAGlD,yBAAA;EACR,QAAA,EAAU,gBAAA;EACV,GAAA,CAAI,IAAA,EAAM,WAAA;EACV,cAAA,IAAkB,oBAAA;EAClB,qBAAA,CAAsB,UAAA,EAAY,kBAAA,CAAmB,WAAA;AAAA;AAAA,iBAGvC,mBAAA;EACd,QAAA;EACA,OAAA;EACA,OAAA;EACA,OAAA;EACA,aAAA;EACA,YAAA;EACA,eAAA;EACA,aAAA;EACA,eAAA;EACA,OAAA;EACA,sBAAA;EACA,eAAA;EACA,iBAAA;EACA,IAAA;EACA,YAAA,EAAc,aAAA;EACd,cAAA,EAAgB;AAAA,GACf,wBAAA,CACD,WAAA,EACA,KAAA,IACE,yBAAA,CAA0B,WAAA"}

package/dist/react/utils/useFileDiffInstance.js

@@ -1,4 +1,8 @@
 import { areOptionsEqual } from "../../utils/areOptionsEqual.js";
+import { areFileTargetsEqual } from "../../utils/areFileTargetsEqual.js";
+import { getLineAnnotationName } from "../../utils/getLineAnnotationName.js";
+import { areDiffTargetsEqual } from "../../utils/areDiffTargetsEqual.js";
+import { parseDiffFromFile } from "../../utils/parseDiffFromFile.js";
 import { FileDiff } from "../../components/FileDiff.js";
 import { VirtualizedFileDiff } from "../../components/VirtualizedFileDiff.js";
 import { useStableCallback } from "./useStableCallback.js";
@@ -6,15 +10,64 @@ import { useCreateEditor } from "../EditContext.js";
 import { noopRender } from "../constants.js";
 import { WorkerPoolContext } from "../WorkerPoolContext.js";
 import { useVirtualizer } from "../Virtualizer.js";
-import { useCallback, useContext, useEffect, useLayoutEffect, useRef } from "react";
+import { useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef } from "react";
 //#region src/react/utils/useFileDiffInstance.ts
 const useIsomorphicLayoutEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
-function useFileDiffInstance({ fileDiff, options, editorOptions, lineAnnotations, selectedLines, prerenderedHTML, metrics, hasGutterRenderUtility, hasCustomHeader, disableWorkerPool, edit }) {
+function useFileDiffInstance({ fileDiff, oldFile, newFile, 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 = {
+			fileDiff: {
+				installed: event.fileDiff,
+				stale: event.originalFileDiff
+			},
+			filePair: fileDiff == null ? {
+				fileDiff: event.fileDiff,
+				installed: {
+					oldFile: event.oldFile,
+					newFile: event.newFile
+				},
+				stale: {
+					oldFile: oldFile ?? null,
+					newFile: newFile ?? null
+				}
+			} : null,
+			annotations: {
+				installed: event.lineAnnotations,
+				stale: event.originalLineAnnotations
+			}
+		};
+		return decision;
+	});
+	const onEditComplete = _onEditComplete != null ? handleOnEditComplete : void 0;
+	const effectiveFileDiff = useMemo(() => {
+		if (fileDiff != null) return fileDiff;
+		const { current: accepted } = acceptedCache;
+		const filePair = accepted?.filePair;
+		if (accepted != null && filePair != null) {
+			if (isSameFilePair(oldFile, newFile, filePair.stale) || isSameFilePair(oldFile, newFile, filePair.installed)) return filePair.fileDiff;
+			accepted.filePair = null;
+		}
+		return parseDiffFromFile(oldFile ?? null, newFile ?? null, options?.parseDiffOptions);
+	}, [
+		fileDiff,
+		oldFile,
+		newFile,
+		options?.parseDiffOptions
+	]);
 	const instanceRef = useRef(null);
+	const disposeEditorRef = useRef(null);
+	const getEditor = useStableCallback(() => {
+		if (createEditor == null) throw new Error("FileDiff: EditContext is not attached");
+		return createEditor("file-diff", editorOptions ?? {}, editStateKey);
+	});
 	const ref = useStableCallback((fileContainer) => {
 		if (fileContainer != null) {
 			if (instanceRef.current != null) throw new Error("useFileDiffInstance: An instance should not already exist when a node is created");
@@ -22,16 +75,21 @@ function useFileDiffInstance({ fileDiff, options, editorOptions, lineAnnotations
 				controlledSelection,
 				hasCustomHeader,
 				hasGutterRenderUtility,
+				onEditChange,
+				onEditComplete,
 				options
 			}), simpleVirtualizer, metrics, !disableWorkerPool ? poolManager : void 0, true);
 			else instanceRef.current = new FileDiff(mergeFileDiffOptions({
 				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({
-				fileDiff,
+				fileDiff: effectiveFileDiff,
 				fileContainer,
 				lineAnnotations,
 				prerenderedHTML
@@ -40,6 +98,7 @@ function useFileDiffInstance({ fileDiff, options, editorOptions, lineAnnotations
 			if (instanceRef.current == null) throw new Error("useFileDiffInstance: A FileDiff instance should exist when unmounting");
 			instanceRef.current.cleanUp();
 			instanceRef.current = null;
+			disposeEditorRef.current = null;
 		}
 	});
 	useIsomorphicLayoutEffect(() => {
@@ -49,46 +108,77 @@ function useFileDiffInstance({ fileDiff, options, editorOptions, lineAnnotations
 			controlledSelection,
 			hasCustomHeader,
 			hasGutterRenderUtility,
+			onEditChange,
+			onEditComplete,
 			options
 		});
 		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(effectiveFileDiff, lineAnnotations, acceptedCache);
 		instance.render({
 			forceRender,
-			fileDiff,
-			lineAnnotations
+			fileDiff: resolved.fileDiff,
+			lineAnnotations: resolved.lineAnnotations
 		});
 		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("FileDiff: EditContext is not attached");
-			const editor = createEditor(editorOptions ?? {});
-			if (editor == null) throw new Error("FileDiff: EditProvider.createEditor must return an editor instance");
-			try {
-				return editor.edit(instanceRef.current);
-			} catch (error) {
-				editor.cleanUp();
-				throw error;
-			}
-		}
-	}, [edit]);
 	return {
+		fileDiff: effectiveFileDiff,
 		ref,
 		getHoveredLine: useCallback(() => {
 			return instanceRef.current?.getHoveredLine();
-		}, [])
+		}, []),
+		getAnnotationSlotName: useCallback((annotation) => instanceRef.current?.getAnnotationSlotName(annotation) ?? getLineAnnotationName(annotation), [])
 	};
 }
-function mergeFileDiffOptions({ options, controlledSelection, hasCustomHeader, hasGutterRenderUtility }) {
-	if (!(controlledSelection || hasGutterRenderUtility || hasCustomHeader)) return options;
+function isSameFilePair(oldFile, newFile, filePair) {
+	return areFileTargetsEqual(oldFile ?? void 0, filePair.oldFile ?? void 0) && areFileTargetsEqual(newFile ?? void 0, filePair.newFile ?? void 0);
+}
+function resolveAcceptedValues(fileDiff, lineAnnotations, acceptedCache) {
+	const { current: accepted } = acceptedCache;
+	if (accepted == null) return {
+		fileDiff,
+		lineAnnotations
+	};
+	const { fileDiff: acceptedDiff, annotations: acceptedAnnotations } = accepted;
+	let resolvedFileDiff = fileDiff;
+	if (acceptedDiff != null) if (areDiffTargetsEqual(fileDiff, acceptedDiff.stale)) resolvedFileDiff = acceptedDiff.installed;
+	else accepted.fileDiff = null;
+	let resolvedAnnotations = lineAnnotations;
+	if (acceptedAnnotations != null) if (lineAnnotations === acceptedAnnotations.stale) resolvedAnnotations = acceptedAnnotations.installed;
+	else accepted.annotations = null;
+	if (accepted.fileDiff == null && accepted.annotations == null && accepted.filePair == null) acceptedCache.current = null;
+	return {
+		fileDiff: resolvedFileDiff,
+		lineAnnotations: resolvedAnnotations
+	};
+}
+function mergeFileDiffOptions({ 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 { useFileDiffInstance };
 

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

@@ -1 +1 @@
-{"version":3,"file":"useFileDiffInstance.js","names":[],"sources":["../../../src/react/utils/useFileDiffInstance.ts"],"sourcesContent":["import {\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n} from 'react';\n\nimport { FileDiff, type FileDiffOptions } from '../../components/FileDiff';\nimport { VirtualizedFileDiff } from '../../components/VirtualizedFileDiff';\nimport type { EditorOptions } from '../../edit';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type {\n  DiffLineAnnotation,\n  FileDiffMetadata,\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 UseFileDiffInstanceProps<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  options: FileDiffOptions<LAnnotation> | undefined;\n  editorOptions: EditorOptions<LAnnotation> | undefined;\n  lineAnnotations: DiffLineAnnotation<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}\n\ninterface UseFileDiffInstanceReturn {\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n}\n\nexport function useFileDiffInstance<LAnnotation>({\n  fileDiff,\n  options,\n  editorOptions,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  metrics,\n  hasGutterRenderUtility,\n  hasCustomHeader,\n  disableWorkerPool,\n  edit,\n}: UseFileDiffInstanceProps<LAnnotation>): UseFileDiffInstanceReturn {\n  const simpleVirtualizer = useVirtualizer();\n  const controlledSelection = selectedLines !== undefined;\n  const poolManager = useContext(WorkerPoolContext);\n  const createEditor = useCreateEditor<LAnnotation>();\n  const instanceRef = useRef<\n    FileDiff<LAnnotation> | VirtualizedFileDiff<LAnnotation> | null\n  >(null);\n  const ref = useStableCallback((fileContainer: HTMLElement | null) => {\n    if (fileContainer != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'useFileDiffInstance: An instance should not already exist when a node is created'\n        );\n      }\n      if (simpleVirtualizer != null) {\n        instanceRef.current = new VirtualizedFileDiff(\n          mergeFileDiffOptions({\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 FileDiff(\n          mergeFileDiffOptions({\n            controlledSelection,\n            hasCustomHeader,\n            hasGutterRenderUtility,\n            options,\n          }),\n          !disableWorkerPool ? poolManager : undefined,\n          true\n        );\n      }\n      void instanceRef.current.hydrate({\n        fileDiff,\n        fileContainer,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error(\n          'useFileDiffInstance: A FileDiff instance should exist when unmounting'\n        );\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n    }\n  });\n\n  useIsomorphicLayoutEffect(() => {\n    const { current: instance } = instanceRef;\n    if (instance == null) return;\n    const newOptions = mergeFileDiffOptions({\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(instance.options, newOptions);\n    instance.setOptions(newOptions);\n    void instance.render({\n      forceRender,\n      fileDiff,\n      lineAnnotations,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n  });\n\n  useIsomorphicLayoutEffect(() => {\n    if (edit && instanceRef.current != null) {\n      if (createEditor === undefined) {\n        throw new Error('FileDiff: EditContext is not attached');\n      }\n      const editor = createEditor(editorOptions ?? {});\n      if (editor == null) {\n        throw new Error(\n          'FileDiff: 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<'diff'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n\n  return {\n    ref,\n    getHoveredLine,\n  };\n}\n\ninterface MergeFileDiffOptionsProps<LAnnotation> {\n  controlledSelection: boolean;\n  hasCustomHeader: boolean;\n  hasGutterRenderUtility: boolean;\n  options: FileDiffOptions<LAnnotation> | undefined;\n}\n\nfunction mergeFileDiffOptions<LAnnotation>({\n  options,\n  controlledSelection,\n  hasCustomHeader,\n  hasGutterRenderUtility,\n}: MergeFileDiffOptionsProps<LAnnotation>):\n  | FileDiffOptions<LAnnotation>\n  | 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;AAqB9C,SAAgB,oBAAiC,EAC/C,UACA,SACA,eACA,iBACA,eACA,iBACA,SACA,wBACA,iBACA,mBACA,QACmE;CACnE,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,kBAAsC;EACnE,IAAI,iBAAiB,MAAM;GACzB,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,kFACF;GAEF,IAAI,qBAAqB,MACvB,YAAY,UAAU,IAAI,oBACxB,qBAAqB;IACnB;IACA;IACA;IACA;GACF,CAAC,GACD,mBACA,SACA,CAAC,oBAAoB,cAAc,KAAA,GACnC,IACF;QAEA,YAAY,UAAU,IAAI,SACxB,qBAAqB;IACnB;IACA;IACA;IACA;GACF,CAAC,GACD,CAAC,oBAAoB,cAAc,KAAA,GACnC,IACF;GAEF,YAAiB,QAAQ,QAAQ;IAC/B;IACA;IACA;IACA;GACF,CAAC;EACH,OAAO;GACL,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,uEACF;GAEF,YAAY,QAAQ,QAAQ;GAC5B,YAAY,UAAU;EACxB;CACF,CAAC;CAED,gCAAgC;EAC9B,MAAM,EAAE,SAAS,aAAa;EAC9B,IAAI,YAAY,MAAM;EACtB,MAAM,aAAa,qBAAqB;GACtC;GACA;GACA;GACA;EACF,CAAC;EAID,MAAM,cACJ,eAAe,KAAA,KACf,CAAC,gBAAgB,SAAS,SAAS,UAAU;EAC/C,SAAS,WAAW,UAAU;EAC9B,SAAc,OAAO;GACnB;GACA;GACA;EACF,CAAC;EACD,IAAI,kBAAkB,KAAA,GACpB,SAAS,iBAAiB,aAAa;CAE3C,CAAC;CAED,gCAAgC;EAC9B,IAAI,QAAQ,YAAY,WAAW,MAAM;GACvC,IAAI,iBAAiB,KAAA,GACnB,MAAM,IAAI,MAAM,uCAAuC;GAEzD,MAAM,SAAS,aAAa,iBAAiB,CAAC,CAAC;GAC/C,IAAI,UAAU,MACZ,MAAM,IAAI,MACR,oEACF;GAEF,IAAI;IACF,OAAO,OAAO,KAAK,YAAY,OAAO;GACxC,SAAS,OAAO;IACd,OAAO,QAAQ;IACf,MAAM;GACR;EACF;CAEF,GAAG,CAAC,IAAI,CAAC;CAQT,OAAO;EACL;EACA,gBARqB,kBAEN;GACf,OAAO,YAAY,SAAS,eAAe;EAC7C,GAAG,CAAC,CAIW;CACf;AACF;AASA,SAAS,qBAAkC,EACzC,SACA,qBACA,iBACA,0BAGY;CAIZ,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":"useFileDiffInstance.js","names":[],"sources":["../../../src/react/utils/useFileDiffInstance.ts"],"sourcesContent":["import {\n  type RefObject,\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useMemo,\n  useRef,\n} from 'react';\n\nimport {\n  FileDiff,\n  type FileDiffEditChangeHandler,\n  type FileDiffEditCompleteEvent,\n  type FileDiffEditCompleteHandler,\n  type FileDiffOptions,\n} from '../../components/FileDiff';\nimport { VirtualizedFileDiff } from '../../components/VirtualizedFileDiff';\nimport type { Editor, EditorChangeEvent, EditorOptions } from '../../edit';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type {\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n  SelectedLineRange,\n  VirtualFileMetrics,\n} from '../../types';\nimport { areDiffTargetsEqual } from '../../utils/areDiffTargetsEqual';\nimport { areFileTargetsEqual } from '../../utils/areFileTargetsEqual';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport { getLineAnnotationName } from '../../utils/getLineAnnotationName';\nimport { parseDiffFromFile } from '../../utils/parseDiffFromFile';\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 AcceptedFilePair {\n  oldFile: FileContents | null;\n  newFile: FileContents | null;\n}\n\ninterface AcceptedCompletion<LAnnotation> {\n  fileDiff: {\n    installed: FileDiffMetadata;\n    stale: FileDiffMetadata;\n  } | null;\n  filePair: {\n    fileDiff: FileDiffMetadata;\n    installed: AcceptedFilePair;\n    stale: AcceptedFilePair;\n  } | null;\n  annotations: {\n    installed: DiffLineAnnotation<LAnnotation>[] | undefined;\n    stale: DiffLineAnnotation<LAnnotation>[];\n  } | null;\n}\n\ninterface UseFileDiffInstanceProps<LAnnotation, Caret> {\n  fileDiff?: FileDiffMetadata;\n  oldFile?: FileContents | null;\n  newFile?: FileContents | null;\n  options: FileDiffOptions<LAnnotation, Caret> | undefined;\n  editorOptions: EditorOptions<'file-diff', LAnnotation, Caret> | undefined;\n  editStateKey: string | undefined;\n  lineAnnotations: DiffLineAnnotation<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?: FileDiffEditChangeHandler<LAnnotation, Caret>;\n  onEditComplete?: FileDiffEditCompleteHandler<LAnnotation, Caret>;\n}\n\ninterface UseFileDiffInstanceReturn<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n  getAnnotationSlotName(annotation: DiffLineAnnotation<LAnnotation>): string;\n}\n\nexport function useFileDiffInstance<LAnnotation, Caret>({\n  fileDiff,\n  oldFile,\n  newFile,\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}: UseFileDiffInstanceProps<\n  LAnnotation,\n  Caret\n>): UseFileDiffInstanceReturn<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-diff', LAnnotation, Caret>) =>\n      _onEditChange?.(event)\n  );\n  const onEditChange = _onEditChange != null ? handleOnEditChange : undefined;\n  // An accepted completion installs its diff on the instance immediately,\n  // but the fileDiff/lineAnnotations props stay pre-edit until the owner's\n  // state update lands. This holds the accepted values so the renders in\n  // between do not repaint pre-edit state.\n  const acceptedCache = useRef<AcceptedCompletion<LAnnotation> | null>(null);\n  const handleOnEditComplete = useStableCallback(\n    (event: FileDiffEditCompleteEvent<LAnnotation, Caret>) => {\n      const decision = _onEditComplete?.(event) ?? 'reject';\n      if (decision === 'accept') {\n        acceptedCache.current = {\n          fileDiff: {\n            installed: event.fileDiff,\n            stale: event.originalFileDiff,\n          },\n          filePair:\n            fileDiff == null\n              ? {\n                  fileDiff: event.fileDiff,\n                  installed: { oldFile: event.oldFile, newFile: event.newFile },\n                  stale: { oldFile: oldFile ?? null, newFile: newFile ?? null },\n                }\n              : null,\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  // File-pair inputs parse here. While the file props still match the pair\n  // from acceptance time (stale) or the completion event's files (installed),\n  // the parse is the accepted diff itself; any other pair clears the record\n  // and parses fresh.\n  const effectiveFileDiff = useMemo(() => {\n    if (fileDiff != null) {\n      return fileDiff;\n    }\n    const { current: accepted } = acceptedCache;\n    const filePair = accepted?.filePair;\n    if (accepted != null && filePair != null) {\n      if (\n        isSameFilePair(oldFile, newFile, filePair.stale) ||\n        isSameFilePair(oldFile, newFile, filePair.installed)\n      ) {\n        return filePair.fileDiff;\n      }\n      accepted.filePair = null;\n    }\n    return parseDiffFromFile(\n      oldFile ?? null,\n      newFile ?? null,\n      options?.parseDiffOptions\n    );\n  }, [fileDiff, oldFile, newFile, options?.parseDiffOptions]);\n  const instanceRef = useRef<\n    | FileDiff<LAnnotation, Caret>\n    | VirtualizedFileDiff<LAnnotation, Caret>\n    | null\n  >(null);\n  const disposeEditorRef = useRef<() => void>(null);\n  const getEditor = useStableCallback(() => {\n    if (createEditor == null) {\n      throw new Error('FileDiff: EditContext is not attached');\n    }\n    return createEditor('file-diff', editorOptions ?? {}, editStateKey);\n  });\n  const ref = useStableCallback((fileContainer: HTMLElement | null) => {\n    if (fileContainer != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'useFileDiffInstance: An instance should not already exist when a node is created'\n        );\n      }\n      if (simpleVirtualizer != null) {\n        instanceRef.current = new VirtualizedFileDiff(\n          mergeFileDiffOptions({\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 FileDiff(\n          mergeFileDiffOptions({\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        fileDiff: effectiveFileDiff,\n        fileContainer,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error(\n          'useFileDiffInstance: A FileDiff instance should exist when unmounting'\n        );\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 = mergeFileDiffOptions({\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      effectiveFileDiff,\n      lineAnnotations,\n      acceptedCache\n    );\n    void instance.render({\n      forceRender,\n      fileDiff: resolved.fileDiff,\n      lineAnnotations: resolved.lineAnnotations,\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<'diff'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n  const getAnnotationSlotName = useCallback(\n    (annotation: DiffLineAnnotation<LAnnotation>): string =>\n      instanceRef.current?.getAnnotationSlotName(annotation) ??\n      getLineAnnotationName(annotation),\n    []\n  );\n\n  return {\n    fileDiff: effectiveFileDiff,\n    ref,\n    getHoveredLine,\n    getAnnotationSlotName,\n  };\n}\n\n// Whether the file props name the same files as a recorded pair.\nfunction isSameFilePair(\n  oldFile: FileContents | null | undefined,\n  newFile: FileContents | null | undefined,\n  filePair: AcceptedFilePair\n): boolean {\n  return (\n    areFileTargetsEqual(oldFile ?? undefined, filePair.oldFile ?? undefined) &&\n    areFileTargetsEqual(newFile ?? undefined, filePair.newFile ?? undefined)\n  );\n}\n\n// Render the installed values in place of props that still match their stale\n// counterparts. Any other prop value clears its slot — filePair settles in\n// the parse memo instead — and the ref clears once all three have.\nfunction resolveAcceptedValues<LAnnotation>(\n  fileDiff: FileDiffMetadata,\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined,\n  acceptedCache: RefObject<AcceptedCompletion<LAnnotation> | null>\n): {\n  fileDiff: FileDiffMetadata;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n} {\n  const { current: accepted } = acceptedCache;\n  if (accepted == null) {\n    return { fileDiff, lineAnnotations };\n  }\n  const { fileDiff: acceptedDiff, annotations: acceptedAnnotations } = accepted;\n  let resolvedFileDiff = fileDiff;\n  if (acceptedDiff != null) {\n    if (areDiffTargetsEqual(fileDiff, acceptedDiff.stale)) {\n      resolvedFileDiff = acceptedDiff.installed;\n    } else {\n      accepted.fileDiff = 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 (\n    accepted.fileDiff == null &&\n    accepted.annotations == null &&\n    accepted.filePair == null\n  ) {\n    acceptedCache.current = null;\n  }\n  return { fileDiff: resolvedFileDiff, lineAnnotations: resolvedAnnotations };\n}\n\ninterface MergeFileDiffOptionsProps<LAnnotation, Caret> {\n  controlledSelection: boolean;\n  hasCustomHeader: boolean;\n  hasGutterRenderUtility: boolean;\n  onEditChange?: FileDiffEditChangeHandler<LAnnotation, Caret>;\n  onEditComplete?: FileDiffEditCompleteHandler<LAnnotation, Caret>;\n  options: FileDiffOptions<LAnnotation, Caret> | undefined;\n}\n\nfunction mergeFileDiffOptions<LAnnotation, Caret>({\n  options,\n  controlledSelection,\n  hasCustomHeader,\n  hasGutterRenderUtility,\n  onEditChange,\n  onEditComplete,\n}: MergeFileDiffOptionsProps<LAnnotation, Caret>):\n  | FileDiffOptions<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: FileDiff<LAnnotation, Caret>,\n  getEditor: () => Editor<'file-diff', 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/react/utils/useFileInstance.d.ts

@@ -1,12 +1,13 @@
 import { FileContents, LineAnnotation, SelectedLineRange, VirtualFileMetrics } from "../../types.js";
 import { GetHoveredLineResult } from "../../managers/InteractionManager.js";
-import { FileOptions } from "../../components/File.js";
+import { FileEditChangeHandler, FileEditCompleteHandler, FileOptions } from "../../components/File.js";
 import { EditorOptions } from "../../editor/editor.js";
 //#region src/react/utils/useFileInstance.d.ts
-interface UseFileInstanceProps<LAnnotation> {
+interface UseFileInstanceProps<LAnnotation, Caret> {
   file: FileContents;
-  options: FileOptions<LAnnotation> | undefined;
-  editorOptions: EditorOptions<LAnnotation> | undefined;
+  options: FileOptions<LAnnotation, Caret> | undefined;
+  editorOptions: EditorOptions<'file', LAnnotation, Caret> | undefined;
+  editStateKey: string | undefined;
   lineAnnotations: LineAnnotation<LAnnotation>[] | undefined;
   selectedLines: SelectedLineRange | null | undefined;
   prerenderedHTML: string | undefined;
@@ -15,16 +16,19 @@ interface UseFileInstanceProps<LAnnotation> {
   hasCustomHeader: boolean;
   disableWorkerPool: boolean;
   edit: boolean;
-  onChange?: (file: FileContents, lineAnnotations?: LineAnnotation<LAnnotation>[]) => void;
+  onEditChange?: FileEditChangeHandler<LAnnotation, Caret>;
+  onEditComplete?: FileEditCompleteHandler<LAnnotation, Caret>;
 }
-interface UseFileInstanceReturn {
+interface UseFileInstanceReturn<LAnnotation> {
   ref(node: HTMLElement | null): void;
   getHoveredLine(): GetHoveredLineResult<'file'> | undefined;
+  getAnnotationSlotName(annotation: LineAnnotation<LAnnotation>): string;
 }
-declare function useFileInstance<LAnnotation>({
+declare function useFileInstance<LAnnotation, Caret>({
   file,
   options,
   editorOptions,
+  editStateKey,
   lineAnnotations,
   selectedLines,
   prerenderedHTML,
@@ -32,8 +36,10 @@ declare function useFileInstance<LAnnotation>({
   hasGutterRenderUtility,
   hasCustomHeader,
   disableWorkerPool,
-  edit
-}: UseFileInstanceProps<LAnnotation>): UseFileInstanceReturn;
+  edit,
+  onEditChange: _onEditChange,
+  onEditComplete: _onEditComplete
+}: UseFileInstanceProps<LAnnotation, Caret>): UseFileInstanceReturn<LAnnotation>;
 //#endregion
 export { useFileInstance };
 //# sourceMappingURL=useFileInstance.d.ts.map

package/dist/react/utils/useFileInstance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFileInstance.d.ts","names":[],"sources":["../../../src/react/utils/useFileInstance.ts"],"mappings":";;;;;UA4BU,oBAAA;EACR,IAAA,EAAM,YAAA;EACN,OAAA,EAAS,WAAA,CAAY,WAAA;EACrB,aAAA,EAAe,aAAA,CAAc,WAAA;EAC7B,eAAA,EAAiB,cAAA,CAAe,WAAA;EAChC,aAAA,EAAe,iBAAA;EACf,eAAA;EACA,OAAA,GAAU,kBAAA;EACV,sBAAA;EACA,eAAA;EACA,iBAAA;EACA,IAAA;EACA,QAAA,IACE,IAAA,EAAM,YAAA,EACN,eAAA,GAAkB,cAAA,CAAe,WAAA;AAAA;AAAA,UAI3B,qBAAA;EACR,GAAA,CAAI,IAAA,EAAM,WAAA;EACV,cAAA,IAAkB,oBAAoB;AAAA;AAAA,iBAGxB,eAAA;EACd,IAAA;EACA,OAAA;EACA,aAAA;EACA,eAAA;EACA,aAAA;EACA,eAAA;EACA,OAAA;EACA,sBAAA;EACA,eAAA;EACA,iBAAA;EACA;AAAA,GACC,oBAAA,CAAqB,WAAA,IAAe,qBAAA"}
+{"version":3,"file":"useFileInstance.d.ts","names":[],"sources":["../../../src/react/utils/useFileInstance.ts"],"mappings":";;;;;UAgDU,oBAAA;EACR,IAAA,EAAM,YAAA;EACN,OAAA,EAAS,WAAA,CAAY,WAAA,EAAa,KAAA;EAClC,aAAA,EAAe,aAAA,SAAsB,WAAA,EAAa,KAAA;EAClD,YAAA;EACA,eAAA,EAAiB,cAAA,CAAe,WAAA;EAChC,aAAA,EAAe,iBAAA;EACf,eAAA;EACA,OAAA,GAAU,kBAAA;EACV,sBAAA;EACA,eAAA;EACA,iBAAA;EACA,IAAA;EACA,YAAA,GAAe,qBAAA,CAAsB,WAAA,EAAa,KAAA;EAClD,cAAA,GAAiB,uBAAA,CAAwB,WAAA,EAAa,KAAA;AAAA;AAAA,UAG9C,qBAAA;EACR,GAAA,CAAI,IAAA,EAAM,WAAA;EACV,cAAA,IAAkB,oBAAA;EAClB,qBAAA,CAAsB,UAAA,EAAY,cAAA,CAAe,WAAA;AAAA;AAAA,iBAGnC,eAAA;EACd,IAAA;EACA,OAAA;EACA,aAAA;EACA,YAAA;EACA,eAAA;EACA,aAAA;EACA,eAAA;EACA,OAAA;EACA,sBAAA;EACA,eAAA;EACA,iBAAA;EACA,IAAA;EACA,YAAA,EAAc,aAAA;EACd,cAAA,EAAgB;AAAA,GACf,oBAAA,CACD,WAAA,EACA,KAAA,IACE,qBAAA,CAAsB,WAAA"}