@pierre/diffs 1.3.6 → 1.4.1

package/dist/react/FileDiff.d.ts

@@ -1,15 +1,18 @@
 import { FileDiffMetadata } from "../types.js";
+import { FileDiffEditCompleteEvent } from "../editor/types.js";
+import { FileDiffEditChangeHandler, FileDiffEditCompleteHandler } from "../components/FileDiff.js";
 import { DiffBasePropsReact } from "./types.js";
 
 //#region src/react/FileDiff.d.ts
-interface FileDiffProps<LAnnotation> extends DiffBasePropsReact<LAnnotation> {
+interface FileDiffProps<LAnnotation, Caret> extends DiffBasePropsReact<LAnnotation, Caret> {
   fileDiff: FileDiffMetadata;
   disableWorkerPool?: boolean;
 }
-declare function FileDiff<LAnnotation = undefined>({
+declare function FileDiff<LAnnotation = undefined, Caret = undefined>({
   fileDiff,
   options,
   editorOptions,
+  editStateKey,
   metrics,
   lineAnnotations,
   selectedLines,
@@ -23,8 +26,10 @@ declare function FileDiff<LAnnotation = undefined>({
   renderHeaderMetadata,
   renderGutterUtility,
   disableWorkerPool,
-  edit
-}: FileDiffProps<LAnnotation>): React.JSX.Element;
+  edit,
+  onEditChange,
+  onEditComplete
+}: FileDiffProps<LAnnotation, Caret>): React.JSX.Element;
 //#endregion
-export { FileDiff, type FileDiffMetadata, FileDiffProps };
+export { FileDiff, type FileDiffEditChangeHandler, type FileDiffEditCompleteEvent, type FileDiffEditCompleteHandler, type FileDiffMetadata, FileDiffProps };
 //# sourceMappingURL=FileDiff.d.ts.map

package/dist/react/FileDiff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileDiff.d.ts","names":[],"sources":["../../src/react/FileDiff.tsx"],"mappings":";;;;UAWiB,aAAA,sBAEP,kBAAA,CAAmB,WAAA;EAC3B,QAAA,EAAU,gBAAA;EACV,iBAAA;AAAA;AAAA,iBAGc,QAAA;EACd,QAAA;EACA,OAAA;EACA,aAAA;EACA,OAAA;EACA,eAAA;EACA,aAAA;EACA,SAAA;EACA,KAAA;EACA,eAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;EACA,0BAAA;EACA,oBAAA;EACA,mBAAA;EACA,iBAAA;EACA;AAAA,GACC,aAAA,CAAc,WAAA,IAAe,KAAA,CAAM,GAAA,CAAI,OAAA"}
+{"version":3,"file":"FileDiff.d.ts","names":[],"sources":["../../src/react/FileDiff.tsx"],"mappings":";;;;;;UAqBiB,aAAA,6BAA0C,kBAAA,CACzD,WAAA,EACA,KAAA;EAEA,QAAA,EAAU,gBAAA;EACV,iBAAA;AAAA;AAAA,iBAGc,QAAA;EACd,QAAA;EACA,OAAA;EACA,aAAA;EACA,YAAA;EACA,OAAA;EACA,eAAA;EACA,aAAA;EACA,SAAA;EACA,KAAA;EACA,eAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;EACA,0BAAA;EACA,oBAAA;EACA,mBAAA;EACA,iBAAA;EACA,IAAA;EACA,YAAA;EACA;AAAA,GACC,aAAA,CAAc,WAAA,EAAa,KAAA,IAAS,KAAA,CAAM,GAAA,CAAI,OAAA"}

package/dist/react/FileDiff.js

@@ -5,11 +5,12 @@ import { templateRender } from "./utils/templateRender.js";
 import { useFileDiffInstance } from "./utils/useFileDiffInstance.js";
 import { jsx } from "react/jsx-runtime";
 //#region src/react/FileDiff.tsx
-function FileDiff({ fileDiff, options, editorOptions, metrics, lineAnnotations, selectedLines, className, style, prerenderedHTML, renderAnnotation, renderCustomHeader, renderHeaderPrefix, renderHeaderFilenameSuffix, renderHeaderMetadata, renderGutterUtility, disableWorkerPool = false, edit = false }) {
-	const { ref, getHoveredLine } = useFileDiffInstance({
+function FileDiff({ fileDiff, options, editorOptions, editStateKey, metrics, lineAnnotations, selectedLines, className, style, prerenderedHTML, renderAnnotation, renderCustomHeader, renderHeaderPrefix, renderHeaderFilenameSuffix, renderHeaderMetadata, renderGutterUtility, disableWorkerPool = false, edit = false, onEditChange, onEditComplete }) {
+	const { ref, getHoveredLine, getAnnotationSlotName } = useFileDiffInstance({
 		fileDiff,
 		options,
 		editorOptions,
+		editStateKey,
 		metrics,
 		lineAnnotations,
 		selectedLines,
@@ -17,7 +18,9 @@ function FileDiff({ fileDiff, options, editorOptions, metrics, lineAnnotations,
 		hasGutterRenderUtility: renderGutterUtility != null,
 		hasCustomHeader: renderCustomHeader != null,
 		disableWorkerPool,
-		edit
+		edit,
+		onEditChange,
+		onEditComplete
 	});
 	return /* @__PURE__ */ jsx(DIFFS_TAG_NAME, {
 		ref,
@@ -32,7 +35,8 @@ function FileDiff({ fileDiff, options, editorOptions, metrics, lineAnnotations,
 			renderAnnotation,
 			renderGutterUtility,
 			lineAnnotations,
-			getHoveredLine
+			getHoveredLine,
+			getAnnotationSlotName
 		}), prerenderedHTML)
 	});
 }

package/dist/react/FileDiff.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileDiff.js","names":[],"sources":["../../src/react/FileDiff.tsx"],"sourcesContent":["'use client';\n\nimport { DIFFS_TAG_NAME } from '../constants';\nimport type { FileDiffMetadata } from '../types';\nimport type { DiffBasePropsReact } from './types';\nimport { renderDiffChildren } from './utils/renderDiffChildren';\nimport { templateRender } from './utils/templateRender';\nimport { useFileDiffInstance } from './utils/useFileDiffInstance';\n\nexport type { FileDiffMetadata };\n\nexport interface FileDiffProps<\n  LAnnotation,\n> extends DiffBasePropsReact<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  disableWorkerPool?: boolean;\n}\n\nexport function FileDiff<LAnnotation = undefined>({\n  fileDiff,\n  options,\n  editorOptions,\n  metrics,\n  lineAnnotations,\n  selectedLines,\n  className,\n  style,\n  prerenderedHTML,\n  renderAnnotation,\n  renderCustomHeader,\n  renderHeaderPrefix,\n  renderHeaderFilenameSuffix,\n  renderHeaderMetadata,\n  renderGutterUtility,\n  disableWorkerPool = false,\n  edit = false,\n}: FileDiffProps<LAnnotation>): React.JSX.Element {\n  const { ref, getHoveredLine } = useFileDiffInstance({\n    fileDiff,\n    options,\n    editorOptions,\n    metrics,\n    lineAnnotations,\n    selectedLines,\n    prerenderedHTML,\n    hasGutterRenderUtility: renderGutterUtility != null,\n    hasCustomHeader: renderCustomHeader != null,\n    disableWorkerPool,\n    edit,\n  });\n  const children = renderDiffChildren({\n    fileDiff,\n    renderCustomHeader,\n    renderHeaderPrefix,\n    renderHeaderFilenameSuffix,\n    renderHeaderMetadata,\n    renderAnnotation,\n    renderGutterUtility,\n    lineAnnotations,\n    getHoveredLine,\n  });\n  return (\n    <DIFFS_TAG_NAME ref={ref} className={className} style={style}>\n      {templateRender(children, prerenderedHTML)}\n    </DIFFS_TAG_NAME>\n  );\n}\n"],"mappings":";;;;;;;AAkBA,SAAgB,SAAkC,EAChD,UACA,SACA,eACA,SACA,iBACA,eACA,WACA,OACA,iBACA,kBACA,oBACA,oBACA,4BACA,sBACA,qBACA,oBAAoB,OACpB,OAAO,SACyC;CAChD,MAAM,EAAE,KAAK,mBAAmB,oBAAoB;EAClD;EACA;EACA;EACA;EACA;EACA;EACA;EACA,wBAAwB,uBAAuB;EAC/C,iBAAiB,sBAAsB;EACvC;EACA;CACF,CAAC;CAYD,OACE,oBAAC,gBAAD;EAAqB;EAAgB;EAAkB;YACpD,eAbY,mBAAmB;GAClC;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;EACF,CAG2B,GAAG,eAAe;CAC3B,CAAA;AAEpB"}
+{"version":3,"file":"FileDiff.js","names":[],"sources":["../../src/react/FileDiff.tsx"],"sourcesContent":["'use client';\n\nimport type {\n  FileDiffEditChangeHandler,\n  FileDiffEditCompleteEvent,\n  FileDiffEditCompleteHandler,\n} from '../components/FileDiff';\nimport { DIFFS_TAG_NAME } from '../constants';\nimport type { FileDiffMetadata } from '../types';\nimport type { DiffBasePropsReact } from './types';\nimport { renderDiffChildren } from './utils/renderDiffChildren';\nimport { templateRender } from './utils/templateRender';\nimport { useFileDiffInstance } from './utils/useFileDiffInstance';\n\nexport type {\n  FileDiffEditChangeHandler,\n  FileDiffEditCompleteEvent,\n  FileDiffEditCompleteHandler,\n  FileDiffMetadata,\n};\n\nexport interface FileDiffProps<LAnnotation, Caret> extends DiffBasePropsReact<\n  LAnnotation,\n  Caret\n> {\n  fileDiff: FileDiffMetadata;\n  disableWorkerPool?: boolean;\n}\n\nexport function FileDiff<LAnnotation = undefined, Caret = undefined>({\n  fileDiff,\n  options,\n  editorOptions,\n  editStateKey,\n  metrics,\n  lineAnnotations,\n  selectedLines,\n  className,\n  style,\n  prerenderedHTML,\n  renderAnnotation,\n  renderCustomHeader,\n  renderHeaderPrefix,\n  renderHeaderFilenameSuffix,\n  renderHeaderMetadata,\n  renderGutterUtility,\n  disableWorkerPool = false,\n  edit = false,\n  onEditChange,\n  onEditComplete,\n}: FileDiffProps<LAnnotation, Caret>): React.JSX.Element {\n  const { ref, getHoveredLine, getAnnotationSlotName } = useFileDiffInstance({\n    fileDiff,\n    options,\n    editorOptions,\n    editStateKey,\n    metrics,\n    lineAnnotations,\n    selectedLines,\n    prerenderedHTML,\n    hasGutterRenderUtility: renderGutterUtility != null,\n    hasCustomHeader: renderCustomHeader != null,\n    disableWorkerPool,\n    edit,\n    onEditChange,\n    onEditComplete,\n  });\n  const children = renderDiffChildren({\n    fileDiff,\n    renderCustomHeader,\n    renderHeaderPrefix,\n    renderHeaderFilenameSuffix,\n    renderHeaderMetadata,\n    renderAnnotation,\n    renderGutterUtility,\n    lineAnnotations,\n    getHoveredLine,\n    getAnnotationSlotName,\n  });\n  return (\n    <DIFFS_TAG_NAME ref={ref} className={className} style={style}>\n      {templateRender(children, prerenderedHTML)}\n    </DIFFS_TAG_NAME>\n  );\n}\n"],"mappings":";;;;;;;AA6BA,SAAgB,SAAqD,EACnE,UACA,SACA,eACA,cACA,SACA,iBACA,eACA,WACA,OACA,iBACA,kBACA,oBACA,oBACA,4BACA,sBACA,qBACA,oBAAoB,OACpB,OAAO,OACP,cACA,kBACuD;CACvD,MAAM,EAAE,KAAK,gBAAgB,0BAA0B,oBAAoB;EACzE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,wBAAwB,uBAAuB;EAC/C,iBAAiB,sBAAsB;EACvC;EACA;EACA;EACA;CACF,CAAC;CAaD,OACE,oBAAC,gBAAD;EAAqB;EAAgB;EAAkB;YACpD,eAdY,mBAAmB;GAClC;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;EACF,CAG2B,GAAG,eAAe;CAC3B,CAAA;AAEpB"}

package/dist/react/MultiFileDiff.d.ts

@@ -2,15 +2,16 @@ import { DiffFileInput, FileContents } from "../types.js";
 import { DiffBasePropsReact } from "./types.js";
 
 //#region src/react/MultiFileDiff.d.ts
-interface MultiFileDiffBaseProps<LAnnotation> extends DiffBasePropsReact<LAnnotation> {
+interface MultiFileDiffBaseProps<LAnnotation, Caret> extends DiffBasePropsReact<LAnnotation, Caret> {
   disableWorkerPool?: boolean;
 }
-type MultiFileDiffProps<LAnnotation> = MultiFileDiffBaseProps<LAnnotation> & DiffFileInput;
-declare function MultiFileDiff<LAnnotation = undefined>({
+type MultiFileDiffProps<LAnnotation, Caret> = MultiFileDiffBaseProps<LAnnotation, Caret> & DiffFileInput;
+declare function MultiFileDiff<LAnnotation = undefined, Caret = undefined>({
   oldFile,
   newFile,
   options,
   editorOptions,
+  editStateKey,
   metrics,
   lineAnnotations,
   selectedLines,
@@ -24,8 +25,10 @@ declare function MultiFileDiff<LAnnotation = undefined>({
   renderHeaderMetadata,
   renderGutterUtility,
   disableWorkerPool,
-  edit
-}: MultiFileDiffProps<LAnnotation>): React.JSX.Element;
+  edit,
+  onEditChange,
+  onEditComplete
+}: MultiFileDiffProps<LAnnotation, Caret>): React.JSX.Element;
 //#endregion
 export { type FileContents, MultiFileDiff, MultiFileDiffProps };
 //# sourceMappingURL=MultiFileDiff.d.ts.map

package/dist/react/MultiFileDiff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MultiFileDiff.d.ts","names":[],"sources":["../../src/react/MultiFileDiff.tsx"],"mappings":";;;;UAcU,sBAAA,sBAEA,kBAAkB,CAAC,WAAA;EAC3B,iBAAA;AAAA;AAAA,KAGU,kBAAA,gBACV,sBAAA,CAAuB,WAAA,IAAe,aAAA;AAAA,iBAExB,aAAA;EACd,OAAA;EACA,OAAA;EACA,OAAA;EACA,aAAA;EACA,OAAA;EACA,eAAA;EACA,aAAA;EACA,SAAA;EACA,KAAA;EACA,eAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;EACA,0BAAA;EACA,oBAAA;EACA,mBAAA;EACA,iBAAA;EACA;AAAA,GACC,kBAAA,CAAmB,WAAA,IAAe,KAAA,CAAM,GAAA,CAAI,OAAA"}
+{"version":3,"file":"MultiFileDiff.d.ts","names":[],"sources":["../../src/react/MultiFileDiff.tsx"],"mappings":";;;;UAWU,sBAAA,6BAAmD,kBAAA,CAC3D,WAAA,EACA,KAAA;EAEA,iBAAA;AAAA;AAAA,KAGU,kBAAA,uBAAyC,sBAAA,CACnD,WAAA,EACA,KAAA,IAEA,aAAA;AAAA,iBAEc,aAAA;EACd,OAAA;EACA,OAAA;EACA,OAAA;EACA,aAAA;EACA,YAAA;EACA,OAAA;EACA,eAAA;EACA,aAAA;EACA,SAAA;EACA,KAAA;EACA,eAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;EACA,0BAAA;EACA,oBAAA;EACA,mBAAA;EACA,iBAAA;EACA,IAAA;EACA,YAAA;EACA;AAAA,GACC,kBAAA,CAAmB,WAAA,EAAa,KAAA,IAAS,KAAA,CAAM,GAAA,CAAI,OAAA"}

package/dist/react/MultiFileDiff.js

@@ -1,24 +1,17 @@
 "use client";
 import { DIFFS_TAG_NAME } from "../constants.js";
-import { parseDiffFromFile } from "../utils/parseDiffFromFile.js";
 import { renderDiffChildren } from "./utils/renderDiffChildren.js";
 import { templateRender } from "./utils/templateRender.js";
 import { useFileDiffInstance } from "./utils/useFileDiffInstance.js";
-import { useMemo } from "react";
 import { jsx } from "react/jsx-runtime";
 //#region src/react/MultiFileDiff.tsx
-function MultiFileDiff({ oldFile, newFile, options, editorOptions, metrics, lineAnnotations, selectedLines, className, style, prerenderedHTML, renderAnnotation, renderCustomHeader, renderHeaderPrefix, renderHeaderFilenameSuffix, renderHeaderMetadata, renderGutterUtility, disableWorkerPool = false, edit = false }) {
-	const fileDiff = useMemo(() => {
-		return parseDiffFromFile(oldFile, newFile, options?.parseDiffOptions);
-	}, [
+function MultiFileDiff({ oldFile, newFile, options, editorOptions, editStateKey, metrics, lineAnnotations, selectedLines, className, style, prerenderedHTML, renderAnnotation, renderCustomHeader, renderHeaderPrefix, renderHeaderFilenameSuffix, renderHeaderMetadata, renderGutterUtility, disableWorkerPool = false, edit = false, onEditChange, onEditComplete }) {
+	const { fileDiff, ref, getHoveredLine, getAnnotationSlotName } = useFileDiffInstance({
 		oldFile,
 		newFile,
-		options?.parseDiffOptions
-	]);
-	const { ref, getHoveredLine } = useFileDiffInstance({
-		fileDiff,
 		options,
 		editorOptions,
+		editStateKey,
 		metrics,
 		lineAnnotations,
 		selectedLines,
@@ -26,7 +19,9 @@ function MultiFileDiff({ oldFile, newFile, options, editorOptions, metrics, line
 		hasGutterRenderUtility: renderGutterUtility != null,
 		hasCustomHeader: renderCustomHeader != null,
 		disableWorkerPool,
-		edit
+		edit,
+		onEditChange,
+		onEditComplete
 	});
 	return /* @__PURE__ */ jsx(DIFFS_TAG_NAME, {
 		ref,
@@ -41,7 +36,8 @@ function MultiFileDiff({ oldFile, newFile, options, editorOptions, metrics, line
 			renderAnnotation,
 			lineAnnotations,
 			renderGutterUtility,
-			getHoveredLine
+			getHoveredLine,
+			getAnnotationSlotName
 		}), prerenderedHTML)
 	});
 }

package/dist/react/MultiFileDiff.js.map

@@ -1 +1 @@
-{"version":3,"file":"MultiFileDiff.js","names":[],"sources":["../../src/react/MultiFileDiff.tsx"],"sourcesContent":["'use client';\n\nimport { useMemo } from 'react';\n\nimport { DIFFS_TAG_NAME } from '../constants';\nimport type { DiffFileInput, FileContents } from '../types';\nimport { parseDiffFromFile } from '../utils/parseDiffFromFile';\nimport type { DiffBasePropsReact } from './types';\nimport { renderDiffChildren } from './utils/renderDiffChildren';\nimport { templateRender } from './utils/templateRender';\nimport { useFileDiffInstance } from './utils/useFileDiffInstance';\n\nexport type { FileContents };\n\ninterface MultiFileDiffBaseProps<\n  LAnnotation,\n> extends DiffBasePropsReact<LAnnotation> {\n  disableWorkerPool?: boolean;\n}\n\nexport type MultiFileDiffProps<LAnnotation> =\n  MultiFileDiffBaseProps<LAnnotation> & DiffFileInput;\n\nexport function MultiFileDiff<LAnnotation = undefined>({\n  oldFile,\n  newFile,\n  options,\n  editorOptions,\n  metrics,\n  lineAnnotations,\n  selectedLines,\n  className,\n  style,\n  prerenderedHTML,\n  renderAnnotation,\n  renderCustomHeader,\n  renderHeaderPrefix,\n  renderHeaderFilenameSuffix,\n  renderHeaderMetadata,\n  renderGutterUtility,\n  disableWorkerPool = false,\n  edit = false,\n}: MultiFileDiffProps<LAnnotation>): React.JSX.Element {\n  const fileDiff = useMemo(() => {\n    return parseDiffFromFile(oldFile, newFile, options?.parseDiffOptions);\n  }, [oldFile, newFile, options?.parseDiffOptions]);\n  const { ref, getHoveredLine } = useFileDiffInstance({\n    fileDiff,\n    options,\n    editorOptions,\n    metrics,\n    lineAnnotations,\n    selectedLines,\n    prerenderedHTML,\n    hasGutterRenderUtility: renderGutterUtility != null,\n    hasCustomHeader: renderCustomHeader != null,\n    disableWorkerPool,\n    edit,\n  });\n  const children = renderDiffChildren({\n    fileDiff,\n    renderCustomHeader,\n    renderHeaderPrefix,\n    renderHeaderFilenameSuffix,\n    renderHeaderMetadata,\n    renderAnnotation,\n    lineAnnotations,\n    renderGutterUtility,\n    getHoveredLine,\n  });\n  return (\n    <DIFFS_TAG_NAME ref={ref} className={className} style={style}>\n      {templateRender(children, prerenderedHTML)}\n    </DIFFS_TAG_NAME>\n  );\n}\n"],"mappings":";;;;;;;;;AAuBA,SAAgB,cAAuC,EACrD,SACA,SACA,SACA,eACA,SACA,iBACA,eACA,WACA,OACA,iBACA,kBACA,oBACA,oBACA,4BACA,sBACA,qBACA,oBAAoB,OACpB,OAAO,SAC8C;CACrD,MAAM,WAAW,cAAc;EAC7B,OAAO,kBAAkB,SAAS,SAAS,SAAS,gBAAgB;CACtE,GAAG;EAAC;EAAS;EAAS,SAAS;CAAgB,CAAC;CAChD,MAAM,EAAE,KAAK,mBAAmB,oBAAoB;EAClD;EACA;EACA;EACA;EACA;EACA;EACA;EACA,wBAAwB,uBAAuB;EAC/C,iBAAiB,sBAAsB;EACvC;EACA;CACF,CAAC;CAYD,OACE,oBAAC,gBAAD;EAAqB;EAAgB;EAAkB;YACpD,eAbY,mBAAmB;GAClC;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;EACF,CAG2B,GAAG,eAAe;CAC3B,CAAA;AAEpB"}
+{"version":3,"file":"MultiFileDiff.js","names":[],"sources":["../../src/react/MultiFileDiff.tsx"],"sourcesContent":["'use client';\n\nimport { DIFFS_TAG_NAME } from '../constants';\nimport type { DiffFileInput, FileContents } from '../types';\nimport type { DiffBasePropsReact } from './types';\nimport { renderDiffChildren } from './utils/renderDiffChildren';\nimport { templateRender } from './utils/templateRender';\nimport { useFileDiffInstance } from './utils/useFileDiffInstance';\n\nexport type { FileContents };\n\ninterface MultiFileDiffBaseProps<LAnnotation, Caret> extends DiffBasePropsReact<\n  LAnnotation,\n  Caret\n> {\n  disableWorkerPool?: boolean;\n}\n\nexport type MultiFileDiffProps<LAnnotation, Caret> = MultiFileDiffBaseProps<\n  LAnnotation,\n  Caret\n> &\n  DiffFileInput;\n\nexport function MultiFileDiff<LAnnotation = undefined, Caret = undefined>({\n  oldFile,\n  newFile,\n  options,\n  editorOptions,\n  editStateKey,\n  metrics,\n  lineAnnotations,\n  selectedLines,\n  className,\n  style,\n  prerenderedHTML,\n  renderAnnotation,\n  renderCustomHeader,\n  renderHeaderPrefix,\n  renderHeaderFilenameSuffix,\n  renderHeaderMetadata,\n  renderGutterUtility,\n  disableWorkerPool = false,\n  edit = false,\n  onEditChange,\n  onEditComplete,\n}: MultiFileDiffProps<LAnnotation, Caret>): React.JSX.Element {\n  const { fileDiff, ref, getHoveredLine, getAnnotationSlotName } =\n    useFileDiffInstance({\n      oldFile,\n      newFile,\n      options,\n      editorOptions,\n      editStateKey,\n      metrics,\n      lineAnnotations,\n      selectedLines,\n      prerenderedHTML,\n      hasGutterRenderUtility: renderGutterUtility != null,\n      hasCustomHeader: renderCustomHeader != null,\n      disableWorkerPool,\n      edit,\n      onEditChange,\n      onEditComplete,\n    });\n  const children = renderDiffChildren({\n    fileDiff,\n    renderCustomHeader,\n    renderHeaderPrefix,\n    renderHeaderFilenameSuffix,\n    renderHeaderMetadata,\n    renderAnnotation,\n    lineAnnotations,\n    renderGutterUtility,\n    getHoveredLine,\n    getAnnotationSlotName,\n  });\n  return (\n    <DIFFS_TAG_NAME ref={ref} className={className} style={style}>\n      {templateRender(children, prerenderedHTML)}\n    </DIFFS_TAG_NAME>\n  );\n}\n"],"mappings":";;;;;;;AAwBA,SAAgB,cAA0D,EACxE,SACA,SACA,SACA,eACA,cACA,SACA,iBACA,eACA,WACA,OACA,iBACA,kBACA,oBACA,oBACA,4BACA,sBACA,qBACA,oBAAoB,OACpB,OAAO,OACP,cACA,kBAC4D;CAC5D,MAAM,EAAE,UAAU,KAAK,gBAAgB,0BACrC,oBAAoB;EAClB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,wBAAwB,uBAAuB;EAC/C,iBAAiB,sBAAsB;EACvC;EACA;EACA;EACA;CACF,CAAC;CAaH,OACE,oBAAC,gBAAD;EAAqB;EAAgB;EAAkB;YACpD,eAdY,mBAAmB;GAClC;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;EACF,CAG2B,GAAG,eAAe;CAC3B,CAAA;AAEpB"}

package/dist/react/PatchDiff.d.ts

@@ -1,14 +1,15 @@
 import { DiffBasePropsReact } from "./types.js";
 
 //#region src/react/PatchDiff.d.ts
-interface PatchDiffProps<LAnnotation> extends DiffBasePropsReact<LAnnotation> {
+interface PatchDiffProps<LAnnotation, Caret> extends DiffBasePropsReact<LAnnotation, Caret> {
   patch: string;
   disableWorkerPool?: boolean;
 }
-declare function PatchDiff<LAnnotation = undefined>({
+declare function PatchDiff<LAnnotation = undefined, Caret = undefined>({
   patch,
   options,
   editorOptions,
+  editStateKey,
   metrics,
   lineAnnotations,
   selectedLines,
@@ -22,8 +23,10 @@ declare function PatchDiff<LAnnotation = undefined>({
   renderHeaderMetadata,
   renderGutterUtility,
   disableWorkerPool,
-  edit
-}: PatchDiffProps<LAnnotation>): React.JSX.Element;
+  edit,
+  onEditChange,
+  onEditComplete
+}: PatchDiffProps<LAnnotation, Caret>): React.JSX.Element;
 //#endregion
 export { PatchDiff, PatchDiffProps };
 //# sourceMappingURL=PatchDiff.d.ts.map

package/dist/react/PatchDiff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PatchDiff.d.ts","names":[],"sources":["../../src/react/PatchDiff.tsx"],"mappings":";;;UAYiB,cAAA,sBAEP,kBAAkB,CAAC,WAAA;EAC3B,KAAA;EACA,iBAAA;AAAA;AAAA,iBAGc,SAAA;EACd,KAAA;EACA,OAAA;EACA,aAAA;EACA,OAAA;EACA,eAAA;EACA,aAAA;EACA,SAAA;EACA,KAAA;EACA,eAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;EACA,0BAAA;EACA,oBAAA;EACA,mBAAA;EACA,iBAAA;EACA;AAAA,GACC,cAAA,CAAe,WAAA,IAAe,KAAA,CAAM,GAAA,CAAI,OAAA"}
+{"version":3,"file":"PatchDiff.d.ts","names":[],"sources":["../../src/react/PatchDiff.tsx"],"mappings":";;;UAYiB,cAAA,6BAA2C,kBAAA,CAC1D,WAAA,EACA,KAAA;EAEA,KAAA;EACA,iBAAA;AAAA;AAAA,iBAGc,SAAA;EACd,KAAA;EACA,OAAA;EACA,aAAA;EACA,YAAA;EACA,OAAA;EACA,eAAA;EACA,aAAA;EACA,SAAA;EACA,KAAA;EACA,eAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;EACA,0BAAA;EACA,oBAAA;EACA,mBAAA;EACA,iBAAA;EACA,IAAA;EACA,YAAA;EACA;AAAA,GACC,cAAA,CAAe,WAAA,EAAa,KAAA,IAAS,KAAA,CAAM,GAAA,CAAI,OAAA"}

package/dist/react/PatchDiff.js

@@ -7,12 +7,13 @@ import { useFileDiffInstance } from "./utils/useFileDiffInstance.js";
 import { useMemo } from "react";
 import { jsx } from "react/jsx-runtime";
 //#region src/react/PatchDiff.tsx
-function PatchDiff({ patch, options, editorOptions, metrics, lineAnnotations, selectedLines, className, style, prerenderedHTML, renderAnnotation, renderCustomHeader, renderHeaderPrefix, renderHeaderFilenameSuffix, renderHeaderMetadata, renderGutterUtility, disableWorkerPool = false, edit = false }) {
+function PatchDiff({ patch, options, editorOptions, editStateKey, metrics, lineAnnotations, selectedLines, className, style, prerenderedHTML, renderAnnotation, renderCustomHeader, renderHeaderPrefix, renderHeaderFilenameSuffix, renderHeaderMetadata, renderGutterUtility, disableWorkerPool = false, edit = false, onEditChange, onEditComplete }) {
 	const fileDiff = usePatch(patch);
-	const { ref, getHoveredLine } = useFileDiffInstance({
+	const { ref, getHoveredLine, getAnnotationSlotName } = useFileDiffInstance({
 		fileDiff,
 		options,
 		editorOptions,
+		editStateKey,
 		metrics,
 		lineAnnotations,
 		selectedLines,
@@ -20,7 +21,9 @@ function PatchDiff({ patch, options, editorOptions, metrics, lineAnnotations, se
 		hasGutterRenderUtility: renderGutterUtility != null,
 		hasCustomHeader: renderCustomHeader != null,
 		disableWorkerPool,
-		edit
+		edit,
+		onEditChange,
+		onEditComplete
 	});
 	return /* @__PURE__ */ jsx(DIFFS_TAG_NAME, {
 		ref,
@@ -35,7 +38,8 @@ function PatchDiff({ patch, options, editorOptions, metrics, lineAnnotations, se
 			renderAnnotation,
 			lineAnnotations,
 			renderGutterUtility,
-			getHoveredLine
+			getHoveredLine,
+			getAnnotationSlotName
 		}), prerenderedHTML)
 	});
 }

package/dist/react/PatchDiff.js.map

@@ -1 +1 @@
-{"version":3,"file":"PatchDiff.js","names":[],"sources":["../../src/react/PatchDiff.tsx"],"sourcesContent":["'use client';\n\nimport { useMemo } from 'react';\n\nimport { DIFFS_TAG_NAME } from '../constants';\nimport type { FileDiffMetadata } from '../types';\nimport { getSingularPatch } from '../utils/getSingularPatch';\nimport type { DiffBasePropsReact } from './types';\nimport { renderDiffChildren } from './utils/renderDiffChildren';\nimport { templateRender } from './utils/templateRender';\nimport { useFileDiffInstance } from './utils/useFileDiffInstance';\n\nexport interface PatchDiffProps<\n  LAnnotation,\n> extends DiffBasePropsReact<LAnnotation> {\n  patch: string;\n  disableWorkerPool?: boolean;\n}\n\nexport function PatchDiff<LAnnotation = undefined>({\n  patch,\n  options,\n  editorOptions,\n  metrics,\n  lineAnnotations,\n  selectedLines,\n  className,\n  style,\n  prerenderedHTML,\n  renderAnnotation,\n  renderCustomHeader,\n  renderHeaderPrefix,\n  renderHeaderFilenameSuffix,\n  renderHeaderMetadata,\n  renderGutterUtility,\n  disableWorkerPool = false,\n  edit = false,\n}: PatchDiffProps<LAnnotation>): React.JSX.Element {\n  const fileDiff = usePatch(patch);\n  const { ref, getHoveredLine } = useFileDiffInstance({\n    fileDiff,\n    options,\n    editorOptions,\n    metrics,\n    lineAnnotations,\n    selectedLines,\n    prerenderedHTML,\n    hasGutterRenderUtility: renderGutterUtility != null,\n    hasCustomHeader: renderCustomHeader != null,\n    disableWorkerPool,\n    edit,\n  });\n  const children = renderDiffChildren({\n    fileDiff,\n    renderCustomHeader,\n    renderHeaderPrefix,\n    renderHeaderFilenameSuffix,\n    renderHeaderMetadata,\n    renderAnnotation,\n    lineAnnotations,\n    renderGutterUtility,\n    getHoveredLine,\n  });\n  return (\n    <DIFFS_TAG_NAME ref={ref} className={className} style={style}>\n      {templateRender(children, prerenderedHTML)}\n    </DIFFS_TAG_NAME>\n  );\n}\n\nfunction usePatch(patch: string): FileDiffMetadata {\n  return useMemo<FileDiffMetadata>(() => getSingularPatch(patch), [patch]);\n}\n"],"mappings":";;;;;;;;;AAmBA,SAAgB,UAAmC,EACjD,OACA,SACA,eACA,SACA,iBACA,eACA,WACA,OACA,iBACA,kBACA,oBACA,oBACA,4BACA,sBACA,qBACA,oBAAoB,OACpB,OAAO,SAC0C;CACjD,MAAM,WAAW,SAAS,KAAK;CAC/B,MAAM,EAAE,KAAK,mBAAmB,oBAAoB;EAClD;EACA;EACA;EACA;EACA;EACA;EACA;EACA,wBAAwB,uBAAuB;EAC/C,iBAAiB,sBAAsB;EACvC;EACA;CACF,CAAC;CAYD,OACE,oBAAC,gBAAD;EAAqB;EAAgB;EAAkB;YACpD,eAbY,mBAAmB;GAClC;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;EACF,CAG2B,GAAG,eAAe;CAC3B,CAAA;AAEpB;AAEA,SAAS,SAAS,OAAiC;CACjD,OAAO,cAAgC,iBAAiB,KAAK,GAAG,CAAC,KAAK,CAAC;AACzE"}
+{"version":3,"file":"PatchDiff.js","names":[],"sources":["../../src/react/PatchDiff.tsx"],"sourcesContent":["'use client';\n\nimport { useMemo } from 'react';\n\nimport { DIFFS_TAG_NAME } from '../constants';\nimport type { FileDiffMetadata } from '../types';\nimport { getSingularPatch } from '../utils/getSingularPatch';\nimport type { DiffBasePropsReact } from './types';\nimport { renderDiffChildren } from './utils/renderDiffChildren';\nimport { templateRender } from './utils/templateRender';\nimport { useFileDiffInstance } from './utils/useFileDiffInstance';\n\nexport interface PatchDiffProps<LAnnotation, Caret> extends DiffBasePropsReact<\n  LAnnotation,\n  Caret\n> {\n  patch: string;\n  disableWorkerPool?: boolean;\n}\n\nexport function PatchDiff<LAnnotation = undefined, Caret = undefined>({\n  patch,\n  options,\n  editorOptions,\n  editStateKey,\n  metrics,\n  lineAnnotations,\n  selectedLines,\n  className,\n  style,\n  prerenderedHTML,\n  renderAnnotation,\n  renderCustomHeader,\n  renderHeaderPrefix,\n  renderHeaderFilenameSuffix,\n  renderHeaderMetadata,\n  renderGutterUtility,\n  disableWorkerPool = false,\n  edit = false,\n  onEditChange,\n  onEditComplete,\n}: PatchDiffProps<LAnnotation, Caret>): React.JSX.Element {\n  const fileDiff = usePatch(patch);\n  const { ref, getHoveredLine, getAnnotationSlotName } = useFileDiffInstance({\n    fileDiff,\n    options,\n    editorOptions,\n    editStateKey,\n    metrics,\n    lineAnnotations,\n    selectedLines,\n    prerenderedHTML,\n    hasGutterRenderUtility: renderGutterUtility != null,\n    hasCustomHeader: renderCustomHeader != null,\n    disableWorkerPool,\n    edit,\n    onEditChange,\n    onEditComplete,\n  });\n  const children = renderDiffChildren({\n    fileDiff,\n    renderCustomHeader,\n    renderHeaderPrefix,\n    renderHeaderFilenameSuffix,\n    renderHeaderMetadata,\n    renderAnnotation,\n    lineAnnotations,\n    renderGutterUtility,\n    getHoveredLine,\n    getAnnotationSlotName,\n  });\n  return (\n    <DIFFS_TAG_NAME ref={ref} className={className} style={style}>\n      {templateRender(children, prerenderedHTML)}\n    </DIFFS_TAG_NAME>\n  );\n}\n\nfunction usePatch(patch: string): FileDiffMetadata {\n  return useMemo<FileDiffMetadata>(() => getSingularPatch(patch), [patch]);\n}\n"],"mappings":";;;;;;;;;AAoBA,SAAgB,UAAsD,EACpE,OACA,SACA,eACA,cACA,SACA,iBACA,eACA,WACA,OACA,iBACA,kBACA,oBACA,oBACA,4BACA,sBACA,qBACA,oBAAoB,OACpB,OAAO,OACP,cACA,kBACwD;CACxD,MAAM,WAAW,SAAS,KAAK;CAC/B,MAAM,EAAE,KAAK,gBAAgB,0BAA0B,oBAAoB;EACzE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,wBAAwB,uBAAuB;EAC/C,iBAAiB,sBAAsB;EACvC;EACA;EACA;EACA;CACF,CAAC;CAaD,OACE,oBAAC,gBAAD;EAAqB;EAAgB;EAAkB;YACpD,eAdY,mBAAmB;GAClC;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;EACF,CAG2B,GAAG,eAAe;CAC3B,CAAA;AAEpB;AAEA,SAAS,SAAS,OAAiC;CACjD,OAAO,cAAgC,iBAAiB,KAAK,GAAG,CAAC,KAAK,CAAC;AACzE"}

package/dist/react/UnresolvedFile.d.ts

@@ -1,8 +1,8 @@
 import { FileContents, HunkSeparators, MergeConflictResolution, PostRenderPhase } from "../types.js";
-import { FileDiffOptions } from "../components/FileDiff.js";
 import { MergeConflictDiffAction } from "../utils/parseMergeConflictDiffFromFile.js";
 import { UnresolvedFileHunksRendererOptions } from "../renderers/UnresolvedFileHunksRenderer.js";
 import { UnresolvedFile as UnresolvedFile$1 } from "../components/UnresolvedFile.js";
+import { FileDiffOptions } from "./types.js";
 import { FileDiffProps } from "./FileDiff.js";
 import { ReactNode } from "react";
 
@@ -12,12 +12,12 @@ interface RenderMergeConflictActionContext {
 }
 type RenderMergeConflictActions = (action: MergeConflictDiffAction, context: RenderMergeConflictActionContext) => ReactNode;
 type MergeConflictActionsTypeOption = 'none' | 'default' | RenderMergeConflictActions;
-interface UnresolvedFileReactOptions<LAnnotation> extends Omit<FileDiffOptions<LAnnotation>, 'hunkSeparators' | 'diffStyle' | 'onMergeConflictAction' | 'onPostRender'>, UnresolvedFileHunksRendererOptions {
+interface UnresolvedFileReactOptions<LAnnotation> extends Omit<FileDiffOptions<LAnnotation, undefined>, 'hunkSeparators' | 'diffStyle' | 'onMergeConflictAction' | 'onPostRender'>, UnresolvedFileHunksRendererOptions {
   hunkSeparators?: HunkSeparators;
   onPostRender?(node: HTMLElement, instance: UnresolvedFile$1<LAnnotation>, phase: PostRenderPhase): unknown;
   maxContextLines?: number;
 }
-interface UnresolvedFileProps<LAnnotation> extends Omit<FileDiffProps<LAnnotation>, 'fileDiff' | 'options' | 'edit' | 'editorOptions'> {
+interface UnresolvedFileProps<LAnnotation> extends Omit<FileDiffProps<LAnnotation, undefined>, 'fileDiff' | 'options' | 'edit' | 'editorOptions' | 'onEditChange' | 'onEditComplete'> {
   file: FileContents;
   options?: UnresolvedFileReactOptions<LAnnotation>;
   renderMergeConflictUtility?(action: MergeConflictDiffAction, getInstance: () => UnresolvedFile$1<LAnnotation> | undefined): ReactNode;

package/dist/react/UnresolvedFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UnresolvedFile.d.ts","names":[],"sources":["../../src/react/UnresolvedFile.tsx"],"mappings":";;;;;;;;;UAoBiB,gCAAA;EACf,eAAA,CAAgB,UAAA,EAAY,uBAAuB;AAAA;AAAA,KAGzC,0BAAA,IACV,MAAA,EAAQ,uBAAA,EACR,OAAA,EAAS,gCAAA,KACN,SAAA;AAAA,KAEO,8BAAA,wBAGR,0BAA0B;AAAA,UAEb,0BAAA,sBAEb,IAAA,CACE,eAAA,CAAgB,WAAA,+EAGlB,kCAAA;EACF,cAAA,GAAiB,cAAA;EACjB,YAAA,EACE,IAAA,EAAM,WAAA,EACN,QAAA,EAAU,gBAAA,CAAoB,WAAA,GAC9B,KAAA,EAAO,eAAA;EAET,eAAA;AAAA;AAAA,UAGe,mBAAA,sBAAyC,IAAA,CACxD,aAAA,CAAc,WAAA;EAGd,IAAA,EAAM,YAAA;EACN,OAAA,GAAU,0BAAA,CAA2B,WAAA;EACrC,0BAAA,EACE,MAAA,EAAQ,uBAAA,EACR,WAAA,QAAmB,gBAAA,CAAoB,WAAA,gBACtC,SAAA;EACH,iBAAA;AAAA;AAAA,iBAGc,cAAA;EACd,IAAA;EACA,OAAA;EACA,eAAA;EACA,aAAA;EACA,SAAA;EACA,KAAA;EACA,eAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;EACA,0BAAA;EACA,oBAAA;EACA,mBAAA;EACA,0BAAA;EACA;AAAA,GACC,mBAAA,CAAoB,WAAA,IAAe,KAAA,CAAM,GAAA,CAAI,OAAA"}
+{"version":3,"file":"UnresolvedFile.d.ts","names":[],"sources":["../../src/react/UnresolvedFile.tsx"],"mappings":";;;;;;;;;UAoBiB,gCAAA;EACf,eAAA,CAAgB,UAAA,EAAY,uBAAuB;AAAA;AAAA,KAGzC,0BAAA,IACV,MAAA,EAAQ,uBAAA,EACR,OAAA,EAAS,gCAAA,KACN,SAAA;AAAA,KAEO,8BAAA,wBAGR,0BAA0B;AAAA,UAEb,0BAAA,sBAEb,IAAA,CACE,eAAA,CAAgB,WAAA,0FAGlB,kCAAA;EACF,cAAA,GAAiB,cAAA;EACjB,YAAA,EACE,IAAA,EAAM,WAAA,EACN,QAAA,EAAU,gBAAA,CAAoB,WAAA,GAC9B,KAAA,EAAO,eAAA;EAET,eAAA;AAAA;AAAA,UAGe,mBAAA,sBAAyC,IAAA,CACxD,aAAA,CAAc,WAAA;EAQd,IAAA,EAAM,YAAA;EACN,OAAA,GAAU,0BAAA,CAA2B,WAAA;EACrC,0BAAA,EACE,MAAA,EAAQ,uBAAA,EACR,WAAA,QAAmB,gBAAA,CAAoB,WAAA,gBACtC,SAAA;EACH,iBAAA;AAAA;AAAA,iBAGc,cAAA;EACd,IAAA;EACA,OAAA;EACA,eAAA;EACA,aAAA;EACA,SAAA;EACA,KAAA;EACA,eAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;EACA,0BAAA;EACA,oBAAA;EACA,mBAAA;EACA,0BAAA;EACA;AAAA,GACC,mBAAA,CAAoB,WAAA,IAAe,KAAA,CAAM,GAAA,CAAI,OAAA"}

package/dist/react/UnresolvedFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"UnresolvedFile.js","names":[],"sources":["../../src/react/UnresolvedFile.tsx"],"sourcesContent":["'use client';\n\nimport type { ReactNode } from 'react';\n\nimport type { FileDiffOptions } from '../components/FileDiff';\nimport type { UnresolvedFile as UnresolvedFileClass } from '../components/UnresolvedFile';\nimport { DIFFS_TAG_NAME } from '../constants';\nimport type { UnresolvedFileHunksRendererOptions } from '../renderers/UnresolvedFileHunksRenderer';\nimport type {\n  FileContents,\n  HunkSeparators,\n  MergeConflictResolution,\n  PostRenderPhase,\n} from '../types';\nimport { type MergeConflictDiffAction } from '../utils/parseMergeConflictDiffFromFile';\nimport type { FileDiffProps } from './FileDiff';\nimport { renderDiffChildren } from './utils/renderDiffChildren';\nimport { templateRender } from './utils/templateRender';\nimport { useUnresolvedFileInstance } from './utils/useUnresolvedFileInstance';\n\nexport interface RenderMergeConflictActionContext {\n  resolveConflict(resolution: MergeConflictResolution): void;\n}\n\nexport type RenderMergeConflictActions = (\n  action: MergeConflictDiffAction,\n  context: RenderMergeConflictActionContext\n) => ReactNode;\n\nexport type MergeConflictActionsTypeOption =\n  | 'none'\n  | 'default'\n  | RenderMergeConflictActions;\n\nexport interface UnresolvedFileReactOptions<LAnnotation>\n  extends\n    Omit<\n      FileDiffOptions<LAnnotation>,\n      'hunkSeparators' | 'diffStyle' | 'onMergeConflictAction' | 'onPostRender'\n    >,\n    UnresolvedFileHunksRendererOptions {\n  hunkSeparators?: HunkSeparators;\n  onPostRender?(\n    node: HTMLElement,\n    instance: UnresolvedFileClass<LAnnotation>,\n    phase: PostRenderPhase\n  ): unknown;\n  maxContextLines?: number;\n}\n\nexport interface UnresolvedFileProps<LAnnotation> extends Omit<\n  FileDiffProps<LAnnotation>,\n  'fileDiff' | 'options' | 'edit' | 'editorOptions'\n> {\n  file: FileContents;\n  options?: UnresolvedFileReactOptions<LAnnotation>;\n  renderMergeConflictUtility?(\n    action: MergeConflictDiffAction,\n    getInstance: () => UnresolvedFileClass<LAnnotation> | undefined\n  ): ReactNode;\n  disableWorkerPool?: boolean;\n}\n\nexport function UnresolvedFile<LAnnotation = undefined>({\n  file,\n  options,\n  lineAnnotations,\n  selectedLines,\n  className,\n  style,\n  prerenderedHTML,\n  renderAnnotation,\n  renderCustomHeader,\n  renderHeaderPrefix,\n  renderHeaderFilenameSuffix,\n  renderHeaderMetadata,\n  renderGutterUtility,\n  renderMergeConflictUtility,\n  disableWorkerPool = false,\n}: UnresolvedFileProps<LAnnotation>): React.JSX.Element {\n  const { ref, getHoveredLine, fileDiff, actions, getInstance } =\n    useUnresolvedFileInstance({\n      file,\n      options,\n      lineAnnotations,\n      selectedLines,\n      prerenderedHTML,\n      hasConflictUtility: renderMergeConflictUtility != null,\n      hasGutterRenderUtility: renderGutterUtility != null,\n      hasCustomHeader: renderCustomHeader != null,\n      disableWorkerPool,\n    });\n  const children = renderDiffChildren({\n    fileDiff,\n    renderCustomHeader,\n    renderHeaderPrefix,\n    renderHeaderFilenameSuffix,\n    renderHeaderMetadata,\n    renderAnnotation,\n    renderGutterUtility,\n    lineAnnotations,\n    getHoveredLine,\n    actions,\n    renderMergeConflictUtility,\n    getInstance,\n  });\n  return (\n    <DIFFS_TAG_NAME ref={ref} className={className} style={style}>\n      {templateRender(children, prerenderedHTML)}\n    </DIFFS_TAG_NAME>\n  );\n}\n"],"mappings":";;;;;;;AA+DA,SAAgB,eAAwC,EACtD,MACA,SACA,iBACA,eACA,WACA,OACA,iBACA,kBACA,oBACA,oBACA,4BACA,sBACA,qBACA,4BACA,oBAAoB,SACkC;CACtD,MAAM,EAAE,KAAK,gBAAgB,UAAU,SAAS,gBAC9C,0BAA0B;EACxB;EACA;EACA;EACA;EACA;EACA,oBAAoB,8BAA8B;EAClD,wBAAwB,uBAAuB;EAC/C,iBAAiB,sBAAsB;EACvC;CACF,CAAC;CAeH,OACE,oBAAC,gBAAD;EAAqB;EAAgB;EAAkB;YACpD,eAhBY,mBAAmB;GAClC;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;EACF,CAG2B,GAAG,eAAe;CAC3B,CAAA;AAEpB"}
+{"version":3,"file":"UnresolvedFile.js","names":[],"sources":["../../src/react/UnresolvedFile.tsx"],"sourcesContent":["'use client';\n\nimport type { ReactNode } from 'react';\n\nimport type { UnresolvedFile as UnresolvedFileClass } from '../components/UnresolvedFile';\nimport { DIFFS_TAG_NAME } from '../constants';\nimport type { UnresolvedFileHunksRendererOptions } from '../renderers/UnresolvedFileHunksRenderer';\nimport type {\n  FileContents,\n  HunkSeparators,\n  MergeConflictResolution,\n  PostRenderPhase,\n} from '../types';\nimport { type MergeConflictDiffAction } from '../utils/parseMergeConflictDiffFromFile';\nimport type { FileDiffProps } from './FileDiff';\nimport type { FileDiffOptions } from './types';\nimport { renderDiffChildren } from './utils/renderDiffChildren';\nimport { templateRender } from './utils/templateRender';\nimport { useUnresolvedFileInstance } from './utils/useUnresolvedFileInstance';\n\nexport interface RenderMergeConflictActionContext {\n  resolveConflict(resolution: MergeConflictResolution): void;\n}\n\nexport type RenderMergeConflictActions = (\n  action: MergeConflictDiffAction,\n  context: RenderMergeConflictActionContext\n) => ReactNode;\n\nexport type MergeConflictActionsTypeOption =\n  | 'none'\n  | 'default'\n  | RenderMergeConflictActions;\n\nexport interface UnresolvedFileReactOptions<LAnnotation>\n  extends\n    Omit<\n      FileDiffOptions<LAnnotation, undefined>,\n      'hunkSeparators' | 'diffStyle' | 'onMergeConflictAction' | 'onPostRender'\n    >,\n    UnresolvedFileHunksRendererOptions {\n  hunkSeparators?: HunkSeparators;\n  onPostRender?(\n    node: HTMLElement,\n    instance: UnresolvedFileClass<LAnnotation>,\n    phase: PostRenderPhase\n  ): unknown;\n  maxContextLines?: number;\n}\n\nexport interface UnresolvedFileProps<LAnnotation> extends Omit<\n  FileDiffProps<LAnnotation, undefined>,\n  | 'fileDiff'\n  | 'options'\n  | 'edit'\n  | 'editorOptions'\n  | 'onEditChange'\n  | 'onEditComplete'\n> {\n  file: FileContents;\n  options?: UnresolvedFileReactOptions<LAnnotation>;\n  renderMergeConflictUtility?(\n    action: MergeConflictDiffAction,\n    getInstance: () => UnresolvedFileClass<LAnnotation> | undefined\n  ): ReactNode;\n  disableWorkerPool?: boolean;\n}\n\nexport function UnresolvedFile<LAnnotation = undefined>({\n  file,\n  options,\n  lineAnnotations,\n  selectedLines,\n  className,\n  style,\n  prerenderedHTML,\n  renderAnnotation,\n  renderCustomHeader,\n  renderHeaderPrefix,\n  renderHeaderFilenameSuffix,\n  renderHeaderMetadata,\n  renderGutterUtility,\n  renderMergeConflictUtility,\n  disableWorkerPool = false,\n}: UnresolvedFileProps<LAnnotation>): React.JSX.Element {\n  const { ref, getHoveredLine, fileDiff, actions, getInstance } =\n    useUnresolvedFileInstance({\n      file,\n      options,\n      lineAnnotations,\n      selectedLines,\n      prerenderedHTML,\n      hasConflictUtility: renderMergeConflictUtility != null,\n      hasGutterRenderUtility: renderGutterUtility != null,\n      hasCustomHeader: renderCustomHeader != null,\n      disableWorkerPool,\n    });\n  const children = renderDiffChildren({\n    fileDiff,\n    renderCustomHeader,\n    renderHeaderPrefix,\n    renderHeaderFilenameSuffix,\n    renderHeaderMetadata,\n    renderAnnotation,\n    renderGutterUtility,\n    lineAnnotations,\n    getHoveredLine,\n    actions,\n    renderMergeConflictUtility,\n    getInstance,\n  });\n  return (\n    <DIFFS_TAG_NAME ref={ref} className={className} style={style}>\n      {templateRender(children, prerenderedHTML)}\n    </DIFFS_TAG_NAME>\n  );\n}\n"],"mappings":";;;;;;;AAoEA,SAAgB,eAAwC,EACtD,MACA,SACA,iBACA,eACA,WACA,OACA,iBACA,kBACA,oBACA,oBACA,4BACA,sBACA,qBACA,4BACA,oBAAoB,SACkC;CACtD,MAAM,EAAE,KAAK,gBAAgB,UAAU,SAAS,gBAC9C,0BAA0B;EACxB;EACA;EACA;EACA;EACA;EACA,oBAAoB,8BAA8B;EAClD,wBAAwB,uBAAuB;EAC/C,iBAAiB,sBAAsB;EACvC;CACF,CAAC;CAeH,OACE,oBAAC,gBAAD;EAAqB;EAAgB;EAAkB;YACpD,eAhBY,mBAAmB;GAClC;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;EACF,CAG2B,GAAG,eAAe;CAC3B,CAAA;AAEpB"}

package/dist/react/index.d.ts

@@ -1,8 +1,11 @@
-import { AnnotationLineMap, AnnotationSide, AnnotationSpan, AppliedThemeStyleCache, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, CodeViewCreateEditorOptions, CodeViewDiffItem, CodeViewFileItem, CodeViewItem, CodeViewItemScrollTarget, CodeViewLayout, CodeViewLineScrollTarget, CodeViewPositionScrollTarget, CodeViewRangeScrollTarget, CodeViewScrollBehavior, CodeViewScrollTarget, ConflictResolverTypes, ContextContent, CreatePatchOptionsNonabortable, CustomPreProperties, DecorationItem, DiffAcceptRejectHunkConfig, DiffAcceptRejectHunkType, DiffFileInput, DiffIndicators, DiffLineAnnotation, DiffLineEventBaseProps, DiffTokenEventBaseProps, DiffsBaseComponent, DiffsComponentOptions, DiffsEditableComponent, DiffsEditor, DiffsHighlighter, DiffsTextDocument, DiffsThemeNames, EditableInstance, EditorActiveLineOptions, EditorChange, EditorChangeEvent, EditorSelection, EditorState, EditorViewState, ExpansionDirections, ExtensionFormatMap, FileContents, FileDiffContentsLoader, FileDiffLoadedChangedFiles, FileDiffLoadedFiles, FileDiffLoadedPureRenamedFile, FileDiffMetadata, FileHeaderRenderMode, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, HighlightedToken, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MaybeDiffFileInput, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictMarkerRowType, MergeConflictRegion, MergeConflictResolution, NumericScrollLineAnchor, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PendingCodeViewLayoutReset, Position, PostRenderPhase, PrePropertiesConfig, ProcessFileConflictData, Range, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderFilenameSuffixCallback, RenderHeaderMetadataCallback, RenderHeaderPrefixCallback, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, ResolvedTextEdit, SelectedLineRange, SelectionDirection, SelectionPoint, SelectionSide, SharedRenderState, ShikiTransformer, SmoothScrollSettings, StickySpecs, SupportedLanguages, TextEdit, ThemeRegistration, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, TokenEventBase, VirtualFileMetrics, VirtualWindowSpecs } from "../types.js";
+import { AnnotationLineMap, AnnotationSide, AnnotationSpan, AppliedThemeStyleCache, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, CodeViewDiffItem, CodeViewFileItem, CodeViewItem, CodeViewItemScrollTarget, CodeViewLayout, CodeViewLineScrollTarget, CodeViewPositionScrollTarget, CodeViewRangeScrollTarget, CodeViewScrollBehavior, CodeViewScrollTarget, ConflictResolverTypes, ContextContent, CreatePatchOptionsNonabortable, CustomPreProperties, DecorationItem, DiffAcceptRejectHunkConfig, DiffAcceptRejectHunkType, DiffFileInput, DiffIndicators, DiffLineAnnotation, DiffLineEventBaseProps, DiffTokenEventBaseProps, DiffsHighlighter, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, FileContents, FileDiffContentsLoader, FileDiffLoadedChangedFiles, FileDiffLoadedFiles, FileDiffLoadedPureRenamedFile, FileDiffMetadata, FileHeaderRenderMode, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, HighlightedToken, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MaybeDiffFileInput, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictMarkerRowType, MergeConflictRegion, MergeConflictResolution, NumericScrollLineAnchor, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PendingCodeViewLayoutReset, PostRenderPhase, PrePropertiesConfig, ProcessFileConflictData, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderFilenameSuffixCallback, RenderHeaderMetadataCallback, RenderHeaderPrefixCallback, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectedLineRange, SelectionPoint, SelectionSide, SharedRenderState, ShikiTransformer, SmoothScrollSettings, StickySpecs, SupportedLanguages, ThemeRegistration, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, TokenEventBase, VirtualFileMetrics, VirtualWindowSpecs } from "../types.js";
+import { EditorFactory, FileDiffEditCompleteEvent, FileEditCompleteEvent } from "../editor/types.js";
 import { WorkerInitializationRenderOptions, WorkerPoolOptions } from "../worker/types.js";
-import { FileOptions } from "../components/File.js";
+import { FileEditChangeHandler, FileEditCompleteHandler } from "../components/File.js";
+import { FileDiffEditChangeHandler, FileDiffEditCompleteHandler } from "../components/FileDiff.js";
+import { CodeViewItemEditCompleteHandler } from "../components/CodeView.js";
 import { CodeView, CodeViewHandle, CodeViewProps, CodeViewReactOptions, ControlledCodeViewProps, UncontrolledCodeViewProps } from "./CodeView.js";
-import { DiffBasePropsReact, FileProps } from "./types.js";
+import { DiffBasePropsReact, FileDiffOptions, FileOptions, FileProps } from "./types.js";
 import { File } from "./File.js";
 import { FileDiff, FileDiffProps } from "./FileDiff.js";
 import { MergeConflictActionsTypeOption, RenderMergeConflictActionContext, RenderMergeConflictActions, UnresolvedFile, UnresolvedFileProps, UnresolvedFileReactOptions } from "./UnresolvedFile.js";
@@ -10,7 +13,7 @@ import { MultiFileDiff, MultiFileDiffProps } from "./MultiFileDiff.js";
 import { PatchDiff, PatchDiffProps } from "./PatchDiff.js";
 import { Virtualizer, VirtualizerContext, useVirtualizer } from "./Virtualizer.js";
 import { WorkerPoolContext, WorkerPoolContextProvider, useWorkerPool } from "./WorkerPoolContext.js";
-import { CreateEditor, EditContext, EditProvider, EditProviderProps, useCreateEditor } from "./EditContext.js";
+import { EditContext, EditProvider, EditProviderProps, useCreateEditor } from "./EditContext.js";
 import { GutterUtilitySlotStyles, MergeConflictSlotStyles, noopRender } from "./constants.js";
 import { renderDiffChildren } from "./utils/renderDiffChildren.js";
 import { renderFileChildren } from "./utils/renderFileChildren.js";
@@ -18,4 +21,4 @@ import { templateRender } from "./utils/templateRender.js";
 import { useFileDiffInstance } from "./utils/useFileDiffInstance.js";
 import { useFileInstance } from "./utils/useFileInstance.js";
 import { useStableCallback } from "./utils/useStableCallback.js";
-export { AnnotationLineMap, AnnotationSide, AnnotationSpan, AppliedThemeStyleCache, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, type BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, type CodeToHastOptions, CodeView, CodeViewCreateEditorOptions, CodeViewDiffItem, CodeViewFileItem, CodeViewHandle, CodeViewItem, CodeViewItemScrollTarget, CodeViewLayout, CodeViewLineScrollTarget, CodeViewPositionScrollTarget, CodeViewProps, CodeViewRangeScrollTarget, CodeViewReactOptions, CodeViewScrollBehavior, CodeViewScrollTarget, ConflictResolverTypes, ContextContent, ControlledCodeViewProps, CreateEditor, type CreatePatchOptionsNonabortable, CustomPreProperties, type DecorationItem, DiffAcceptRejectHunkConfig, DiffAcceptRejectHunkType, DiffBasePropsReact, DiffFileInput, DiffIndicators, DiffLineAnnotation, DiffLineEventBaseProps, DiffTokenEventBaseProps, DiffsBaseComponent, DiffsComponentOptions, DiffsEditableComponent, DiffsEditor, DiffsHighlighter, DiffsTextDocument, DiffsThemeNames, EditContext, EditProvider, EditProviderProps, EditableInstance, EditorActiveLineOptions, EditorChange, EditorChangeEvent, EditorSelection, EditorState, EditorViewState, ExpansionDirections, ExtensionFormatMap, File, FileContents, FileDiff, FileDiffContentsLoader, FileDiffLoadedChangedFiles, FileDiffLoadedFiles, FileDiffLoadedPureRenamedFile, FileDiffMetadata, FileDiffProps, FileHeaderRenderMode, type FileOptions, FileProps, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, GutterUtilitySlotStyles, HighlightedToken, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, type LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MaybeDiffFileInput, MergeConflictActionPayload, MergeConflictActionsTypeOption, MergeConflictMarkerRow, MergeConflictMarkerRowType, MergeConflictRegion, MergeConflictResolution, MergeConflictSlotStyles, MultiFileDiff, MultiFileDiffProps, NumericScrollLineAnchor, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PatchDiff, PatchDiffProps, PendingCodeViewLayoutReset, Position, PostRenderPhase, PrePropertiesConfig, ProcessFileConflictData, Range, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderFilenameSuffixCallback, RenderHeaderMetadataCallback, RenderHeaderPrefixCallback, RenderMergeConflictActionContext, RenderMergeConflictActions, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, ResolvedTextEdit, SelectedLineRange, SelectionDirection, SelectionPoint, SelectionSide, SharedRenderState, type ShikiTransformer, SmoothScrollSettings, StickySpecs, SupportedLanguages, TextEdit, type ThemeRegistration, type ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, type ThemedToken, ThemesType, TokenEventBase, UncontrolledCodeViewProps, UnresolvedFile, UnresolvedFileProps, UnresolvedFileReactOptions, VirtualFileMetrics, VirtualWindowSpecs, Virtualizer, VirtualizerContext, type WorkerInitializationRenderOptions, WorkerPoolContext, WorkerPoolContextProvider, type WorkerPoolOptions, noopRender, renderDiffChildren, renderFileChildren, templateRender, useCreateEditor, useFileDiffInstance, useFileInstance, useStableCallback, useVirtualizer, useWorkerPool };
+export { AnnotationLineMap, AnnotationSide, AnnotationSpan, AppliedThemeStyleCache, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, type BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, type CodeToHastOptions, CodeView, CodeViewDiffItem, CodeViewFileItem, CodeViewHandle, CodeViewItem, type CodeViewItemEditCompleteHandler, CodeViewItemScrollTarget, CodeViewLayout, CodeViewLineScrollTarget, CodeViewPositionScrollTarget, CodeViewProps, CodeViewRangeScrollTarget, CodeViewReactOptions, CodeViewScrollBehavior, CodeViewScrollTarget, ConflictResolverTypes, ContextContent, ControlledCodeViewProps, type CreatePatchOptionsNonabortable, CustomPreProperties, type DecorationItem, DiffAcceptRejectHunkConfig, DiffAcceptRejectHunkType, DiffBasePropsReact, DiffFileInput, DiffIndicators, DiffLineAnnotation, DiffLineEventBaseProps, DiffTokenEventBaseProps, DiffsHighlighter, DiffsThemeNames, EditContext, EditProvider, EditProviderProps, type EditorFactory, ExpansionDirections, ExtensionFormatMap, File, FileContents, FileDiff, FileDiffContentsLoader, type FileDiffEditChangeHandler, type FileDiffEditCompleteEvent, type FileDiffEditCompleteHandler, FileDiffLoadedChangedFiles, FileDiffLoadedFiles, FileDiffLoadedPureRenamedFile, FileDiffMetadata, FileDiffOptions, FileDiffProps, type FileEditChangeHandler, type FileEditCompleteEvent, type FileEditCompleteHandler, FileHeaderRenderMode, FileOptions, FileProps, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, GutterUtilitySlotStyles, HighlightedToken, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, type LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MaybeDiffFileInput, MergeConflictActionPayload, MergeConflictActionsTypeOption, MergeConflictMarkerRow, MergeConflictMarkerRowType, MergeConflictRegion, MergeConflictResolution, MergeConflictSlotStyles, MultiFileDiff, MultiFileDiffProps, NumericScrollLineAnchor, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PatchDiff, PatchDiffProps, PendingCodeViewLayoutReset, PostRenderPhase, PrePropertiesConfig, ProcessFileConflictData, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderFilenameSuffixCallback, RenderHeaderMetadataCallback, RenderHeaderPrefixCallback, RenderMergeConflictActionContext, RenderMergeConflictActions, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectedLineRange, SelectionPoint, SelectionSide, SharedRenderState, type ShikiTransformer, SmoothScrollSettings, StickySpecs, SupportedLanguages, type ThemeRegistration, type ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, type ThemedToken, ThemesType, TokenEventBase, UncontrolledCodeViewProps, UnresolvedFile, UnresolvedFileProps, UnresolvedFileReactOptions, VirtualFileMetrics, VirtualWindowSpecs, Virtualizer, VirtualizerContext, type WorkerInitializationRenderOptions, WorkerPoolContext, WorkerPoolContextProvider, type WorkerPoolOptions, noopRender, renderDiffChildren, renderFileChildren, templateRender, useCreateEditor, useFileDiffInstance, useFileInstance, useStableCallback, useVirtualizer, useWorkerPool };

package/dist/react/types.d.ts

@@ -1,17 +1,39 @@
 import { DiffLineAnnotation, FileContents, FileDiffMetadata, LineAnnotation, SelectedLineRange, VirtualFileMetrics } from "../types.js";
 import { GetHoveredLineResult } from "../managers/InteractionManager.js";
-import { FileOptions } from "../components/File.js";
-import { FileDiffOptions } from "../components/FileDiff.js";
+import { FileEditChangeHandler, FileEditCompleteHandler, FileOptions as FileOptions$1 } from "../components/File.js";
+import { FileDiffEditChangeHandler, FileDiffEditCompleteHandler, FileDiffOptions as FileDiffOptions$1 } from "../components/FileDiff.js";
 import { EditorOptions } from "../editor/editor.js";
 import { CSSProperties, ReactNode } from "react";
 
 //#region src/react/types.d.ts
-interface DiffBasePropsReact<LAnnotation> {
-  options?: FileDiffOptions<LAnnotation>;
+type ReactOwnedEditCallbacks = 'onEditChange' | 'onEditComplete';
+type FileDiffOptions<LAnnotation, Caret> = Omit<FileDiffOptions$1<LAnnotation, Caret>, ReactOwnedEditCallbacks>;
+type FileOptions<LAnnotation, Caret> = Omit<FileOptions$1<LAnnotation, Caret>, ReactOwnedEditCallbacks>;
+interface DiffBasePropsReact<LAnnotation, Caret> {
+  options?: FileDiffOptions<LAnnotation, Caret>;
   /** Whether this surface has an active edit session. */
   edit?: boolean;
   /** Creation-time options passed to the nearest EditProvider factory. */
-  editorOptions?: EditorOptions<LAnnotation>;
+  editorOptions?: EditorOptions<'file-diff', LAnnotation, Caret>;
+  /** Retain this editable draft and its undo/redo history in memory. */
+  editStateKey?: string;
+  /**
+   * Fired for every document change of an active edit session, with the same
+   * `EditorChangeEvent` the editor reports through its own `onChange`. Don't
+   * feed this data back into the component.
+   *
+   * When editing a diff, you are editing the contents of the new file. You
+   * cannot edit the contents of the old file. You are not getting back an
+   * update `fileDiff` during this edit session.
+   */
+  onEditChange?: FileDiffEditChangeHandler<LAnnotation, Caret>;
+  /**
+   * Fired when `edit` toggles false or the component unmounts. Return `'accept'`
+   * to install the completed diff and annotations or `'reject'` to restore the
+   * external values. The event contains the detached editor with its final
+   * state.
+   */
+  onEditComplete?: FileDiffEditCompleteHandler<LAnnotation, Caret>;
   metrics?: VirtualFileMetrics;
   lineAnnotations?: DiffLineAnnotation<LAnnotation>[];
   selectedLines?: SelectedLineRange | null;
@@ -25,13 +47,28 @@ interface DiffBasePropsReact<LAnnotation> {
   style?: CSSProperties;
   prerenderedHTML?: string;
 }
-interface FileProps<LAnnotation> {
+interface FileProps<LAnnotation, Caret> {
   file: FileContents;
-  options?: FileOptions<LAnnotation>;
+  options?: FileOptions<LAnnotation, Caret>;
   /** Whether this surface has an active edit session. */
   edit?: boolean;
   /** Creation-time options passed to the nearest EditProvider factory. */
-  editorOptions?: EditorOptions<LAnnotation>;
+  editorOptions?: EditorOptions<'file', LAnnotation, Caret>;
+  /** Retain this editable draft and its undo/redo history in memory. */
+  editStateKey?: string;
+  /**
+   * Fired for every document change of an active edit session, with the same
+   * `EditorChangeEvent` the editor reports through its own `onChange`. Don't
+   * feed this data back into the component.
+   */
+  onEditChange?: FileEditChangeHandler<LAnnotation, Caret>;
+  /**
+   * Fired when `edit` toggles false or the component unmounts. Return `'accept'`
+   * to install the completed file and annotations or `'reject'` to restore the
+   * external values. The event contains the detached editor with its final
+   * state.
+   */
+  onEditComplete?: FileEditCompleteHandler<LAnnotation, Caret>;
   metrics?: VirtualFileMetrics;
   lineAnnotations?: LineAnnotation<LAnnotation>[];
   selectedLines?: SelectedLineRange | null;
@@ -47,5 +84,5 @@ interface FileProps<LAnnotation> {
   disableWorkerPool?: boolean;
 }
 //#endregion
-export { DiffBasePropsReact, FileProps };
+export { DiffBasePropsReact, FileDiffOptions, FileOptions, FileProps };
 //# sourceMappingURL=types.d.ts.map

package/dist/react/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","names":[],"sources":["../../src/react/types.ts"],"mappings":";;;;;;;;UAeiB,kBAAA;EACf,OAAA,GAAU,eAAA,CAAgB,WAAA;;EAE1B,IAAA;EAHiC;EAKjC,aAAA,GAAgB,aAAA,CAAc,WAAA;EAC9B,OAAA,GAAU,kBAAA;EACV,eAAA,GAAkB,kBAAA,CAAmB,WAAA;EACrC,aAAA,GAAgB,iBAAA;EAChB,gBAAA,EAAkB,WAAA,EAAa,kBAAA,CAAmB,WAAA,IAAe,SAAA;EACjE,kBAAA,EAAoB,QAAA,EAAU,gBAAA,GAAmB,SAAA;EACjD,kBAAA,EAAoB,QAAA,EAAU,gBAAA,GAAmB,SAAA;EACjD,0BAAA,EAA4B,QAAA,EAAU,gBAAA,GAAmB,SAAA;EACzD,oBAAA,EAAsB,QAAA,EAAU,gBAAA,GAAmB,SAAA;EACnD,mBAAA,EACE,cAAA,QAAsB,oBAAA,uBACrB,SAAA;EACH,SAAA;EACA,KAAA,GAAQ,aAAA;EACR,eAAA;AAAA;AAAA,UAGe,SAAA;EACf,IAAA,EAAM,YAAA;EACN,OAAA,GAAU,WAAA,CAAY,WAAA;EAZmC;EAczD,IAAA;EAbmD;EAenD,aAAA,GAAgB,aAAA,CAAc,WAAA;EAC9B,OAAA,GAAU,kBAAA;EACV,eAAA,GAAkB,cAAA,CAAe,WAAA;EACjC,aAAA,GAAgB,iBAAA;EAChB,gBAAA,EAAkB,WAAA,EAAa,cAAA,CAAe,WAAA,IAAe,SAAA;EAC7D,kBAAA,EAAoB,IAAA,EAAM,YAAA,GAAe,SAAA;EACzC,kBAAA,EAAoB,IAAA,EAAM,YAAA,GAAe,SAAA;EACzC,0BAAA,EAA4B,IAAA,EAAM,YAAA,GAAe,SAAA;EACjD,oBAAA,EAAsB,IAAA,EAAM,YAAA,GAAe,SAAA;EAC3C,mBAAA,EACE,cAAA,QAAsB,oBAAA,uBACrB,SAAA;EACH,SAAA;EACA,KAAA,GAAQ,aAAA;EACR,eAAA;EACA,iBAAA;AAAA"}
+{"version":3,"file":"types.d.ts","names":[],"sources":["../../src/react/types.ts"],"mappings":";;;;;;;;KAuBK,uBAAA;AAAA,KAEO,eAAA,uBAAsC,IAAA,CAChD,iBAAA,CAAqB,WAAA,EAAa,KAAA,GAClC,uBAAA;AAAA,KAGU,WAAA,uBAAkC,IAAA,CAC5C,aAAA,CAAiB,WAAA,EAAa,KAAA,GAC9B,uBAAA;AAAA,UAGe,kBAAA;EACf,OAAA,GAAU,eAAA,CAAgB,WAAA,EAAa,KAAA;;EAEvC,IAAA;EAf0B;EAiB1B,aAAA,GAAgB,aAAA,cAA2B,WAAA,EAAa,KAAA;EAf/B;EAiBzB,YAAA;EAhBqB;;;;;;;;;EA0BrB,YAAA,GAAe,yBAAA,CAA0B,WAAA,EAAa,KAAA;EA1BtD;;;;;AACuB;EAgCvB,cAAA,GAAiB,2BAAA,CAA4B,WAAA,EAAa,KAAA;EAC1D,OAAA,GAAU,kBAAA;EACV,eAAA,GAAkB,kBAAA,CAAmB,WAAA;EACrC,aAAA,GAAgB,iBAAA;EAChB,gBAAA,EAAkB,WAAA,EAAa,kBAAA,CAAmB,WAAA,IAAe,SAAA;EACjE,kBAAA,EAAoB,QAAA,EAAU,gBAAA,GAAmB,SAAA;EACjD,kBAAA,EAAoB,QAAA,EAAU,gBAAA,GAAmB,SAAA;EACjD,0BAAA,EAA4B,QAAA,EAAU,gBAAA,GAAmB,SAAA;EACzD,oBAAA,EAAsB,QAAA,EAAU,gBAAA,GAAmB,SAAA;EACnD,mBAAA,EACE,cAAA,QAAsB,oBAAA,uBACrB,SAAA;EACH,SAAA;EACA,KAAA,GAAQ,aAAA;EACR,eAAA;AAAA;AAAA,UAGe,SAAA;EACf,IAAA,EAAM,YAAA;EACN,OAAA,GAAU,WAAA,CAAY,WAAA,EAAa,KAAA;EA9CZ;EAgDvB,IAAA;EA7Ce;EA+Cf,aAAA,GAAgB,aAAA,SAAsB,WAAA,EAAa,KAAA;EA/ClB;EAiDjC,YAAA;EAhDuC;;;;;EAsDvC,YAAA,GAAe,qBAAA,CAAsB,WAAA,EAAa,KAAA;EAtCI;;;;;;EA6CtD,cAAA,GAAiB,uBAAA,CAAwB,WAAA,EAAa,KAAA;EACtD,OAAA,GAAU,kBAAA;EACV,eAAA,GAAkB,cAAA,CAAe,WAAA;EACjC,aAAA,GAAgB,iBAAA;EAChB,gBAAA,EAAkB,WAAA,EAAa,cAAA,CAAe,WAAA,IAAe,SAAA;EAC7D,kBAAA,EAAoB,IAAA,EAAM,YAAA,GAAe,SAAA;EACzC,kBAAA,EAAoB,IAAA,EAAM,YAAA,GAAe,SAAA;EACzC,0BAAA,EAA4B,IAAA,EAAM,YAAA,GAAe,SAAA;EACjD,oBAAA,EAAsB,IAAA,EAAM,YAAA,GAAe,SAAA;EAC3C,mBAAA,EACE,cAAA,QAAsB,oBAAA,uBACrB,SAAA;EACH,SAAA;EACA,KAAA,GAAQ,aAAA;EACR,eAAA;EACA,iBAAA;AAAA"}

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

@@ -1,25 +1,26 @@
-import { FileDiffMetadata } from "../../types.js";
+import { DiffLineAnnotation, FileDiffMetadata } from "../../types.js";
 import { GetHoveredLineResult } from "../../managers/InteractionManager.js";
 import { MergeConflictDiffAction } from "../../utils/parseMergeConflictDiffFromFile.js";
 import { DiffBasePropsReact } from "../types.js";
 import { ReactNode } from "react";
 
 //#region src/react/utils/renderDiffChildren.d.ts
-interface RenderDiffChildrenProps<LAnnotation, T> {
+interface RenderDiffChildrenProps<LAnnotation, Caret, T> {
   fileDiff: FileDiffMetadata;
   actions?: (MergeConflictDiffAction | undefined)[];
-  renderCustomHeader: DiffBasePropsReact<LAnnotation>['renderCustomHeader'];
-  renderHeaderPrefix: DiffBasePropsReact<LAnnotation>['renderHeaderPrefix'];
-  renderHeaderFilenameSuffix?: DiffBasePropsReact<LAnnotation>['renderHeaderFilenameSuffix'];
-  renderHeaderMetadata: DiffBasePropsReact<LAnnotation>['renderHeaderMetadata'];
-  renderAnnotation: DiffBasePropsReact<LAnnotation>['renderAnnotation'];
-  renderGutterUtility: DiffBasePropsReact<LAnnotation>['renderGutterUtility'];
+  renderCustomHeader: DiffBasePropsReact<LAnnotation, Caret>['renderCustomHeader'];
+  renderHeaderPrefix: DiffBasePropsReact<LAnnotation, Caret>['renderHeaderPrefix'];
+  renderHeaderFilenameSuffix?: DiffBasePropsReact<LAnnotation, Caret>['renderHeaderFilenameSuffix'];
+  renderHeaderMetadata: DiffBasePropsReact<LAnnotation, Caret>['renderHeaderMetadata'];
+  renderAnnotation: DiffBasePropsReact<LAnnotation, Caret>['renderAnnotation'];
+  renderGutterUtility: DiffBasePropsReact<LAnnotation, Caret>['renderGutterUtility'];
   renderMergeConflictUtility?(action: MergeConflictDiffAction, getInstance: () => T | undefined): ReactNode;
-  lineAnnotations: DiffBasePropsReact<LAnnotation>['lineAnnotations'];
+  lineAnnotations: DiffBasePropsReact<LAnnotation, Caret>['lineAnnotations'];
   getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;
   getInstance?(): T | undefined;
+  getAnnotationSlotName?(annotation: DiffLineAnnotation<LAnnotation>): string;
 }
-declare function renderDiffChildren<LAnnotation, T>({
+declare function renderDiffChildren<LAnnotation, Caret, T>({
   fileDiff,
   actions,
   renderCustomHeader,
@@ -31,8 +32,9 @@ declare function renderDiffChildren<LAnnotation, T>({
   renderMergeConflictUtility,
   lineAnnotations,
   getHoveredLine,
-  getInstance
-}: RenderDiffChildrenProps<LAnnotation, T>): ReactNode;
+  getInstance,
+  getAnnotationSlotName
+}: RenderDiffChildrenProps<LAnnotation, Caret, T>): ReactNode;
 //#endregion
 export { renderDiffChildren };
 //# sourceMappingURL=renderDiffChildren.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"renderDiffChildren.d.ts","names":[],"sources":["../../../src/react/utils/renderDiffChildren.tsx"],"mappings":";;;;;;;UAmBU,uBAAA;EACR,QAAA,EAAU,gBAAA;EACV,OAAA,IAAW,uBAAA;EACX,kBAAA,EAAoB,kBAAA,CAAmB,WAAA;EACvC,kBAAA,EAAoB,kBAAA,CAAmB,WAAA;EACvC,0BAAA,GAA6B,kBAAA,CAAmB,WAAA;EAChD,oBAAA,EAAsB,kBAAA,CAAmB,WAAA;EACzC,gBAAA,EAAkB,kBAAA,CAAmB,WAAA;EACrC,mBAAA,EAAqB,kBAAA,CAAmB,WAAA;EACxC,0BAAA,EACE,MAAA,EAAQ,uBAAA,EACR,WAAA,QAAmB,CAAA,eAClB,SAAA;EACH,eAAA,EAAiB,kBAAA,CAAmB,WAAA;EACpC,cAAA,IAAkB,oBAAA;EAClB,WAAA,KAAgB,CAAA;AAAA;AAAA,iBAGF,kBAAA;EACd,QAAA;EACA,OAAA;EACA,kBAAA;EACA,kBAAA;EACA,0BAAA;EACA,oBAAA;EACA,gBAAA;EACA,mBAAA;EACA,0BAAA;EACA,eAAA;EACA,cAAA;EACA;AAAA,GACC,uBAAA,CAAwB,WAAA,EAAa,CAAA,IAAK,SAAA"}
+{"version":3,"file":"renderDiffChildren.d.ts","names":[],"sources":["../../../src/react/utils/renderDiffChildren.tsx"],"mappings":";;;;;;;UAmBU,uBAAA;EACR,QAAA,EAAU,gBAAA;EACV,OAAA,IAAW,uBAAA;EACX,kBAAA,EAAoB,kBAAA,CAClB,WAAA,EACA,KAAA;EAEF,kBAAA,EAAoB,kBAAA,CAClB,WAAA,EACA,KAAA;EAEF,0BAAA,GAA6B,kBAAA,CAC3B,WAAA,EACA,KAAA;EAEF,oBAAA,EAAsB,kBAAA,CACpB,WAAA,EACA,KAAA;EAEF,gBAAA,EAAkB,kBAAA,CAAmB,WAAA,EAAa,KAAA;EAClD,mBAAA,EAAqB,kBAAA,CACnB,WAAA,EACA,KAAA;EAEF,0BAAA,EACE,MAAA,EAAQ,uBAAA,EACR,WAAA,QAAmB,CAAA,eAClB,SAAA;EACH,eAAA,EAAiB,kBAAA,CAAmB,WAAA,EAAa,KAAA;EACjD,cAAA,IAAkB,oBAAA;EAClB,WAAA,KAAgB,CAAA;EAChB,qBAAA,EAAuB,UAAA,EAAY,kBAAA,CAAmB,WAAA;AAAA;AAAA,iBAGxC,kBAAA;EACd,QAAA;EACA,OAAA;EACA,kBAAA;EACA,kBAAA;EACA,0BAAA;EACA,oBAAA;EACA,gBAAA;EACA,mBAAA;EACA,0BAAA;EACA,eAAA;EACA,cAAA;EACA,WAAA;EACA;AAAA,GACC,uBAAA,CAAwB,WAAA,EAAa,KAAA,EAAO,CAAA,IAAK,SAAA"}

package/dist/react/utils/renderDiffChildren.js

@@ -5,7 +5,7 @@ import { getMergeConflictActionAnchor } from "../../utils/parseMergeConflictDiff
 import { GutterUtilitySlotStyles, MergeConflictSlotStyles } from "../constants.js";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 //#region src/react/utils/renderDiffChildren.tsx
-function renderDiffChildren({ fileDiff, actions, renderCustomHeader, renderHeaderPrefix, renderHeaderFilenameSuffix, renderHeaderMetadata, renderAnnotation, renderGutterUtility, renderMergeConflictUtility, lineAnnotations, getHoveredLine, getInstance }) {
+function renderDiffChildren({ fileDiff, actions, renderCustomHeader, renderHeaderPrefix, renderHeaderFilenameSuffix, renderHeaderMetadata, renderAnnotation, renderGutterUtility, renderMergeConflictUtility, lineAnnotations, getHoveredLine, getInstance, getAnnotationSlotName = getLineAnnotationName }) {
 	const customHeader = renderCustomHeader?.(fileDiff);
 	const prefix = renderHeaderPrefix?.(fileDiff);
 	const suffix = renderHeaderFilenameSuffix?.(fileDiff);
@@ -29,7 +29,7 @@ function renderDiffChildren({ fileDiff, actions, renderCustomHeader, renderHeade
 			})
 		] }),
 		renderAnnotation != null && lineAnnotations?.map((annotation, index) => /* @__PURE__ */ jsx("div", {
-			slot: getLineAnnotationName(annotation),
+			slot: getAnnotationSlotName(annotation),
 			children: renderAnnotation(annotation)
 		}, index)),
 		actions != null && renderMergeConflictUtility != null && getInstance != null && actions.map((action) => {

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

@@ -1 +1 @@
-{"version":3,"file":"renderDiffChildren.js","names":[],"sources":["../../../src/react/utils/renderDiffChildren.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 { FileDiffMetadata } from '../../types';\nimport { getLineAnnotationName } from '../../utils/getLineAnnotationName';\nimport { getMergeConflictActionSlotName } from '../../utils/getMergeConflictActionSlotName';\nimport {\n  getMergeConflictActionAnchor,\n  type MergeConflictDiffAction,\n} from '../../utils/parseMergeConflictDiffFromFile';\nimport { GutterUtilitySlotStyles, MergeConflictSlotStyles } from '../constants';\nimport type { DiffBasePropsReact } from '../types';\n\ninterface RenderDiffChildrenProps<LAnnotation, T> {\n  fileDiff: FileDiffMetadata;\n  actions?: (MergeConflictDiffAction | undefined)[];\n  renderCustomHeader: DiffBasePropsReact<LAnnotation>['renderCustomHeader'];\n  renderHeaderPrefix: DiffBasePropsReact<LAnnotation>['renderHeaderPrefix'];\n  renderHeaderFilenameSuffix?: DiffBasePropsReact<LAnnotation>['renderHeaderFilenameSuffix'];\n  renderHeaderMetadata: DiffBasePropsReact<LAnnotation>['renderHeaderMetadata'];\n  renderAnnotation: DiffBasePropsReact<LAnnotation>['renderAnnotation'];\n  renderGutterUtility: DiffBasePropsReact<LAnnotation>['renderGutterUtility'];\n  renderMergeConflictUtility?(\n    action: MergeConflictDiffAction,\n    getInstance: () => T | undefined\n  ): ReactNode;\n  lineAnnotations: DiffBasePropsReact<LAnnotation>['lineAnnotations'];\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n  getInstance?(): T | undefined;\n}\n\nexport function renderDiffChildren<LAnnotation, T>({\n  fileDiff,\n  actions,\n  renderCustomHeader,\n  renderHeaderPrefix,\n  renderHeaderFilenameSuffix,\n  renderHeaderMetadata,\n  renderAnnotation,\n  renderGutterUtility,\n  renderMergeConflictUtility,\n  lineAnnotations,\n  getHoveredLine,\n  getInstance,\n}: RenderDiffChildrenProps<LAnnotation, T>): ReactNode {\n  const customHeader = renderCustomHeader?.(fileDiff);\n  const prefix = renderHeaderPrefix?.(fileDiff);\n  const suffix = renderHeaderFilenameSuffix?.(fileDiff);\n  const metadata = renderHeaderMetadata?.(fileDiff);\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      {actions != null &&\n        renderMergeConflictUtility != null &&\n        getInstance != null &&\n        actions.map((action) => {\n          if (action == null) {\n            return undefined;\n          }\n          const slot = getSlotName(action, fileDiff);\n          return (\n            <div key={slot} slot={slot} style={MergeConflictSlotStyles}>\n              {renderMergeConflictUtility(action, getInstance)}\n            </div>\n          );\n        })}\n      {renderGutterUtility != null && (\n        <div slot=\"gutter-utility-slot\" style={GutterUtilitySlotStyles}>\n          {renderGutterUtility(getHoveredLine)}\n        </div>\n      )}\n    </>\n  );\n}\n\nfunction getSlotName(\n  action: MergeConflictDiffAction,\n  fileDiff: FileDiffMetadata\n): string | undefined {\n  const anchor = getMergeConflictActionAnchor(action, fileDiff);\n  return anchor != null\n    ? getMergeConflictActionSlotName({\n        hunkIndex: anchor.hunkIndex,\n        lineIndex: anchor.lineIndex,\n        conflictIndex: action.conflictIndex,\n      })\n    : undefined;\n}\n"],"mappings":";;;;;;;AAqCA,SAAgB,mBAAmC,EACjD,UACA,SACA,oBACA,oBACA,4BACA,sBACA,kBACA,qBACA,4BACA,iBACA,gBACA,eACqD;CACrD,MAAM,eAAe,qBAAqB,QAAQ;CAClD,MAAM,SAAS,qBAAqB,QAAQ;CAC5C,MAAM,SAAS,6BAA6B,QAAQ;CACpD,MAAM,WAAW,uBAAuB,QAAQ;CAChD,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,WAAW,QACV,8BAA8B,QAC9B,eAAe,QACf,QAAQ,KAAK,WAAW;GACtB,IAAI,UAAU,MACZ;GAEF,MAAM,OAAO,YAAY,QAAQ,QAAQ;GACzC,OACE,oBAAC,OAAD;IAAsB;IAAM,OAAO;cAChC,2BAA2B,QAAQ,WAAW;GAC5C,GAFK,IAEL;EAET,CAAC;EACF,uBAAuB,QACtB,oBAAC,OAAD;GAAK,MAAK;GAAsB,OAAO;aACpC,oBAAoB,cAAc;EAChC,CAAA;CAEP,EAAA,CAAA;AAEN;AAEA,SAAS,YACP,QACA,UACoB;CACpB,MAAM,SAAS,6BAA6B,QAAQ,QAAQ;CAC5D,OAAO,UAAU,OACb,+BAA+B;EAC7B,WAAW,OAAO;EAClB,WAAW,OAAO;EAClB,eAAe,OAAO;CACxB,CAAC,IACD,KAAA;AACN"}
+{"version":3,"file":"renderDiffChildren.js","names":[],"sources":["../../../src/react/utils/renderDiffChildren.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 { DiffLineAnnotation, FileDiffMetadata } from '../../types';\nimport { getLineAnnotationName } from '../../utils/getLineAnnotationName';\nimport { getMergeConflictActionSlotName } from '../../utils/getMergeConflictActionSlotName';\nimport {\n  getMergeConflictActionAnchor,\n  type MergeConflictDiffAction,\n} from '../../utils/parseMergeConflictDiffFromFile';\nimport { GutterUtilitySlotStyles, MergeConflictSlotStyles } from '../constants';\nimport type { DiffBasePropsReact } from '../types';\n\ninterface RenderDiffChildrenProps<LAnnotation, Caret, T> {\n  fileDiff: FileDiffMetadata;\n  actions?: (MergeConflictDiffAction | undefined)[];\n  renderCustomHeader: DiffBasePropsReact<\n    LAnnotation,\n    Caret\n  >['renderCustomHeader'];\n  renderHeaderPrefix: DiffBasePropsReact<\n    LAnnotation,\n    Caret\n  >['renderHeaderPrefix'];\n  renderHeaderFilenameSuffix?: DiffBasePropsReact<\n    LAnnotation,\n    Caret\n  >['renderHeaderFilenameSuffix'];\n  renderHeaderMetadata: DiffBasePropsReact<\n    LAnnotation,\n    Caret\n  >['renderHeaderMetadata'];\n  renderAnnotation: DiffBasePropsReact<LAnnotation, Caret>['renderAnnotation'];\n  renderGutterUtility: DiffBasePropsReact<\n    LAnnotation,\n    Caret\n  >['renderGutterUtility'];\n  renderMergeConflictUtility?(\n    action: MergeConflictDiffAction,\n    getInstance: () => T | undefined\n  ): ReactNode;\n  lineAnnotations: DiffBasePropsReact<LAnnotation, Caret>['lineAnnotations'];\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n  getInstance?(): T | undefined;\n  getAnnotationSlotName?(annotation: DiffLineAnnotation<LAnnotation>): string;\n}\n\nexport function renderDiffChildren<LAnnotation, Caret, T>({\n  fileDiff,\n  actions,\n  renderCustomHeader,\n  renderHeaderPrefix,\n  renderHeaderFilenameSuffix,\n  renderHeaderMetadata,\n  renderAnnotation,\n  renderGutterUtility,\n  renderMergeConflictUtility,\n  lineAnnotations,\n  getHoveredLine,\n  getInstance,\n  getAnnotationSlotName = getLineAnnotationName,\n}: RenderDiffChildrenProps<LAnnotation, Caret, T>): ReactNode {\n  const customHeader = renderCustomHeader?.(fileDiff);\n  const prefix = renderHeaderPrefix?.(fileDiff);\n  const suffix = renderHeaderFilenameSuffix?.(fileDiff);\n  const metadata = renderHeaderMetadata?.(fileDiff);\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      {actions != null &&\n        renderMergeConflictUtility != null &&\n        getInstance != null &&\n        actions.map((action) => {\n          if (action == null) {\n            return undefined;\n          }\n          const slot = getSlotName(action, fileDiff);\n          return (\n            <div key={slot} slot={slot} style={MergeConflictSlotStyles}>\n              {renderMergeConflictUtility(action, getInstance)}\n            </div>\n          );\n        })}\n      {renderGutterUtility != null && (\n        <div slot=\"gutter-utility-slot\" style={GutterUtilitySlotStyles}>\n          {renderGutterUtility(getHoveredLine)}\n        </div>\n      )}\n    </>\n  );\n}\n\nfunction getSlotName(\n  action: MergeConflictDiffAction,\n  fileDiff: FileDiffMetadata\n): string | undefined {\n  const anchor = getMergeConflictActionAnchor(action, fileDiff);\n  return anchor != null\n    ? getMergeConflictActionSlotName({\n        hunkIndex: anchor.hunkIndex,\n        lineIndex: anchor.lineIndex,\n        conflictIndex: action.conflictIndex,\n      })\n    : undefined;\n}\n"],"mappings":";;;;;;;AAqDA,SAAgB,mBAA0C,EACxD,UACA,SACA,oBACA,oBACA,4BACA,sBACA,kBACA,qBACA,4BACA,iBACA,gBACA,aACA,wBAAwB,yBACoC;CAC5D,MAAM,eAAe,qBAAqB,QAAQ;CAClD,MAAM,SAAS,qBAAqB,QAAQ;CAC5C,MAAM,SAAS,6BAA6B,QAAQ;CACpD,MAAM,WAAW,uBAAuB,QAAQ;CAChD,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,WAAW,QACV,8BAA8B,QAC9B,eAAe,QACf,QAAQ,KAAK,WAAW;GACtB,IAAI,UAAU,MACZ;GAEF,MAAM,OAAO,YAAY,QAAQ,QAAQ;GACzC,OACE,oBAAC,OAAD;IAAsB;IAAM,OAAO;cAChC,2BAA2B,QAAQ,WAAW;GAC5C,GAFK,IAEL;EAET,CAAC;EACF,uBAAuB,QACtB,oBAAC,OAAD;GAAK,MAAK;GAAsB,OAAO;aACpC,oBAAoB,cAAc;EAChC,CAAA;CAEP,EAAA,CAAA;AAEN;AAEA,SAAS,YACP,QACA,UACoB;CACpB,MAAM,SAAS,6BAA6B,QAAQ,QAAQ;CAC5D,OAAO,UAAU,OACb,+BAA+B;EAC7B,WAAW,OAAO;EAClB,WAAW,OAAO;EAClB,eAAe,OAAO;CACxB,CAAC,IACD,KAAA;AACN"}