@pierre/diffs 1.6.0-beta.1 → 1.6.1

package/dist/react/utils/useFileInstance.js

@@ -1,3 +1,4 @@
+import { EMPTY_LINE_ANNOTATIONS } from "../../constants.js";
 import { areOptionsEqual } from "../../utils/areOptionsEqual.js";
 import { areFileTargetsEqual } from "../../utils/areFileTargetsEqual.js";
 import { getLineAnnotationName } from "../../utils/getLineAnnotationName.js";
@@ -8,6 +9,8 @@ import { useCreateEditor } from "../EditContext.js";
 import { noopRender } from "../constants.js";
 import { WorkerPoolContext } from "../WorkerPoolContext.js";
 import { useVirtualizer } from "../Virtualizer.js";
+import { useForceUpdate } from "./useForceUpdate.js";
+import { useNextRenderData } from "./useNextRenderData.js";
 import { useCallback, useContext, useEffect, useLayoutEffect, useRef } from "react";
 //#region src/react/utils/useFileInstance.ts
 const useIsomorphicLayoutEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
@@ -35,6 +38,12 @@ function useFileInstance({ file, options, editorOptions, editStateKey, lineAnnot
 	});
 	const onEditComplete = _onEditComplete != null ? handleOnEditComplete : void 0;
 	const instanceRef = useRef(null);
+	const forceUpdate = useForceUpdate();
+	const accepted = useAcceptedValues(acceptedCache, file, lineAnnotations);
+	const renderData = useNextRenderData(instanceRef, accepted) ?? {
+		file,
+		lineAnnotations: lineAnnotations ?? EMPTY_LINE_ANNOTATIONS
+	};
 	const disposeEditorRef = useRef(null);
 	const getEditor = useStableCallback(() => {
 		if (createEditor == null) throw new Error("File: EditContext is not attached");
@@ -50,7 +59,7 @@ function useFileInstance({ file, options, editorOptions, editStateKey, lineAnnot
 				onEditChange,
 				onEditComplete,
 				options
-			}), simpleVirtualizer, metrics, !disableWorkerPool ? poolManager : void 0, true);
+			}), simpleVirtualizer, metrics, !disableWorkerPool ? poolManager : void 0, forceUpdate);
 			else instanceRef.current = new File(mergeFileOptions({
 				controlledSelection,
 				hasCustomHeader,
@@ -58,7 +67,7 @@ function useFileInstance({ file, options, editorOptions, editStateKey, lineAnnot
 				onEditChange,
 				onEditComplete,
 				options
-			}), !disableWorkerPool ? poolManager : void 0, true);
+			}), !disableWorkerPool ? poolManager : void 0, forceUpdate);
 			if (edit && disposeEditorRef.current == null) disposeEditorRef.current = applyEdit(instanceRef.current, getEditor);
 			instanceRef.current.hydrate({
 				file,
@@ -84,7 +93,7 @@ function useFileInstance({ file, options, editorOptions, editStateKey, lineAnnot
 			onEditComplete,
 			options
 		});
-		const forceRender = newOptions !== void 0 && !areOptionsEqual(instance.options, newOptions);
+		const forceRender = !areOptionsEqual(instance.options, newOptions);
 		instance.setOptions(newOptions);
 		if (!edit && disposeEditorRef.current != null) {
 			const { current: disposeEditor } = disposeEditorRef;
@@ -98,41 +107,42 @@ function useFileInstance({ file, options, editorOptions, editStateKey, lineAnnot
 			forceRender
 		});
 		if (selectedLines !== void 0) instance.setSelectedLines(selectedLines);
-		if (edit && disposeEditorRef.current == null) disposeEditorRef.current = applyEdit(instance, getEditor);
+		if (edit && disposeEditorRef.current == null) {
+			disposeEditorRef.current = applyEdit(instance, getEditor);
+			forceUpdate();
+		}
 	});
+	const getHoveredLine = useCallback(() => {
+		return instanceRef.current?.getHoveredLine();
+	}, []);
+	const getAnnotationSlotName = useCallback((annotation) => instanceRef.current?.getAnnotationSlotName(annotation) ?? getLineAnnotationName(annotation), []);
 	return {
+		...renderData,
 		ref,
-		getHoveredLine: useCallback(() => {
-			return instanceRef.current?.getHoveredLine();
-		}, []),
-		getAnnotationSlotName: useCallback((annotation) => instanceRef.current?.getAnnotationSlotName(annotation) ?? getLineAnnotationName(annotation), [])
+		getHoveredLine,
+		getAnnotationSlotName
+	};
+}
+function useAcceptedValues(acceptedCache, file, lineAnnotations) {
+	"use no memo";
+	return getAcceptedValues(file, lineAnnotations, acceptedCache.current);
+}
+function getAcceptedValues(file, lineAnnotations, accepted) {
+	return {
+		file: accepted?.file != null && areFileTargetsEqual(file, accepted.file.stale) ? accepted.file.installed : file,
+		lineAnnotations: accepted?.annotations != null && lineAnnotations === accepted.annotations.stale ? accepted.annotations.installed : lineAnnotations
 	};
 }
 function resolveAcceptedValues(file, lineAnnotations, acceptedCache) {
 	const { current: accepted } = acceptedCache;
-	if (accepted == null) return {
-		file,
-		lineAnnotations
-	};
-	const { file: acceptedFiles, annotations: acceptedAnnotations } = accepted;
-	let resolvedFile = file;
-	if (acceptedFiles != null) {
-		if (areFileTargetsEqual(file, acceptedFiles.stale)) resolvedFile = acceptedFiles.installed;
-		else accepted.file = null;
-	}
-	let resolvedAnnotations = lineAnnotations;
-	if (acceptedAnnotations != null) {
-		if (lineAnnotations === acceptedAnnotations.stale) resolvedAnnotations = acceptedAnnotations.installed;
-		else accepted.annotations = null;
-	}
+	const resolved = getAcceptedValues(file, lineAnnotations, accepted);
+	if (accepted == null) return resolved;
+	if (accepted.file != null && !areFileTargetsEqual(file, accepted.file.stale)) accepted.file = null;
+	if (lineAnnotations !== accepted.annotations?.stale) accepted.annotations = null;
 	if (accepted.file == null && accepted.annotations == null) acceptedCache.current = null;
-	return {
-		file: resolvedFile,
-		lineAnnotations: resolvedAnnotations
-	};
+	return resolved;
 }
 function mergeFileOptions({ options, controlledSelection, hasCustomHeader, hasGutterRenderUtility, onEditChange, onEditComplete }) {
-	if (!(controlledSelection || hasGutterRenderUtility || hasCustomHeader || onEditChange != null || onEditComplete != null)) return options;
 	return {
 		...options,
 		controlledSelection,

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

@@ -1 +1 @@
-{"version":3,"file":"useFileInstance.js","names":[],"sources":["../../../src/react/utils/useFileInstance.ts"],"sourcesContent":["import {\n  type RefObject,\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n} from 'react';\n\nimport {\n  File,\n  type FileEditChangeHandler,\n  type FileEditCompleteEvent,\n  type FileEditCompleteHandler,\n  type FileOptions,\n} from '../../components/File';\nimport { VirtualizedFile } from '../../components/VirtualizedFile';\nimport type { Editor, EditorChangeEvent, EditorOptions } from '../../edit';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type {\n  FileContents,\n  LineAnnotation,\n  SelectedLineRange,\n  VirtualFileMetrics,\n} from '../../types';\nimport { areFileTargetsEqual } from '../../utils/areFileTargetsEqual';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport { getLineAnnotationName } from '../../utils/getLineAnnotationName';\nimport { noopRender } from '../constants';\nimport { useCreateEditor } from '../EditContext';\nimport { useVirtualizer } from '../Virtualizer';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsomorphicLayoutEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface AcceptedCompletion<LAnnotation> {\n  file: {\n    installed: FileContents;\n    stale: FileContents;\n  } | null;\n  annotations: {\n    installed: LineAnnotation<LAnnotation>[] | undefined;\n    stale: LineAnnotation<LAnnotation>[];\n  } | null;\n}\n\ninterface UseFileInstanceProps<LAnnotation, Caret> {\n  file: FileContents;\n  options: FileOptions<LAnnotation, Caret> | undefined;\n  editorOptions: EditorOptions<'file', LAnnotation, Caret> | undefined;\n  editStateKey: string | undefined;\n  lineAnnotations: LineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  metrics?: VirtualFileMetrics;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  disableWorkerPool: boolean;\n  edit: boolean;\n  onEditChange?: FileEditChangeHandler<LAnnotation, Caret>;\n  onEditComplete?: FileEditCompleteHandler<LAnnotation, Caret>;\n}\n\ninterface UseFileInstanceReturn<LAnnotation> {\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'file'> | undefined;\n  getAnnotationSlotName(annotation: LineAnnotation<LAnnotation>): string;\n}\n\nexport function useFileInstance<LAnnotation, Caret>({\n  file,\n  options,\n  editorOptions,\n  editStateKey,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  metrics,\n  hasGutterRenderUtility,\n  hasCustomHeader,\n  disableWorkerPool,\n  edit,\n  onEditChange: _onEditChange,\n  onEditComplete: _onEditComplete,\n}: UseFileInstanceProps<\n  LAnnotation,\n  Caret\n>): UseFileInstanceReturn<LAnnotation> {\n  const simpleVirtualizer = useVirtualizer();\n  const controlledSelection = selectedLines !== undefined;\n  const poolManager = useContext(WorkerPoolContext);\n  const createEditor = useCreateEditor<LAnnotation, Caret>();\n  const handleOnEditChange = useStableCallback(\n    (event: EditorChangeEvent<'file', LAnnotation, Caret>) =>\n      _onEditChange?.(event)\n  );\n  const onEditChange = _onEditChange != null ? handleOnEditChange : undefined;\n  // An accepted completion installs its file on the instance immediately,\n  // but the file/lineAnnotations props stay pre-edit until the owner's state\n  // update lands. This holds the accepted values so the renders in between do\n  // not repaint pre-edit state.\n  const acceptedCache = useRef<AcceptedCompletion<LAnnotation> | null>(null);\n  const handleOnEditComplete = useStableCallback(\n    (event: FileEditCompleteEvent<LAnnotation, Caret>) => {\n      const decision = _onEditComplete?.(event) ?? 'reject';\n      if (decision === 'accept') {\n        acceptedCache.current = {\n          file: { installed: event.file, stale: event.originalFile },\n          annotations: {\n            installed: event.lineAnnotations,\n            stale: event.originalLineAnnotations,\n          },\n        };\n      }\n      return decision;\n    }\n  );\n  const onEditComplete =\n    _onEditComplete != null ? handleOnEditComplete : undefined;\n  const instanceRef = useRef<\n    File<LAnnotation, Caret> | VirtualizedFile<LAnnotation, Caret> | null\n  >(null);\n  const disposeEditorRef = useRef<() => void>(null);\n  const getEditor = useStableCallback(() => {\n    if (createEditor == null) {\n      throw new Error('File: EditContext is not attached');\n    }\n    return createEditor('file', editorOptions ?? {}, editStateKey);\n  });\n  const ref = useStableCallback((node: HTMLElement | null) => {\n    if (node != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'File: An instance should not already exist when a node is created'\n        );\n      }\n      if (simpleVirtualizer != null) {\n        instanceRef.current = new VirtualizedFile(\n          mergeFileOptions({\n            controlledSelection,\n            hasCustomHeader,\n            hasGutterRenderUtility,\n            onEditChange,\n            onEditComplete,\n            options,\n          }),\n          simpleVirtualizer,\n          metrics,\n          !disableWorkerPool ? poolManager : undefined,\n          true\n        );\n      } else {\n        instanceRef.current = new File(\n          mergeFileOptions({\n            controlledSelection,\n            hasCustomHeader,\n            hasGutterRenderUtility,\n            onEditChange,\n            onEditComplete,\n            options,\n          }),\n          !disableWorkerPool ? poolManager : undefined,\n          true\n        );\n      }\n      if (edit && disposeEditorRef.current == null) {\n        disposeEditorRef.current = applyEdit(instanceRef.current, getEditor);\n      }\n      void instanceRef.current.hydrate({\n        file,\n        fileContainer: node,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error('File: A File instance should exist when unmounting');\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n      disposeEditorRef.current = null;\n    }\n  });\n\n  useIsomorphicLayoutEffect(() => {\n    const { current: instance } = instanceRef;\n    if (instance == null) return;\n    const newOptions = mergeFileOptions({\n      controlledSelection,\n      hasCustomHeader,\n      hasGutterRenderUtility,\n      onEditChange,\n      onEditComplete,\n      options,\n    });\n    // setOptions(undefined) is a no-op, so an undefined merge result never\n    // requires a forced render — comparing it against the instance's\n    // constructor-default options would force a full render on every commit.\n    const forceRender =\n      newOptions !== undefined &&\n      !areOptionsEqual(instance.options, newOptions);\n    instance.setOptions(newOptions);\n    // Detach editor before rendering if required\n    if (!edit && disposeEditorRef.current != null) {\n      const { current: disposeEditor } = disposeEditorRef;\n      disposeEditorRef.current = null;\n      disposeEditor();\n    }\n    const resolved = resolveAcceptedValues(\n      file,\n      lineAnnotations,\n      acceptedCache\n    );\n    void instance.render({\n      file: resolved.file,\n      lineAnnotations: resolved.lineAnnotations,\n      forceRender,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n    // Attach editor after rendering if required\n    if (edit && disposeEditorRef.current == null) {\n      disposeEditorRef.current = applyEdit(instance, getEditor);\n    }\n  });\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'file'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n  const getAnnotationSlotName = useCallback(\n    (annotation: LineAnnotation<LAnnotation>): string =>\n      instanceRef.current?.getAnnotationSlotName(annotation) ??\n      getLineAnnotationName(annotation),\n    []\n  );\n  return { ref, getHoveredLine, getAnnotationSlotName };\n}\n\n// Return the installed values in place of props that still match their stale\n// counterparts. Any other prop value clears its half, and the ref clears once\n// both halves have.\nfunction resolveAcceptedValues<LAnnotation>(\n  file: FileContents,\n  lineAnnotations: LineAnnotation<LAnnotation>[] | undefined,\n  acceptedCache: RefObject<AcceptedCompletion<LAnnotation> | null>\n): {\n  file: FileContents;\n  lineAnnotations: LineAnnotation<LAnnotation>[] | undefined;\n} {\n  const { current: accepted } = acceptedCache;\n  if (accepted == null) {\n    return { file, lineAnnotations };\n  }\n  const { file: acceptedFiles, annotations: acceptedAnnotations } = accepted;\n  let resolvedFile = file;\n  if (acceptedFiles != null) {\n    if (areFileTargetsEqual(file, acceptedFiles.stale)) {\n      resolvedFile = acceptedFiles.installed;\n    } else {\n      accepted.file = null;\n    }\n  }\n  let resolvedAnnotations = lineAnnotations;\n  if (acceptedAnnotations != null) {\n    if (lineAnnotations === acceptedAnnotations.stale) {\n      resolvedAnnotations = acceptedAnnotations.installed;\n    } else {\n      accepted.annotations = null;\n    }\n  }\n  if (accepted.file == null && accepted.annotations == null) {\n    acceptedCache.current = null;\n  }\n  return { file: resolvedFile, lineAnnotations: resolvedAnnotations };\n}\n\ninterface MergeFileOptionsProps<LAnnotation, Caret> {\n  options: FileOptions<LAnnotation, Caret> | undefined;\n  controlledSelection: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  onEditChange: FileEditChangeHandler<LAnnotation, Caret> | undefined;\n  onEditComplete: FileEditCompleteHandler<LAnnotation, Caret> | undefined;\n}\n\nfunction mergeFileOptions<LAnnotation, Caret>({\n  options,\n  controlledSelection,\n  hasCustomHeader,\n  hasGutterRenderUtility,\n  onEditChange,\n  onEditComplete,\n}: MergeFileOptionsProps<LAnnotation, Caret>):\n  | FileOptions<LAnnotation, Caret>\n  | undefined {\n  const needsReactOverrides =\n    controlledSelection ||\n    hasGutterRenderUtility ||\n    hasCustomHeader ||\n    onEditChange != null ||\n    onEditComplete != null;\n\n  if (!needsReactOverrides) {\n    return options;\n  }\n\n  return {\n    ...options,\n    controlledSelection,\n    renderCustomHeader: hasCustomHeader\n      ? noopRender\n      : options?.renderCustomHeader,\n    renderGutterUtility: hasGutterRenderUtility\n      ? noopRender\n      : options?.renderGutterUtility,\n    onEditChange,\n    onEditComplete,\n  };\n}\n\nfunction applyEdit<LAnnotation, Caret>(\n  instance: File<LAnnotation, Caret>,\n  getEditor: () => Editor<'file', LAnnotation, Caret>\n): () => void {\n  const editor = getEditor();\n  try {\n    return editor.edit(instance);\n  } catch (error) {\n    editor.cleanUp();\n    throw error;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"useFileInstance.js","names":[],"sources":["../../../src/react/utils/useFileInstance.ts"],"sourcesContent":["import {\n  type RefObject,\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n} from 'react';\n\nimport {\n  File,\n  type FileEditChangeHandler,\n  type FileEditCompleteEvent,\n  type FileEditCompleteHandler,\n  type FileOptions,\n  type FileRenderInput,\n} from '../../components/File';\nimport { VirtualizedFile } from '../../components/VirtualizedFile';\nimport { EMPTY_LINE_ANNOTATIONS } from '../../constants';\nimport type { Editor, EditorChangeEvent, EditorOptions } from '../../edit';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type {\n  FileContents,\n  LineAnnotation,\n  SelectedLineRange,\n  VirtualFileMetrics,\n} from '../../types';\nimport { areFileTargetsEqual } from '../../utils/areFileTargetsEqual';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport { getLineAnnotationName } from '../../utils/getLineAnnotationName';\nimport { noopRender } from '../constants';\nimport { useCreateEditor } from '../EditContext';\nimport { useVirtualizer } from '../Virtualizer';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useForceUpdate } from './useForceUpdate';\nimport { useNextRenderData } from './useNextRenderData';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsomorphicLayoutEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface AcceptedCompletion<LAnnotation> {\n  file: {\n    installed: FileContents;\n    stale: FileContents;\n  } | null;\n  annotations: {\n    installed: LineAnnotation<LAnnotation>[] | undefined;\n    stale: LineAnnotation<LAnnotation>[];\n  } | null;\n}\n\ninterface UseFileInstanceProps<LAnnotation, Caret> {\n  file: FileContents;\n  options: FileOptions<LAnnotation, Caret> | undefined;\n  editorOptions: EditorOptions<'file', LAnnotation, Caret> | undefined;\n  editStateKey: string | undefined;\n  lineAnnotations: LineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  metrics?: VirtualFileMetrics;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  disableWorkerPool: boolean;\n  edit: boolean;\n  onEditChange?: FileEditChangeHandler<LAnnotation, Caret>;\n  onEditComplete?: FileEditCompleteHandler<LAnnotation, Caret>;\n}\n\ninterface UseFileInstanceReturn<LAnnotation> {\n  file: FileContents;\n  lineAnnotations: LineAnnotation<LAnnotation>[];\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'file'> | undefined;\n  getAnnotationSlotName(annotation: LineAnnotation<LAnnotation>): string;\n}\n\nexport function useFileInstance<LAnnotation, Caret>({\n  file,\n  options,\n  editorOptions,\n  editStateKey,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  metrics,\n  hasGutterRenderUtility,\n  hasCustomHeader,\n  disableWorkerPool,\n  edit,\n  onEditChange: _onEditChange,\n  onEditComplete: _onEditComplete,\n}: UseFileInstanceProps<\n  LAnnotation,\n  Caret\n>): UseFileInstanceReturn<LAnnotation> {\n  const simpleVirtualizer = useVirtualizer();\n  const controlledSelection = selectedLines !== undefined;\n  const poolManager = useContext(WorkerPoolContext);\n  const createEditor = useCreateEditor<LAnnotation, Caret>();\n  const handleOnEditChange = useStableCallback(\n    (event: EditorChangeEvent<'file', LAnnotation, Caret>) =>\n      _onEditChange?.(event)\n  );\n  const onEditChange = _onEditChange != null ? handleOnEditChange : undefined;\n  // When an edit is accepted, the instance switches to the edited file right\n  // away, but the file and lineAnnotations props keep their pre-edit values\n  // until the parent passes new ones. This keeps the accepted values so the\n  // renders in between don't show the pre-edit file again.\n  const acceptedCache = useRef<AcceptedCompletion<LAnnotation> | null>(null);\n  const handleOnEditComplete = useStableCallback(\n    (event: FileEditCompleteEvent<LAnnotation, Caret>) => {\n      const decision = _onEditComplete?.(event) ?? 'reject';\n      if (decision === 'accept') {\n        acceptedCache.current = {\n          file: { installed: event.file, stale: event.originalFile },\n          annotations: {\n            installed: event.lineAnnotations,\n            stale: event.originalLineAnnotations,\n          },\n        };\n      }\n      return decision;\n    }\n  );\n  const onEditComplete =\n    _onEditComplete != null ? handleOnEditComplete : undefined;\n  const instanceRef = useRef<\n    File<LAnnotation, Caret> | VirtualizedFile<LAnnotation, Caret> | null\n  >(null);\n  const forceUpdate = useForceUpdate();\n  const accepted = useAcceptedValues(acceptedCache, file, lineAnnotations);\n  const renderData = useNextRenderData(instanceRef, accepted) ?? {\n    file,\n    lineAnnotations: lineAnnotations ?? EMPTY_LINE_ANNOTATIONS,\n  };\n  const disposeEditorRef = useRef<() => void>(null);\n  const getEditor = useStableCallback(() => {\n    if (createEditor == null) {\n      throw new Error('File: EditContext is not attached');\n    }\n    return createEditor('file', editorOptions ?? {}, editStateKey);\n  });\n  const ref = useStableCallback((node: HTMLElement | null) => {\n    if (node != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'File: An instance should not already exist when a node is created'\n        );\n      }\n      if (simpleVirtualizer != null) {\n        instanceRef.current = new VirtualizedFile(\n          mergeFileOptions({\n            controlledSelection,\n            hasCustomHeader,\n            hasGutterRenderUtility,\n            onEditChange,\n            onEditComplete,\n            options,\n          }),\n          simpleVirtualizer,\n          metrics,\n          !disableWorkerPool ? poolManager : undefined,\n          forceUpdate\n        );\n      } else {\n        instanceRef.current = new File(\n          mergeFileOptions({\n            controlledSelection,\n            hasCustomHeader,\n            hasGutterRenderUtility,\n            onEditChange,\n            onEditComplete,\n            options,\n          }),\n          !disableWorkerPool ? poolManager : undefined,\n          forceUpdate\n        );\n      }\n      if (edit && disposeEditorRef.current == null) {\n        disposeEditorRef.current = applyEdit(instanceRef.current, getEditor);\n      }\n      void instanceRef.current.hydrate({\n        file,\n        fileContainer: node,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error('File: A File instance should exist when unmounting');\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n      disposeEditorRef.current = null;\n    }\n  });\n\n  useIsomorphicLayoutEffect(() => {\n    const { current: instance } = instanceRef;\n    if (instance == null) return;\n    const newOptions = mergeFileOptions({\n      controlledSelection,\n      hasCustomHeader,\n      hasGutterRenderUtility,\n      onEditChange,\n      onEditComplete,\n      options,\n    });\n    const forceRender = !areOptionsEqual(instance.options, newOptions);\n    instance.setOptions(newOptions);\n    // Detach the editor before rendering when editing turns off\n    if (!edit && disposeEditorRef.current != null) {\n      const { current: disposeEditor } = disposeEditorRef;\n      disposeEditorRef.current = null;\n      disposeEditor();\n    }\n    const resolved = resolveAcceptedValues(\n      file,\n      lineAnnotations,\n      acceptedCache\n    );\n    void instance.render({\n      file: resolved.file,\n      lineAnnotations: resolved.lineAnnotations,\n      forceRender,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n    // Attach the editor after rendering when editing turns on. The editor can\n    // show content that is still highlighting, so render the children again\n    // from the edit session.\n    if (edit && disposeEditorRef.current == null) {\n      disposeEditorRef.current = applyEdit(instance, getEditor);\n      forceUpdate();\n    }\n  });\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'file'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n  const getAnnotationSlotName = useCallback(\n    (annotation: LineAnnotation<LAnnotation>): string =>\n      instanceRef.current?.getAnnotationSlotName(annotation) ??\n      getLineAnnotationName(annotation),\n    []\n  );\n  return { ...renderData, ref, getHoveredLine, getAnnotationSlotName };\n}\n\n// Read the accepted values on every render. Entries are only removed in the\n// effect, by resolveAcceptedValues. The cache changes without new props, so\n// this must not be memoized.\nfunction useAcceptedValues<LAnnotation>(\n  acceptedCache: RefObject<AcceptedCompletion<LAnnotation> | null>,\n  file: FileContents,\n  lineAnnotations: LineAnnotation<LAnnotation>[] | undefined\n): FileRenderInput<LAnnotation> {\n  'use no memo';\n  // oxlint-disable-next-line react/refs -- the cache changes without new props\n  return getAcceptedValues(file, lineAnnotations, acceptedCache.current);\n}\n\n// Use the accepted values for props that still hold their pre-edit values.\nfunction getAcceptedValues<LAnnotation>(\n  file: FileContents,\n  lineAnnotations: LineAnnotation<LAnnotation>[] | undefined,\n  accepted: AcceptedCompletion<LAnnotation> | null\n): FileRenderInput<LAnnotation> {\n  return {\n    file:\n      accepted?.file != null && areFileTargetsEqual(file, accepted.file.stale)\n        ? accepted.file.installed\n        : file,\n    lineAnnotations:\n      accepted?.annotations != null &&\n      lineAnnotations === accepted.annotations.stale\n        ? accepted.annotations.installed\n        : lineAnnotations,\n  };\n}\n\n// Return the accepted values, and drop each one once its prop no longer holds\n// the pre-edit value. The cache is cleared once both are dropped.\nfunction resolveAcceptedValues<LAnnotation>(\n  file: FileContents,\n  lineAnnotations: LineAnnotation<LAnnotation>[] | undefined,\n  acceptedCache: RefObject<AcceptedCompletion<LAnnotation> | null>\n): FileRenderInput<LAnnotation> {\n  const { current: accepted } = acceptedCache;\n  const resolved = getAcceptedValues(file, lineAnnotations, accepted);\n  if (accepted == null) {\n    return resolved;\n  }\n  if (\n    accepted.file != null &&\n    !areFileTargetsEqual(file, accepted.file.stale)\n  ) {\n    accepted.file = null;\n  }\n  if (lineAnnotations !== accepted.annotations?.stale) {\n    accepted.annotations = null;\n  }\n  if (accepted.file == null && accepted.annotations == null) {\n    acceptedCache.current = null;\n  }\n  return resolved;\n}\n\ninterface MergeFileOptionsProps<LAnnotation, Caret> {\n  options: FileOptions<LAnnotation, Caret> | undefined;\n  controlledSelection: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  onEditChange: FileEditChangeHandler<LAnnotation, Caret> | undefined;\n  onEditComplete: FileEditCompleteHandler<LAnnotation, Caret> | undefined;\n}\n\nfunction mergeFileOptions<LAnnotation, Caret>({\n  options,\n  controlledSelection,\n  hasCustomHeader,\n  hasGutterRenderUtility,\n  onEditChange,\n  onEditComplete,\n}: MergeFileOptionsProps<LAnnotation, Caret>): FileOptions<LAnnotation, Caret> {\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\n// Attach an editor to the instance, cleaning the editor up if attaching throws.\nfunction applyEdit<LAnnotation, Caret>(\n  instance: File<LAnnotation, Caret>,\n  getEditor: () => Editor<'file', LAnnotation, Caret>\n): () => void {\n  const editor = getEditor();\n  try {\n    return editor.edit(instance);\n  } catch (error) {\n    editor.cleanUp();\n    throw error;\n  }\n}\n"],"mappings":"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"}

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

@@ -0,0 +1,5 @@
+//#region src/react/utils/useForceUpdate.d.ts
+declare function useForceUpdate(): () => void;
+//#endregion
+export { useForceUpdate };
+//# sourceMappingURL=useForceUpdate.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useForceUpdate.d.ts","names":[],"sources":["../../../src/react/utils/useForceUpdate.ts"],"mappings":";iBAGgB"}

package/dist/react/utils/useForceUpdate.js

@@ -0,0 +1,27 @@
+import { useState, useSyncExternalStore } from "react";
+//#region src/react/utils/useForceUpdate.ts
+function useForceUpdate() {
+	const [store] = useState(() => {
+		let version = 0;
+		let listener;
+		return {
+			getSnapshot: () => version,
+			subscribe(next) {
+				listener = next;
+				return () => {
+					listener = void 0;
+				};
+			},
+			forceUpdate() {
+				version++;
+				listener?.();
+			}
+		};
+	});
+	useSyncExternalStore(store.subscribe, store.getSnapshot, store.getSnapshot);
+	return store.forceUpdate;
+}
+//#endregion
+export { useForceUpdate };
+
+//# sourceMappingURL=useForceUpdate.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useForceUpdate.js","names":[],"sources":["../../../src/react/utils/useForceUpdate.ts"],"sourcesContent":["import { useState, useSyncExternalStore } from 'react';\n\n// A helper hook to force a react component to re-render\nexport function useForceUpdate(): () => void {\n  const [store] = useState(() => {\n    let version = 0;\n    let listener: (() => void) | undefined;\n    return {\n      getSnapshot: () => version,\n      subscribe(next: () => void) {\n        listener = next;\n        return () => {\n          listener = undefined;\n        };\n      },\n      forceUpdate() {\n        version++;\n        listener?.();\n      },\n    };\n  });\n  useSyncExternalStore(store.subscribe, store.getSnapshot, store.getSnapshot);\n  return store.forceUpdate;\n}\n"],"mappings":";;AAGA,SAAgB,iBAA6B;CAC3C,MAAM,CAAC,SAAS,eAAe;EAC7B,IAAI,UAAU;EACd,IAAI;EACJ,OAAO;GACL,mBAAmB;GACnB,UAAU,MAAkB;IAC1B,WAAW;IACX,aAAa;KACX,WAAW,KAAA;IACb;GACF;GACA,cAAc;IACZ;IACA,WAAW;GACb;EACF;CACF,CAAC;CACD,qBAAqB,MAAM,WAAW,MAAM,aAAa,MAAM,WAAW;CAC1E,OAAO,MAAM;AACf"}

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

@@ -0,0 +1,9 @@
+import { RefObject } from "react";
+//#region src/react/utils/useNextRenderData.d.ts
+interface NextRenderDataSource<TInput, TData> {
+  __getNextRenderData(input: TInput): TData;
+}
+declare function useNextRenderData<TInput, TData>(instanceRef: RefObject<NextRenderDataSource<TInput, TData> | null>, input: TInput): TData | undefined;
+//#endregion
+export { useNextRenderData };
+//# sourceMappingURL=useNextRenderData.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useNextRenderData.d.ts","names":[],"sources":["../../../src/react/utils/useNextRenderData.ts"],"mappings":";;UAEU,qBAAqB,QAAQ;EACrC,oBAAoB,OAAO,SAAS;;iBAMtB,kBAAkB,QAAQ,OACxC,aAAa,UAAU,qBAAqB,QAAQ,gBACpD,OAAO,SACN"}

package/dist/react/utils/useNextRenderData.js

@@ -0,0 +1,9 @@
+//#region src/react/utils/useNextRenderData.ts
+function useNextRenderData(instanceRef, input) {
+	"use no memo";
+	return instanceRef.current?.__getNextRenderData(input);
+}
+//#endregion
+export { useNextRenderData };
+
+//# sourceMappingURL=useNextRenderData.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useNextRenderData.js","names":[],"sources":["../../../src/react/utils/useNextRenderData.ts"],"sourcesContent":["import type { RefObject } from 'react';\n\ninterface NextRenderDataSource<TInput, TData> {\n  __getNextRenderData(input: TInput): TData;\n}\n\n// Read the data the instance will display once render() receives this input.\n// The instance can change it without new props, so this must not be memoized.\n// Returns undefined before the instance exists.\nexport function useNextRenderData<TInput, TData>(\n  instanceRef: RefObject<NextRenderDataSource<TInput, TData> | null>,\n  input: TInput\n): TData | undefined {\n  'use no memo';\n  // oxlint-disable-next-line react/refs -- the instance changes without new props\n  return instanceRef.current?.__getNextRenderData(input);\n}\n"],"mappings":";AASA,SAAgB,kBACd,aACA,OACmB;CACnB;CAEA,OAAO,YAAY,SAAS,oBAAoB,KAAK;AACvD"}

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

@@ -16,6 +16,7 @@ interface UseUnresolvedFileInstanceProps<LAnnotation> {
   disableWorkerPool: boolean;
 }
 interface UseUnresolvedFileInstanceReturn<LAnnotation> {
+  lineAnnotations: DiffLineAnnotation<LAnnotation>[];
   fileDiff: FileDiffMetadata;
   actions: (MergeConflictDiffAction | undefined)[];
   markerRows: MergeConflictMarkerRow[];

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

@@ -1 +1 @@
-{"version":3,"file":"useUnresolvedFileInstance.d.ts","names":[],"sources":["../../../src/react/utils/useUnresolvedFileInstance.ts"],"mappings":";;;;;;UAoCU,+BAA+B;EACvC,MAAM;EACN,UAAU,2BAA2B;EACrC,iBAAiB,mBAAmB;EACpC,eAAe;EACf;EACA;EACA;EACA;EACA;;UAGQ,gCAAgC;EACxC,UAAU;EACV,UAAU;EACV,YAAY;EACZ,IAAI,MAAM;EACV,kBAAkB;EAClB,eAAe,eAAe;;iBAGhB,0BAA0B,eACxC,MACA,SACA,iBACA,eACA,iBACA,oBACA,wBACA,iBACA,qBACC,+BAA+B,eAAe,gCAAgC"}
+{"version":3,"file":"useUnresolvedFileInstance.d.ts","names":[],"sources":["../../../src/react/utils/useUnresolvedFileInstance.ts"],"mappings":";;;;;;UAuCU,+BAA+B;EACvC,MAAM;EACN,UAAU,2BAA2B;EACrC,iBAAiB,mBAAmB;EACpC,eAAe;EACf;EACA;EACA;EACA;EACA;;UAGQ,gCAAgC;EACxC,iBAAiB,mBAAmB;EACpC,UAAU;EACV,UAAU;EACV,YAAY;EACZ,IAAI,MAAM;EACV,kBAAkB;EAClB,eAAe,eAAe;;iBAGhB,0BAA0B,eACxC,MACA,SACA,iBACA,eACA,iBACA,oBACA,wBACA,iBACA,qBACC,+BAA+B,eAAe,gCAAgC"}

package/dist/react/utils/useUnresolvedFileInstance.js

@@ -1,9 +1,12 @@
+import { EMPTY_LINE_ANNOTATIONS } from "../../constants.js";
 import { areOptionsEqual } from "../../utils/areOptionsEqual.js";
 import { parseMergeConflictDiffFromFile } from "../../utils/parseMergeConflictDiffFromFile.js";
 import { UnresolvedFile } from "../../components/UnresolvedFile.js";
 import { useStableCallback } from "./useStableCallback.js";
 import { noopRender } from "../constants.js";
 import { WorkerPoolContext } from "../WorkerPoolContext.js";
+import { useForceUpdate } from "./useForceUpdate.js";
+import { useNextRenderData } from "./useNextRenderData.js";
 import { useCallback, useContext, useEffect, useLayoutEffect, useRef, useState } from "react";
 //#region src/react/utils/useUnresolvedFileInstance.ts
 const useIsomorphicLayoutEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
@@ -30,6 +33,18 @@ function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLin
 	const controlledSelection = selectedLines !== void 0;
 	const poolManager = useContext(WorkerPoolContext);
 	const instanceRef = useRef(null);
+	const forceUpdate = useForceUpdate();
+	const renderData = useNextRenderData(instanceRef, {
+		fileDiff,
+		actions,
+		markerRows,
+		lineAnnotations
+	}) ?? {
+		fileDiff,
+		actions,
+		markerRows,
+		lineAnnotations: lineAnnotations ?? EMPTY_LINE_ANNOTATIONS
+	};
 	const ref = useStableCallback((fileContainer) => {
 		if (fileContainer != null) {
 			if (instanceRef.current != null) throw new Error("useUnresolvedFileInstance: An instance should not already exist when a node is created");
@@ -40,7 +55,7 @@ function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLin
 				hasGutterRenderUtility,
 				onMergeConflictAction,
 				options
-			}), !disableWorkerPool ? poolManager : void 0, true);
+			}), !disableWorkerPool ? poolManager : void 0, forceUpdate);
 			instanceRef.current.hydrate({
 				fileDiff,
 				actions,
@@ -66,7 +81,7 @@ function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLin
 			onMergeConflictAction,
 			options
 		});
-		const forceRender = newOptions !== void 0 && !areOptionsEqual(instance.options, newOptions);
+		const forceRender = !areOptionsEqual(instance.options, newOptions);
 		instance.setOptions(newOptions);
 		instance.render({
 			fileDiff,
@@ -77,17 +92,17 @@ function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLin
 		});
 		if (selectedLines !== void 0) instance.setSelectedLines(selectedLines);
 	});
+	const getHoveredLine = useCallback(() => {
+		return instanceRef.current?.getHoveredLine();
+	}, []);
+	const getInstance = useCallback(() => {
+		return instanceRef.current ?? void 0;
+	}, []);
 	return {
+		...renderData,
 		ref,
-		getHoveredLine: useCallback(() => {
-			return instanceRef.current?.getHoveredLine();
-		}, []),
-		fileDiff,
-		actions,
-		markerRows,
-		getInstance: useCallback(() => {
-			return instanceRef.current ?? void 0;
-		}, [])
+		getHoveredLine,
+		getInstance
 	};
 }
 function mergeUnresolvedOptions({ options, controlledSelection, onMergeConflictAction, hasConflictUtility, hasCustomHeader, hasGutterRenderUtility }) {

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

@@ -1 +1 @@
-{"version":3,"file":"useUnresolvedFileInstance.js","names":["UnresolvedFileClass"],"sources":["../../../src/react/utils/useUnresolvedFileInstance.ts"],"sourcesContent":["import {\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n  useState,\n} from 'react';\n\nimport {\n  UnresolvedFile,\n  UnresolvedFile as UnresolvedFileClass,\n  type UnresolvedFileOptions,\n} from '../../components/UnresolvedFile';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type {\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n  MergeConflictActionPayload,\n  MergeConflictMarkerRow,\n  SelectedLineRange,\n} from '../../types';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport {\n  type MergeConflictDiffAction,\n  parseMergeConflictDiffFromFile,\n} from '../../utils/parseMergeConflictDiffFromFile';\nimport { noopRender } from '../constants';\nimport type { UnresolvedFileReactOptions } from '../UnresolvedFile';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsomorphicLayoutEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface UseUnresolvedFileInstanceProps<LAnnotation> {\n  file: FileContents;\n  options?: UnresolvedFileReactOptions<LAnnotation>;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  hasConflictUtility: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  disableWorkerPool: boolean;\n}\n\ninterface UseUnresolvedFileInstanceReturn<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  actions: (MergeConflictDiffAction | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n  getInstance(): UnresolvedFile<LAnnotation> | undefined;\n}\n\nexport function useUnresolvedFileInstance<LAnnotation>({\n  file,\n  options,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  hasConflictUtility,\n  hasGutterRenderUtility,\n  hasCustomHeader,\n  disableWorkerPool,\n}: UseUnresolvedFileInstanceProps<LAnnotation>): UseUnresolvedFileInstanceReturn<LAnnotation> {\n  const [{ fileDiff, actions, markerRows }, setState] = useState(() => {\n    const { fileDiff, actions, markerRows } = parseMergeConflictDiffFromFile(\n      file,\n      options?.maxContextLines\n    );\n    return { fileDiff, actions, markerRows };\n  });\n  // UnresolvedFile is intentionally uncontrolled in React. Keep an internal\n  // source-of-truth file so sequential conflict actions apply to the latest\n  // resolved contents rather than the initial prop value.\n  const onMergeConflictAction = useStableCallback(\n    (\n      payload: MergeConflictActionPayload,\n      instance: UnresolvedFile<LAnnotation>\n    ) => {\n      setState((prevState) => {\n        const { fileDiff, actions, markerRows } =\n          instance.resolveConflict(\n            payload.conflict.conflictIndex,\n            payload.resolution,\n            prevState.fileDiff\n          ) ?? {};\n        if (fileDiff == null || actions == null || markerRows == null) {\n          return prevState;\n        } else {\n          return { fileDiff, actions, markerRows };\n        }\n      });\n    }\n  );\n  const controlledSelection = selectedLines !== undefined;\n  const poolManager = useContext(WorkerPoolContext);\n  const instanceRef = useRef<UnresolvedFileClass<LAnnotation> | null>(null);\n  const ref = useStableCallback((fileContainer: HTMLElement | null) => {\n    if (fileContainer != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'useUnresolvedFileInstance: An instance should not already exist when a node is created'\n        );\n      }\n      instanceRef.current = new UnresolvedFileClass(\n        mergeUnresolvedOptions({\n          controlledSelection,\n          hasConflictUtility,\n          hasCustomHeader,\n          hasGutterRenderUtility,\n          onMergeConflictAction,\n          options,\n        }),\n        !disableWorkerPool ? poolManager : undefined,\n        true\n      );\n      void instanceRef.current.hydrate({\n        fileDiff,\n        actions,\n        markerRows,\n        fileContainer,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error(\n          'useUnresolvedFileInstance: A UnresolvedFile instance should exist when unmounting'\n        );\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n    }\n  });\n\n  useIsomorphicLayoutEffect(() => {\n    if (instanceRef.current == null) return;\n    const instance = instanceRef.current;\n    const newOptions = mergeUnresolvedOptions({\n      controlledSelection,\n      hasConflictUtility,\n      hasCustomHeader,\n      hasGutterRenderUtility,\n      onMergeConflictAction,\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      fileDiff,\n      actions,\n      markerRows,\n      lineAnnotations,\n      forceRender,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n  });\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'diff'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n\n  const getInstance = useCallback(() => {\n    return instanceRef.current ?? undefined;\n  }, []);\n\n  return { ref, getHoveredLine, fileDiff, actions, markerRows, getInstance };\n}\n\ninterface MergeUnresolvedOptionsProps<LAnnotation> {\n  options: UnresolvedFileReactOptions<LAnnotation> | undefined;\n  controlledSelection: boolean;\n  onMergeConflictAction: UnresolvedFileOptions<LAnnotation>['onMergeConflictAction'];\n  hasConflictUtility: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n}\n\nfunction mergeUnresolvedOptions<LAnnotation>({\n  options,\n  controlledSelection,\n  onMergeConflictAction,\n  hasConflictUtility,\n  hasCustomHeader,\n  hasGutterRenderUtility,\n}: MergeUnresolvedOptionsProps<LAnnotation>): UnresolvedFileOptions<LAnnotation> {\n  return {\n    ...options,\n    controlledSelection,\n    onMergeConflictAction,\n    hunkSeparators:\n      options?.hunkSeparators === 'custom'\n        ? noopRender\n        : options?.hunkSeparators,\n    // Add a placeholder type for the custom render\n    mergeConflictActionsType:\n      hasConflictUtility || options?.mergeConflictActionsType === 'custom'\n        ? noopRender\n        : options?.mergeConflictActionsType,\n    renderCustomHeader: hasCustomHeader ? noopRender : undefined,\n    renderGutterUtility: hasGutterRenderUtility ? noopRender : undefined,\n  };\n}\n"],"mappings":";;;;;;;;AAiCA,MAAM,4BACJ,OAAO,WAAW,cAAc,YAAY;AAuB9C,SAAgB,0BAAuC,EACrD,MACA,SACA,iBACA,eACA,iBACA,oBACA,wBACA,iBACA,qBAC4F;CAC5F,MAAM,CAAC,EAAE,UAAU,SAAS,cAAc,YAAY,eAAe;EACnE,MAAM,EAAE,UAAU,SAAS,eAAe,+BACxC,MACA,SAAS,eACX;EACA,OAAO;GAAE;GAAU;GAAS;EAAW;CACzC,CAAC;CAID,MAAM,wBAAwB,mBAE1B,SACA,aACG;EACH,UAAU,cAAc;GACtB,MAAM,EAAE,UAAU,SAAS,eACzB,SAAS,gBACP,QAAQ,SAAS,eACjB,QAAQ,YACR,UAAU,QACZ,KAAK,CAAC;GACR,IAAI,YAAY,QAAQ,WAAW,QAAQ,cAAc,MACvD,OAAO;QAEP,OAAO;IAAE;IAAU;IAAS;GAAW;EAE3C,CAAC;CACH,CACF;CACA,MAAM,sBAAsB,kBAAkB,KAAA;CAC9C,MAAM,cAAc,WAAW,iBAAiB;CAChD,MAAM,cAAc,OAAgD,IAAI;CACxE,MAAM,MAAM,mBAAmB,kBAAsC;EACnE,IAAI,iBAAiB,MAAM;GACzB,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,wFACF;GAEF,YAAY,UAAU,IAAIA,eACxB,uBAAuB;IACrB;IACA;IACA;IACA;IACA;IACA;GACF,CAAC,GACD,CAAC,oBAAoB,cAAc,KAAA,GACnC,IACF;GACA,YAAiB,QAAQ,QAAQ;IAC/B;IACA;IACA;IACA;IACA;IACA;GACF,CAAC;EACH,OAAO;GACL,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,mFACF;GAEF,YAAY,QAAQ,QAAQ;GAC5B,YAAY,UAAU;EACxB;CACF,CAAC;CAED,gCAAgC;EAC9B,IAAI,YAAY,WAAW,MAAM;EACjC,MAAM,WAAW,YAAY;EAC7B,MAAM,aAAa,uBAAuB;GACxC;GACA;GACA;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;GACA;GACA;EACF,CAAC;EACD,IAAI,kBAAkB,KAAA,GACpB,SAAS,iBAAiB,aAAa;CAE3C,CAAC;CAYD,OAAO;EAAE;EAAK,gBAVS,kBAEN;GACf,OAAO,YAAY,SAAS,eAAe;EAC7C,GAAG,CAAC,CAMuB;EAAG;EAAU;EAAS;EAAY,aAJzC,kBAAkB;GACpC,OAAO,YAAY,WAAW,KAAA;EAChC,GAAG,CAAC,CAEmE;CAAE;AAC3E;AAWA,SAAS,uBAAoC,EAC3C,SACA,qBACA,uBACA,oBACA,iBACA,0BAC+E;CAC/E,OAAO;EACL,GAAG;EACH;EACA;EACA,gBACE,SAAS,mBAAmB,WACxB,aACA,SAAS;EAEf,0BACE,sBAAsB,SAAS,6BAA6B,WACxD,aACA,SAAS;EACf,oBAAoB,kBAAkB,aAAa,KAAA;EACnD,qBAAqB,yBAAyB,aAAa,KAAA;CAC7D;AACF"}
+{"version":3,"file":"useUnresolvedFileInstance.js","names":["UnresolvedFileClass"],"sources":["../../../src/react/utils/useUnresolvedFileInstance.ts"],"sourcesContent":["import {\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n  useState,\n} from 'react';\n\nimport {\n  UnresolvedFile,\n  UnresolvedFile as UnresolvedFileClass,\n  type UnresolvedFileOptions,\n} from '../../components/UnresolvedFile';\nimport { EMPTY_LINE_ANNOTATIONS } from '../../constants';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type {\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n  MergeConflictActionPayload,\n  MergeConflictMarkerRow,\n  SelectedLineRange,\n} from '../../types';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport {\n  type MergeConflictDiffAction,\n  parseMergeConflictDiffFromFile,\n} from '../../utils/parseMergeConflictDiffFromFile';\nimport { noopRender } from '../constants';\nimport type { UnresolvedFileReactOptions } from '../UnresolvedFile';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useForceUpdate } from './useForceUpdate';\nimport { useNextRenderData } from './useNextRenderData';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsomorphicLayoutEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface UseUnresolvedFileInstanceProps<LAnnotation> {\n  file: FileContents;\n  options?: UnresolvedFileReactOptions<LAnnotation>;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  hasConflictUtility: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  disableWorkerPool: boolean;\n}\n\ninterface UseUnresolvedFileInstanceReturn<LAnnotation> {\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[];\n  fileDiff: FileDiffMetadata;\n  actions: (MergeConflictDiffAction | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n  getInstance(): UnresolvedFile<LAnnotation> | undefined;\n}\n\nexport function useUnresolvedFileInstance<LAnnotation>({\n  file,\n  options,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  hasConflictUtility,\n  hasGutterRenderUtility,\n  hasCustomHeader,\n  disableWorkerPool,\n}: UseUnresolvedFileInstanceProps<LAnnotation>): UseUnresolvedFileInstanceReturn<LAnnotation> {\n  const [{ fileDiff, actions, markerRows }, setState] = useState(() => {\n    const { fileDiff, actions, markerRows } = parseMergeConflictDiffFromFile(\n      file,\n      options?.maxContextLines\n    );\n    return { fileDiff, actions, markerRows };\n  });\n  // UnresolvedFile is intentionally uncontrolled in React. Keep an internal\n  // source-of-truth file so sequential conflict actions apply to the latest\n  // resolved contents rather than the initial prop value.\n  const onMergeConflictAction = useStableCallback(\n    (\n      payload: MergeConflictActionPayload,\n      instance: UnresolvedFile<LAnnotation>\n    ) => {\n      setState((prevState) => {\n        const { fileDiff, actions, markerRows } =\n          instance.resolveConflict(\n            payload.conflict.conflictIndex,\n            payload.resolution,\n            prevState.fileDiff\n          ) ?? {};\n        if (fileDiff == null || actions == null || markerRows == null) {\n          return prevState;\n        } else {\n          return { fileDiff, actions, markerRows };\n        }\n      });\n    }\n  );\n  const controlledSelection = selectedLines !== undefined;\n  const poolManager = useContext(WorkerPoolContext);\n  const instanceRef = useRef<UnresolvedFileClass<LAnnotation> | null>(null);\n  const forceUpdate = useForceUpdate();\n  const renderData = useNextRenderData(instanceRef, {\n    fileDiff,\n    actions,\n    markerRows,\n    lineAnnotations,\n  }) ?? {\n    fileDiff,\n    actions,\n    markerRows,\n    lineAnnotations: lineAnnotations ?? EMPTY_LINE_ANNOTATIONS,\n  };\n  const ref = useStableCallback((fileContainer: HTMLElement | null) => {\n    if (fileContainer != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'useUnresolvedFileInstance: An instance should not already exist when a node is created'\n        );\n      }\n      instanceRef.current = new UnresolvedFileClass(\n        mergeUnresolvedOptions({\n          controlledSelection,\n          hasConflictUtility,\n          hasCustomHeader,\n          hasGutterRenderUtility,\n          onMergeConflictAction,\n          options,\n        }),\n        !disableWorkerPool ? poolManager : undefined,\n        forceUpdate\n      );\n      void instanceRef.current.hydrate({\n        fileDiff,\n        actions,\n        markerRows,\n        fileContainer,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error(\n          'useUnresolvedFileInstance: A UnresolvedFile instance should exist when unmounting'\n        );\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n    }\n  });\n\n  useIsomorphicLayoutEffect(() => {\n    if (instanceRef.current == null) return;\n    const instance = instanceRef.current;\n    const newOptions = mergeUnresolvedOptions({\n      controlledSelection,\n      hasConflictUtility,\n      hasCustomHeader,\n      hasGutterRenderUtility,\n      onMergeConflictAction,\n      options,\n    });\n    const forceRender = !areOptionsEqual(instance.options, newOptions);\n    instance.setOptions(newOptions);\n    void instance.render({\n      fileDiff,\n      actions,\n      markerRows,\n      lineAnnotations,\n      forceRender,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n  });\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'diff'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n\n  const getInstance = useCallback(() => {\n    return instanceRef.current ?? undefined;\n  }, []);\n\n  return { ...renderData, ref, getHoveredLine, getInstance };\n}\n\ninterface MergeUnresolvedOptionsProps<LAnnotation> {\n  options: UnresolvedFileReactOptions<LAnnotation> | undefined;\n  controlledSelection: boolean;\n  onMergeConflictAction: UnresolvedFileOptions<LAnnotation>['onMergeConflictAction'];\n  hasConflictUtility: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n}\n\nfunction mergeUnresolvedOptions<LAnnotation>({\n  options,\n  controlledSelection,\n  onMergeConflictAction,\n  hasConflictUtility,\n  hasCustomHeader,\n  hasGutterRenderUtility,\n}: MergeUnresolvedOptionsProps<LAnnotation>): UnresolvedFileOptions<LAnnotation> {\n  return {\n    ...options,\n    controlledSelection,\n    onMergeConflictAction,\n    hunkSeparators:\n      options?.hunkSeparators === 'custom'\n        ? noopRender\n        : options?.hunkSeparators,\n    // Add a placeholder type for the custom render\n    mergeConflictActionsType:\n      hasConflictUtility || options?.mergeConflictActionsType === 'custom'\n        ? noopRender\n        : options?.mergeConflictActionsType,\n    renderCustomHeader: hasCustomHeader ? noopRender : undefined,\n    renderGutterUtility: hasGutterRenderUtility ? noopRender : undefined,\n  };\n}\n"],"mappings":";;;;;;;;;;;AAoCA,MAAM,4BACJ,OAAO,WAAW,cAAc,YAAY;AAwB9C,SAAgB,0BAAuC,EACrD,MACA,SACA,iBACA,eACA,iBACA,oBACA,wBACA,iBACA,qBAC4F;CAC5F,MAAM,CAAC,EAAE,UAAU,SAAS,cAAc,YAAY,eAAe;EACnE,MAAM,EAAE,UAAU,SAAS,eAAe,+BACxC,MACA,SAAS,eACX;EACA,OAAO;GAAE;GAAU;GAAS;EAAW;CACzC,CAAC;CAID,MAAM,wBAAwB,mBAE1B,SACA,aACG;EACH,UAAU,cAAc;GACtB,MAAM,EAAE,UAAU,SAAS,eACzB,SAAS,gBACP,QAAQ,SAAS,eACjB,QAAQ,YACR,UAAU,QACZ,KAAK,CAAC;GACR,IAAI,YAAY,QAAQ,WAAW,QAAQ,cAAc,MACvD,OAAO;QAEP,OAAO;IAAE;IAAU;IAAS;GAAW;EAE3C,CAAC;CACH,CACF;CACA,MAAM,sBAAsB,kBAAkB,KAAA;CAC9C,MAAM,cAAc,WAAW,iBAAiB;CAChD,MAAM,cAAc,OAAgD,IAAI;CACxE,MAAM,cAAc,eAAe;CACnC,MAAM,aAAa,kBAAkB,aAAa;EAChD;EACA;EACA;EACA;CACF,CAAC,KAAK;EACJ;EACA;EACA;EACA,iBAAiB,mBAAmB;CACtC;CACA,MAAM,MAAM,mBAAmB,kBAAsC;EACnE,IAAI,iBAAiB,MAAM;GACzB,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,wFACF;GAEF,YAAY,UAAU,IAAIA,eACxB,uBAAuB;IACrB;IACA;IACA;IACA;IACA;IACA;GACF,CAAC,GACD,CAAC,oBAAoB,cAAc,KAAA,GACnC,WACF;GACA,YAAiB,QAAQ,QAAQ;IAC/B;IACA;IACA;IACA;IACA;IACA;GACF,CAAC;EACH,OAAO;GACL,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,mFACF;GAEF,YAAY,QAAQ,QAAQ;GAC5B,YAAY,UAAU;EACxB;CACF,CAAC;CAED,gCAAgC;EAC9B,IAAI,YAAY,WAAW,MAAM;EACjC,MAAM,WAAW,YAAY;EAC7B,MAAM,aAAa,uBAAuB;GACxC;GACA;GACA;GACA;GACA;GACA;EACF,CAAC;EACD,MAAM,cAAc,CAAC,gBAAgB,SAAS,SAAS,UAAU;EACjE,SAAS,WAAW,UAAU;EAC9B,SAAc,OAAO;GACnB;GACA;GACA;GACA;GACA;EACF,CAAC;EACD,IAAI,kBAAkB,KAAA,GACpB,SAAS,iBAAiB,aAAa;CAE3C,CAAC;CAED,MAAM,iBAAiB,kBAEN;EACf,OAAO,YAAY,SAAS,eAAe;CAC7C,GAAG,CAAC,CAAC;CAEL,MAAM,cAAc,kBAAkB;EACpC,OAAO,YAAY,WAAW,KAAA;CAChC,GAAG,CAAC,CAAC;CAEL,OAAO;EAAE,GAAG;EAAY;EAAK;EAAgB;CAAY;AAC3D;AAWA,SAAS,uBAAoC,EAC3C,SACA,qBACA,uBACA,oBACA,iBACA,0BAC+E;CAC/E,OAAO;EACL,GAAG;EACH;EACA;EACA,gBACE,SAAS,mBAAmB,WACxB,aACA,SAAS;EAEf,0BACE,sBAAsB,SAAS,6BAA6B,WACxD,aACA,SAAS;EACf,oBAAoB,kBAAkB,aAAa,KAAA;EACnD,qBAAqB,yBAAyB,aAAa,KAAA;CAC7D;AACF"}

package/dist/renderers/DiffHunksRenderer.d.ts

@@ -78,7 +78,6 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   private onRenderUpdate?;
   private workerManager?;
   readonly __id: string;
-  private highlighter;
   private diff;
   private expandedHunks;
   private deletionAnnotations;
@@ -148,6 +147,8 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   protected getOptionsWithDefaults(): DiffHunksRendererOptionsWithDefaults;
   initializeHighlighter(): Promise<DiffsHighlighter>;
   hydrate(diff: FileDiffMetadata | undefined): void;
+  private getHighlightWorkerManager;
+  private cacheHighlightResult;
   private getLocalHighlightTheme;
   getEffectiveCodeOptions(): Pick<BaseCodeOptions, 'theme' | 'tokenizeMaxLineLength'>;
   private getRenderOptions;

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

@@ -1 +1 @@
-{"version":3,"file":"DiffHunksRenderer.d.ts","names":[],"sources":["../../src/renderers/DiffHunksRenderer.ts"],"mappings":";;;;;;;;UAsJiB,iCAAiC;EAChD,mBAAmB;;UAGJ,6CAA6C,KAC5D;EAGA,kBAAkB;;UAGH;EACf;EACA,UAAU;EACV;EACA;;UAGe;EACf;EACA;EACA;;UAGe;EACf,gBAAgB;EAChB,mBAAmB;EACnB,oBAAoB;;UAUL;EACf;EACA;EACA;EACA;EACA;EACA,eAAe;EACf,eAAe;;UAGA;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,UAAU;EACV,UAAU;;UAGK;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,UAAU;EACV,kBAAkB;EAClB,mBAAmB;EACnB,oBAAoB;EACpB,qBAAqB;EACrB,oBAAoB;EACpB,qBAAqB;EACrB,UAAU;EACV;EACA,SAAS;EACT,eAAe;EACf;EACA;EACA;EACA;EACA;EACA;;cAKW,kBAAkB;EAgCpB,SAAS;UACR;UAGA;UACA;WApCD;UAED;UAIA;UAEA;UAEA;UACA;UAEA;UACA;UAGA;UAGA;UAQA;EAER,YACS,UAAS,0BACR,sBACN,YAAY,mBAAmB,yBAEzB,8CACA,gBAAgB;EASnB;EAQA;;;;;;;;;;EA4BA,iBACL,MAAM,kBACN,eAAe;;EA0EV;;;;EAWA;;;;;;;;;;EAiBA,4BAA4B;UAqC3B;MA4BG,aAAa;EAIjB;EAMA,WAAW,SAAS;EAIpB,aAAa,SAAS,QAAQ;EAI9B,WACL,eACA,WAAW,qBACX;EA0BK,gBAAgB,oBAAoB;EAIpC,uBAAuB,YAAY;;EAKnC,oBACL,eAAe,YAAY;EAKtB,mBACL,iBAAiB,mBAAmB;;;;;;;EAyB/B,kBACL,YAAY,YAAY,MAAM,oBAC9B,6BACA,mCACA,uBAAuB,6BACvB;UAoKM;EAWD,oBACL,cAAc,0BAA0B;UAkElC;UAwBA;UAaA;YAOE,2BACR,YACC,6BAA6B;YAStB,yBACR,MACA,QACC,2BAA2B;UAetB;YAKU,iCAChB,KAAK,wBACF;YAGa,+BAChB,KAAK,wBACF;YAEK,0BAA0B;EAiDvB,yBAAyB,QAAQ;EAavC,QAAQ,MAAM;UA0Cb;EAQD,2BAA2B,KAChC;UAeM;;;;;;EA2CD,qBAAqB,MAAM,mBAAmB;UAwB7C;EAqCD,WACL,OAAM,8BACN,cAAa,cACZ;EAoJU,YACX,MAAM,kBACN,cAAa,cACZ,QAAQ;YASD,iBACR,gBACA,oBACA,mBAAmB,sBAClB;UAeW;UA0BN;EA6CD,mBACL,MAAM,kBACN,QAAQ,kBACR,SAAS,mBACT;UAQM;UAqCA;UAgBA;UAuBA;EAaD,iBAAiB;UAIhB;UAIA;EAmjBD,cACL,6CACA,QAAQ,oBACP;EAyBI,cACL,QAAQ,mBACR,WAAU,mBACT;EAkDI,eACL,QAAQ,mBACR,eAAc;EAKT,kBACL,UAAU,kBACV;UAqBM;UAiEA;UA+DA;UASA"}
+{"version":3,"file":"DiffHunksRenderer.d.ts","names":[],"sources":["../../src/renderers/DiffHunksRenderer.ts"],"mappings":";;;;;;;;UAuJiB,iCAAiC;EAChD,mBAAmB;;UAGJ,6CAA6C,KAC5D;EAGA,kBAAkB;;UAGH;EACf;EACA,UAAU;EACV;EACA;;UAGe;EACf;EACA;EACA;;UAGe;EACf,gBAAgB;EAChB,mBAAmB;EACnB,oBAAoB;;UAUL;EACf;EACA;EACA;EACA;EACA;EACA,eAAe;EACf,eAAe;;UAGA;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,UAAU;EACV,UAAU;;UAGK;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,UAAU;EACV,kBAAkB;EAClB,mBAAmB;EACnB,oBAAoB;EACpB,qBAAqB;EACrB,oBAAoB;EACpB,qBAAqB;EACrB,UAAU;EACV;EACA,SAAS;EACT,eAAe;EACf;EACA;EACA;EACA;EACA;EACA;;cAKW,kBAAkB;EA+BpB,SAAS;UACR;UAGA;UACA;WAnCD;UAKD;UAEA;UAEA;UACA;UAEA;UACA;UAGA;UAGA;UAQA;EAER,YACS,UAAS,0BACR,sBACN,YAAY,mBAAmB,yBAEzB,8CACA,gBAAgB;EAGnB;EAQA;;;;;;;;;;EA2BA,iBACL,MAAM,kBACN,eAAe;;EA0EV;;;;EAWA;;;;;;;;;;EAiBA,4BAA4B;UA0C3B;MA4BG,aAAa;EAIjB;EAMA,WAAW,SAAS;EAIpB,aAAa,SAAS,QAAQ;EAI9B,WACL,eACA,WAAW,qBACX;EA0BK,gBAAgB,oBAAoB;EAIpC,uBAAuB,YAAY;;EAKnC,oBACL,eAAe,YAAY;EAKtB,mBACL,iBAAiB,mBAAmB;;;;;;;EAyB/B,kBACL,YAAY,YAAY,MAAM,oBAC9B,6BACA,mCACA,uBAAuB,6BACvB;UAwKM;EAWD,oBACL,cAAc,0BAA0B;UAoElC;UA6BA;UAaA;YAOE,2BACR,YACC,6BAA6B;YAStB,yBACR,MACA,QACC,2BAA2B;UAetB;YAKU,iCAChB,KAAK,wBACF;YAGa,+BAChB,KAAK,wBACF;YAEK,0BAA0B;EAiD7B,yBAAyB,QAAQ;EAYjC,QAAQ,MAAM;UAwCb;UAWA;UAUA;EAQD,2BAA2B,KAChC;UAeM;;;;;;EA2CD,qBAAqB,MAAM,mBAAmB;UAwB7C;EA+BD,WACL,OAAM,8BACN,cAAa,cACZ;EAuJU,YACX,MAAM,kBACN,cAAa,cACZ,QAAQ;YASD,iBACR,gBACA,oBACA,mBAAmB,sBAClB;UAeW;UA2BN;EA6CD,mBACL,MAAM,kBACN,QAAQ,kBACR,SAAS,mBACT;UAQM;UAqCA;UAgBA;UAuBA;EAaD,iBAAiB;UAIhB;UAIA;EAmjBD,cACL,6CACA,QAAQ,oBACP;EAyBI,cACL,QAAQ,mBACR,WAAU,mBACT;EAkDI,eACL,QAAQ,mBACR,eAAc;EAKT,kBACL,UAAU,kBACV;UAqBM;UAiEA;UA+DA;UASA"}