@pierre/diffs 1.2.1 → 1.2.3

package/dist/components/CodeView.js

@@ -1,8 +1,9 @@
-import { CORE_CSS_ATTRIBUTE, DEFAULT_CODE_VIEW_FILE_METRICS, DEFAULT_CODE_VIEW_LAYOUT, DEFAULT_SMOOTH_SCROLL_SETTINGS, DEFAULT_THEMES, DIFFS_DEVELOPMENT_BUILD, DIFFS_TAG_NAME, THEME_CSS_ATTRIBUTE, UNSAFE_CSS_ATTRIBUTE } from "../constants.js";
+import { CORE_CSS_ATTRIBUTE, DEFAULT_CODE_VIEW_FILE_METRICS, DEFAULT_CODE_VIEW_LAYOUT, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_SMOOTH_SCROLL_SETTINGS, DEFAULT_THEMES, DIFFS_DEVELOPMENT_BUILD, DIFFS_TAG_NAME, THEME_CSS_ATTRIBUTE, UNSAFE_CSS_ATTRIBUTE } from "../constants.js";
 import { dequeueRender, queueRender } from "../managers/UniversalRenderingManager.js";
 import { areObjectsEqual } from "../utils/areObjectsEqual.js";
-import { areSelectionsEqual } from "../utils/areSelectionsEqual.js";
 import { areThemesEqual } from "../utils/areThemesEqual.js";
+import { areOptionsEqual } from "../utils/areOptionsEqual.js";
+import { areSelectionsEqual } from "../utils/areSelectionsEqual.js";
 import { createWindowFromScrollPosition } from "../utils/createWindowFromScrollPosition.js";
 import { isStyleNode } from "../utils/isStyleNode.js";
 import { prefersReducedMotion } from "../utils/prefersReducedMotion.js";
@@ -83,6 +84,26 @@ const CODE_VIEW_SELECTION_CALLBACK_KEYS = [
 	"onLineSelectionChange",
 	"onLineSelectionEnd"
 ];
+const CODE_VIEW_ITEM_OPTIONS_STATE = Symbol("CodeView.itemOptionsState");
+function defineOptionsState(options, state) {
+	Object.defineProperty(options, CODE_VIEW_ITEM_OPTIONS_STATE, {
+		configurable: false,
+		enumerable: false,
+		value: state
+	});
+}
+function getItemOptionsState(options) {
+	return options[CODE_VIEW_ITEM_OPTIONS_STATE];
+}
+function defineItemOption(target, key, get) {
+	Object.defineProperty(target, key, {
+		configurable: false,
+		enumerable: true,
+		get() {
+			return get(this);
+		}
+	});
+}
 const DEFAULT_SCROLL_INTERACTION_RESTORE_DELAY_MS = 120;
 const SCROLLING_CODE_OVERFLOW_FIX_VARIABLE = "--diffs-overflow-override";
 const SCROLL_REBASE_CONTAINER_HEIGHT = 12e6;
@@ -90,7 +111,6 @@ const SCROLL_REBASE_TRIGGER_TOP = 1e6;
 const SCROLL_REBASE_TARGET_TOP = 2e6;
 const SCROLL_REBASE_TARGET_BOTTOM = SCROLL_REBASE_CONTAINER_HEIGHT - SCROLL_REBASE_TARGET_TOP;
 const SCROLL_REBASE_THRESHOLD = SCROLL_REBASE_CONTAINER_HEIGHT - SCROLL_REBASE_TRIGGER_TOP;
-const CODE_VIEW_ELEMENT_POOL_LIMIT = 32;
 const MOBILE_SAFARI = (() => {
 	const { navigator } = globalThis;
 	const userAgent = navigator.userAgent;
@@ -112,6 +132,8 @@ var CodeView = class CodeView {
 	selectedLines = null;
 	instanceToItem = /* @__PURE__ */ new Map();
 	layoutDirtyIndex;
+	pendingLayoutReset;
+	renderOptionsRevision = 0;
 	slotCoordinator;
 	slotSnapshot;
 	scrollListeners = /* @__PURE__ */ new Set();
@@ -138,6 +160,8 @@ var CodeView = class CodeView {
 		stickyBottom: -1
 	};
 	itemMetricsCache = DEFAULT_CODE_VIEW_FILE_METRICS;
+	fileOptionsPrototype;
+	diffOptionsPrototype;
 	pendingScrollTarget;
 	pendingLayoutAnchor;
 	scrollAnimation;
@@ -147,6 +171,8 @@ var CodeView = class CodeView {
 	stickyContainer = document.createElement("div");
 	stickyOffset = document.createElement("div");
 	elementPool = [];
+	elementPoolVersion = 0;
+	elementPoolTracker = /* @__PURE__ */ new WeakMap();
 	pendingElementPool = [];
 	options;
 	workerManager;
@@ -154,6 +180,8 @@ var CodeView = class CodeView {
 	constructor(options = { theme: DEFAULT_THEMES }, workerManager, isContainerManaged = false) {
 		this.options = options;
 		this.computeMetricsCache(options.itemMetrics);
+		this.fileOptionsPrototype = this.createFileOptionsPrototype();
+		this.diffOptionsPrototype = this.createDiffOptionsPrototype();
 		this.workerManager = workerManager;
 		this.isContainerManaged = isContainerManaged;
 		this.stickyOffset.style.contain = "layout size";
@@ -249,6 +277,7 @@ var CodeView = class CodeView {
 	}
 	setup(root) {
 		if (this.root != null) throw new Error("CodeView.setup: already setup");
+		this.workerManager?.subscribeToThemeChanges(this);
 		this.root = root;
 		this.root.style.overflowAnchor = "none";
 		this.container ??= document.createElement("div");
@@ -291,6 +320,7 @@ var CodeView = class CodeView {
 		this.idToItem.clear();
 		this.instanceToItem.clear();
 		this.layoutDirtyIndex = void 0;
+		this.pendingLayoutReset = void 0;
 		this.stickyContainer.textContent = "";
 		this.stickyOffset.style.height = "";
 		this.container?.style.removeProperty("height");
@@ -313,6 +343,7 @@ var CodeView = class CodeView {
 		this.reset();
 		this.clearElementPool();
 		this.restoreScrollInteractions();
+		this.workerManager?.unsubscribeToThemeChanges(this);
 		this.resizeObserver?.disconnect();
 		this.resizeObserver = void 0;
 		this.root?.removeEventListener("scroll", this.handleScroll);
@@ -342,9 +373,18 @@ var CodeView = class CodeView {
 		if (item == null) return;
 		item.instance.primeHighlightCache();
 	}
+	getElementPoolLimit() {
+		const viewportSize = this.getHeight() + this.config.overscrollSize * 2;
+		const { diffHeaderHeight } = this.itemMetricsCache;
+		return Math.max(8, Math.ceil(viewportSize / Math.max(diffHeaderHeight, 10)) + 1) * (this.isContainerManaged ? 2 : 1);
+	}
 	acquireElement() {
 		this.promotePendingPooledElements();
-		return this.elementPool.pop() ?? document.createElement(DIFFS_TAG_NAME);
+		let element = this.elementPool.pop();
+		while (element != null && !this.isElementPoolGenerationCurrent(element)) element = this.elementPool.pop();
+		element ??= document.createElement(DIFFS_TAG_NAME);
+		this.markElementPoolGenerationCurrent(element);
+		return element;
 	}
 	releaseRenderedItem(item) {
 		const { element } = item;
@@ -352,10 +392,10 @@ var CodeView = class CodeView {
 		item.element = void 0;
 		if (element == null) return;
 		element.remove();
-		this.cleanElementForPool(element);
+		this.cleanElement(element);
 		this.queueElementForPool(element);
 	}
-	cleanElementForPool(element) {
+	cleanElement(element) {
 		const { shadowRoot } = element;
 		if (shadowRoot != null) {
 			for (const child of Array.from(shadowRoot.children)) if (!isPooledShadowChild(child)) child.remove();
@@ -363,7 +403,8 @@ var CodeView = class CodeView {
 		if (!this.isContainerManaged) element.replaceChildren();
 	}
 	queueElementForPool(element) {
-		if (this.getElementPoolSize() >= CODE_VIEW_ELEMENT_POOL_LIMIT) return;
+		const poolLimit = this.getElementPoolLimit();
+		if (!this.isElementPoolGenerationCurrent(element) || this.getElementPoolSize() >= poolLimit) return;
 		if (this.isElementClean(element)) this.elementPool.push(element);
 		else this.pendingElementPool.push(element);
 	}
@@ -371,8 +412,9 @@ var CodeView = class CodeView {
 		if (this.pendingElementPool.length === 0) return;
 		const { pendingElementPool: pendingElements } = this;
 		this.pendingElementPool = [];
-		for (const element of pendingElements) if (this.isElementClean(element) && this.elementPool.length < CODE_VIEW_ELEMENT_POOL_LIMIT) this.elementPool.push(element);
-		else if (this.getElementPoolSize() < CODE_VIEW_ELEMENT_POOL_LIMIT) this.pendingElementPool.push(element);
+		const poolLimit = this.getElementPoolLimit();
+		for (const element of pendingElements) if (this.isElementPoolGenerationCurrent(element) && this.isElementClean(element) && this.elementPool.length < poolLimit) this.elementPool.push(element);
+		else if (this.isElementPoolGenerationCurrent(element) && this.getElementPoolSize() < poolLimit) this.pendingElementPool.push(element);
 	}
 	isElementClean(element) {
 		return element.childNodes.length === 0;
@@ -384,6 +426,16 @@ var CodeView = class CodeView {
 		this.elementPool.length = 0;
 		this.pendingElementPool.length = 0;
 	}
+	invalidateElementPool() {
+		this.elementPoolVersion++;
+		this.clearElementPool();
+	}
+	markElementPoolGenerationCurrent(element) {
+		this.elementPoolTracker.set(element, this.elementPoolVersion);
+	}
+	isElementPoolGenerationCurrent(element) {
+		return this.elementPoolTracker.get(element) === this.elementPoolVersion;
+	}
 	resolveEffectiveScrollBehavior(target, destination) {
 		if (prefersReducedMotion()) return "instant";
 		if (target.behavior !== "smooth-auto") return target.behavior ?? "instant";
@@ -446,8 +498,7 @@ var CodeView = class CodeView {
 		this.idToItem.delete(oldId);
 		item.item.id = newId;
 		this.idToItem.set(newId, item);
-		if (item.type === "diff") item.instance.setOptions(this.createOptions(item.item));
-		else item.instance.setOptions(this.createOptions(item.item));
+		this.updateItemOptionsId(item.instance.options, newId);
 		if (this.selectedLines?.id === oldId) {
 			this.selectedLines = {
 				...this.selectedLines,
@@ -504,25 +555,36 @@ var CodeView = class CodeView {
 	canSkipRenderForAppend(appendedTop) {
 		return this.container != null && this.renderState.firstIndex !== -1 && this.pendingScrollTarget == null && this.scrollAnimation == null && this.layoutDirtyIndex == null && appendedTop > this.windowSpecs.bottom;
 	}
+	onThemeChange() {
+		this.invalidateElementPool();
+	}
 	setOptions(options) {
 		if (options == null) return;
 		this.capturePendingLayoutAnchor();
+		const { options: prevOptions } = this;
 		const previousLayout = this.getLayout();
 		const { itemMetricsCache: previousItemMetrics } = this;
-		if (shouldClearPool(this.options, options)) this.clearElementPool();
+		if (shouldClearPool(prevOptions, options)) this.invalidateElementPool();
 		this.options = options;
 		const nextItemMetrics = this.computeMetricsCache(options.itemMetrics);
 		const itemMetricsChanged = !areObjectsEqual(previousItemMetrics, nextItemMetrics);
-		if (!areObjectsEqual(previousLayout, this.getLayout())) this.syncLayout();
-		for (let index = 0; index < this.items.length; index++) {
-			const item = this.items[index];
-			if (item == null) throw new Error("CodeView.setOptions: invalid item index");
-			if (itemMetricsChanged) item.instance.setMetrics(nextItemMetrics, true);
-			if (item.type === "diff") item.instance.setOptions(this.createOptions(item.item));
-			else item.instance.setOptions(this.createOptions(item.item));
+		const layoutChanged = !areObjectsEqual(previousLayout, this.getLayout());
+		if (layoutChanged) this.syncLayout();
+		const itemLayoutChanged = itemMetricsChanged || hasItemLayoutOptionChanged(prevOptions, options);
+		if (itemLayoutChanged) {
+			const previousReset = this.pendingLayoutReset;
+			this.pendingLayoutReset = {
+				metrics: itemMetricsChanged ? nextItemMetrics : previousReset?.metrics,
+				resetFileLayoutCache: true,
+				resetDiffLayoutCache: true,
+				includeEstimatedDiffHeights: previousReset?.includeEstimatedDiffHeights === true || itemMetricsChanged || hasCodeViewDiffEstimateOptionChanged(prevOptions, options)
+			};
 		}
-		this.markLayoutDirtyFromIndex(0);
-		this.scrollDirty = true;
+		if (layoutChanged || itemLayoutChanged) {
+			this.markLayoutDirtyFromIndex(0);
+			this.scrollDirty = true;
+		}
+		if (!areOptionsEqual(prevOptions, options)) this.renderOptionsRevision++;
 		if (!this.isContainerManaged && this.items.length > 0) this.render();
 	}
 	capturePendingLayoutAnchor() {
@@ -601,41 +663,33 @@ var CodeView = class CodeView {
 	}
 	createItem(input, index, top) {
 		const { itemMetricsCache: itemMetrics } = this;
-		if (input.type === "diff") return {
-			type: "diff",
-			item: input,
-			version: input.version,
-			index,
-			instance: new VirtualizedFileDiff(this.createOptions(input), this, itemMetrics, this.workerManager, this.isContainerManaged),
-			top,
-			height: 0,
-			element: void 0
-		};
+		if (input.type === "diff") {
+			const instance$1 = new VirtualizedFileDiff(this.createDiffOptions(input.id), this, itemMetrics, this.workerManager, this.isContainerManaged);
+			return {
+				type: "diff",
+				item: input,
+				version: input.version,
+				index,
+				top,
+				height: 0,
+				element: void 0,
+				renderedOptionsRevision: this.renderOptionsRevision,
+				instance: instance$1
+			};
+		}
+		const instance = new VirtualizedFile(this.createFileOptions(input.id), this, itemMetrics, this.workerManager, this.isContainerManaged);
 		return {
 			type: "file",
 			item: input,
 			version: input.version,
 			index,
-			instance: new VirtualizedFile(this.createOptions(input), this, itemMetrics, this.workerManager, this.isContainerManaged),
 			top,
 			height: 0,
-			element: void 0
+			element: void 0,
+			renderedOptionsRevision: this.renderOptionsRevision,
+			instance
 		};
 	}
-	getItemById(itemId) {
-		const item = this.idToItem.get(itemId);
-		if (item == null) console.error(`CodeView.getItemById: unknown item id "${itemId}"`);
-		return item;
-	}
-	getItemByMode(itemId, mode) {
-		const item = this.getItemById(itemId);
-		if (item == null) return;
-		if (item.type !== mode) {
-			console.error(`CodeView.getItemByMode: item id "${itemId}" is not a ${mode}`);
-			return;
-		}
-		return item;
-	}
 	applySelectedLines(selection, options) {
 		const { selectedLines: prevSelection } = this;
 		if (selection == null && prevSelection == null || selection != null && prevSelection?.id === selection.id && areSelectionsEqual(prevSelection.range, selection.range)) return;
@@ -663,57 +717,86 @@ var CodeView = class CodeView {
 	renamePendingLayoutAnchor(oldId, newId) {
 		if (this.pendingLayoutAnchor?.id === oldId) this.pendingLayoutAnchor.id = newId;
 	}
-	wrapCallbackWithContext(mode, itemId, callback) {
-		return (...args) => {
-			const item = this.getItemByMode(itemId, mode);
-			if (item == null) return;
-			return callback(...args, item);
-		};
+	createFileOptionsPrototype() {
+		const prototype = {};
+		for (const key of CODE_VIEW_FILE_OPTION_KEYS) defineItemOption(prototype, key, () => this.options[key]);
+		defineItemOption(prototype, "stickyHeader", () => this.options.stickyHeaders);
+		defineItemOption(prototype, "collapsed", (receiver) => this.getItemOptions(getItemOptionsState(receiver), "file")?.item.collapsed === true);
+		for (const key of CODE_VIEW_SHARED_CALLBACK_KEYS) this.defineItemSharedCallback(prototype, "file", key);
+		for (const key of CODE_VIEW_SELECTION_CALLBACK_KEYS) this.defineItemSelectionCallback(prototype, "file", key);
+		return prototype;
+	}
+	createDiffOptionsPrototype() {
+		const prototype = {};
+		for (const key of CODE_VIEW_DIFF_OPTION_KEYS) defineItemOption(prototype, key, () => this.options[key]);
+		defineItemOption(prototype, "stickyHeader", () => this.options.stickyHeaders);
+		defineItemOption(prototype, "hunkSeparators", () => this.options.hunkSeparators);
+		defineItemOption(prototype, "collapsed", (receiver) => this.getItemOptions(getItemOptionsState(receiver), "diff")?.item.collapsed === true);
+		for (const key of CODE_VIEW_SHARED_CALLBACK_KEYS) this.defineItemSharedCallback(prototype, "diff", key);
+		for (const key of CODE_VIEW_SELECTION_CALLBACK_KEYS) this.defineItemSelectionCallback(prototype, "diff", key);
+		return prototype;
+	}
+	createFileOptions(id) {
+		const options = Object.create(this.fileOptionsPrototype);
+		defineOptionsState(options, { id });
+		return options;
 	}
-	getWrappedOptionCallback(mode, key, itemId) {
-		const callback = this.options[key];
-		if (callback == null) return;
-		return this.wrapCallbackWithContext(mode, itemId, callback);
-	}
-	getWrappedSelectionOptionCallback(mode, key, itemId) {
-		if (this.options.enableLineSelection !== true) return;
-		const callback = this.options[key];
-		return ((range) => {
-			const item = this.getItemByMode(itemId, mode);
-			if (item == null) return;
-			const selection = range == null ? null : {
-				id: itemId,
-				range
-			};
-			if (this.options.controlledSelection !== true) {
-				if (range != null || this.selectedLines?.id === itemId) this.applySelectedLines(selection, { notify: false });
+	createDiffOptions(id) {
+		const options = Object.create(this.diffOptionsPrototype);
+		defineOptionsState(options, { id });
+		return options;
+	}
+	updateItemOptionsId(options, id) {
+		getItemOptionsState(options).id = id;
+	}
+	getItemOptions(state, mode) {
+		const item = this.idToItem.get(state.id);
+		if (item == null || item.type !== mode) return;
+		return item;
+	}
+	defineItemSharedCallback(options, mode, key) {
+		defineItemOption(options, key, (receiver) => {
+			if (this.options[key] == null) return;
+			const state = getItemOptionsState(receiver);
+			const callbackCache = state.callbackCache ??= {};
+			let wrapped = callbackCache[key];
+			if (wrapped == null) {
+				wrapped = ((...args) => {
+					const latest = this.getItemOptions(state, mode);
+					if (latest == null) return;
+					const callback = this.options[key];
+					return callback?.(...args, latest);
+				});
+				callbackCache[key] = wrapped;
 			}
-			this.options.onSelectedLinesChange?.(selection);
-			return callback?.(range, item);
+			return wrapped;
 		});
 	}
-	createOptions(item) {
-		const { id: itemId, type: mode } = item;
-		const options = mode === "file" ? { stickyHeader: this.options.stickyHeaders } : {
-			stickyHeader: this.options.stickyHeaders,
-			hunkSeparators: this.options.hunkSeparators
-		};
-		const target = options;
-		const passThroughKeys = mode === "file" ? CODE_VIEW_FILE_OPTION_KEYS : CODE_VIEW_DIFF_OPTION_KEYS;
-		for (const key of passThroughKeys) {
-			const value = this.options[key];
-			if (value !== void 0) target[key] = value;
-		}
-		target.collapsed = item.collapsed === true;
-		for (const key of CODE_VIEW_SHARED_CALLBACK_KEYS) {
-			const callback = this.getWrappedOptionCallback(mode, key, itemId);
-			if (callback !== void 0) target[key] = callback;
-		}
-		for (const key of CODE_VIEW_SELECTION_CALLBACK_KEYS) {
-			const callback = this.getWrappedSelectionOptionCallback(mode, key, itemId);
-			if (callback !== void 0) target[key] = callback;
-		}
-		return options;
+	defineItemSelectionCallback(options, mode, key) {
+		defineItemOption(options, key, (receiver) => {
+			if (this.options.enableLineSelection !== true) return;
+			const state = getItemOptionsState(receiver);
+			const callbackCache = state.callbackCache ??= {};
+			let wrapped = callbackCache[key];
+			if (wrapped == null) {
+				wrapped = ((range) => {
+					const latest = this.getItemOptions(state, mode);
+					if (latest == null) return;
+					const selection = range == null ? null : {
+						id: latest.item.id,
+						range
+					};
+					if (this.options.controlledSelection !== true) {
+						if (range != null || this.selectedLines?.id === latest.item.id) this.applySelectedLines(selection, { notify: false });
+					}
+					this.options.onSelectedLinesChange?.(selection);
+					const callback = this.options[key];
+					return callback?.(range, latest);
+				});
+				callbackCache[key] = wrapped;
+			}
+			return wrapped;
+		});
 	}
 	/**
 	* Track the earliest index whose measured layout may now be stale. Later
@@ -815,8 +898,7 @@ var CodeView = class CodeView {
 		if (item.version === nextItem.version) return false;
 		item.item = nextItem;
 		item.version = nextItem.version;
-		if (item.type === "diff") item.instance.setOptions(this.createOptions(item.item));
-		else item.instance.setOptions(this.createOptions(item.item));
+		item.renderedOptionsRevision = -1;
 		return true;
 	}
 	getMaxScrollTopForHeight(scrollHeight) {
@@ -1095,8 +1177,9 @@ var CodeView = class CodeView {
 		let computeScrollCorrection = this.pendingLayoutAnchor != null;
 		let scrollAnchor = this.getScrollAnchor(scrollTopAfterLayout);
 		if (this.layoutDirtyIndex != null) {
-			this.recomputeLayout(this.layoutDirtyIndex);
+			this.recomputeLayout(this.layoutDirtyIndex, this.pendingLayoutReset);
 			this.layoutDirtyIndex = void 0;
+			this.pendingLayoutReset = void 0;
 			computeScrollCorrection = true;
 		}
 		if (computeScrollCorrection && scrollAnchor != null) {
@@ -1146,11 +1229,17 @@ var CodeView = class CodeView {
 				item.element = this.acquireElement();
 				syncRenderedItemOrder(this.stickyContainer, item.element, prevElement);
 				instance.virtualizedSetup();
-				if (renderItem(item, item.element)) updatedItems.add(item);
+				if (renderItem(item, item.element)) {
+					item.renderedOptionsRevision = this.renderOptionsRevision;
+					updatedItems.add(item);
+				}
 				prevElement = item.element;
 			} else {
 				syncRenderedItemOrder(this.stickyContainer, item.element, prevElement);
-				if (renderItem(item)) updatedItems.add(item);
+				if (renderItem(item, void 0, item.renderedOptionsRevision !== this.renderOptionsRevision)) {
+					item.renderedOptionsRevision = this.renderOptionsRevision;
+					updatedItems.add(item);
+				}
 				prevElement = item.element;
 			}
 		}
@@ -1475,7 +1564,7 @@ var CodeView = class CodeView {
 	* onward is remeasured so downstream positions and total scroll height stay
 	* consistent after inserts, removals, or versioned item updates.
 	*/
-	recomputeLayout(startIndex = 0) {
+	recomputeLayout(startIndex = 0, reset) {
 		if (this.items.length === 0) {
 			this.scrollHeight = 0;
 			return;
@@ -1491,8 +1580,8 @@ var CodeView = class CodeView {
 			const item = this.items[index];
 			if (item == null) throw new Error("CodeView.recomputeLayout: invalid item index");
 			item.top = runningTop;
-			if (item.type === "diff") item.height = item.instance.prepareVirtualizedItem(item.item.fileDiff);
-			else item.height = item.instance.prepareVirtualizedItem(item.item.file);
+			if (item.type === "diff") item.height = item.instance.prepareCodeViewItem(item.item.fileDiff, runningTop, reset);
+			else item.height = item.instance.prepareCodeViewItem(item.item.file, runningTop, reset);
 			runningTop += item.height;
 			if (index < this.items.length - 1) runningTop += layout.gap;
 		}
@@ -1513,12 +1602,18 @@ var CodeView = class CodeView {
 };
 function prepareItemInstance(item) {
 	item.instance.cleanUp(true);
-	if (item.type === "diff") return item.instance.prepareVirtualizedItem(item.item.fileDiff);
-	else return item.instance.prepareVirtualizedItem(item.item.file);
+	if (item.type === "diff") return item.instance.prepareCodeViewItem(item.item.fileDiff, item.top);
+	else return item.instance.prepareCodeViewItem(item.item.file, item.top);
 }
 function shouldClearPool(previousOptions, nextOptions) {
 	return !areThemesEqual(previousOptions.theme ?? DEFAULT_THEMES, nextOptions.theme ?? DEFAULT_THEMES) || (previousOptions.themeType ?? "system") !== (nextOptions.themeType ?? "system") || previousOptions.unsafeCSS !== nextOptions.unsafeCSS;
 }
+function hasItemLayoutOptionChanged(previousOptions, nextOptions) {
+	return (previousOptions.overflow ?? "scroll") !== (nextOptions.overflow ?? "scroll") || (previousOptions.disableLineNumbers ?? false) !== (nextOptions.disableLineNumbers ?? false) || (previousOptions.disableFileHeader ?? false) !== (nextOptions.disableFileHeader ?? false) || previousOptions.unsafeCSS !== nextOptions.unsafeCSS || (previousOptions.diffStyle ?? "split") !== (nextOptions.diffStyle ?? "split") || (previousOptions.diffIndicators ?? "bars") !== (nextOptions.diffIndicators ?? "bars") || (previousOptions.hunkSeparators ?? "line-info") !== (nextOptions.hunkSeparators ?? "line-info") || (previousOptions.expandUnchanged ?? false) !== (nextOptions.expandUnchanged ?? false) || (previousOptions.collapsedContextThreshold ?? DEFAULT_COLLAPSED_CONTEXT_THRESHOLD) !== (nextOptions.collapsedContextThreshold ?? DEFAULT_COLLAPSED_CONTEXT_THRESHOLD);
+}
+function hasCodeViewDiffEstimateOptionChanged(previousOptions, nextOptions) {
+	return (previousOptions.disableFileHeader ?? false) !== (nextOptions.disableFileHeader ?? false) || (previousOptions.hunkSeparators ?? "line-info") !== (nextOptions.hunkSeparators ?? "line-info") || (previousOptions.expandUnchanged ?? false) !== (nextOptions.expandUnchanged ?? false) || (previousOptions.collapsedContextThreshold ?? DEFAULT_COLLAPSED_CONTEXT_THRESHOLD) !== (nextOptions.collapsedContextThreshold ?? DEFAULT_COLLAPSED_CONTEXT_THRESHOLD);
+}
 function isPooledShadowChild(child) {
 	if (child instanceof SVGElement) return true;
 	return isStyleNode(child) && (child.hasAttribute(CORE_CSS_ATTRIBUTE) || child.hasAttribute(THEME_CSS_ATTRIBUTE) || child.hasAttribute(UNSAFE_CSS_ATTRIBUTE));
@@ -1532,17 +1627,19 @@ function formatSelectedLinePoint(lineNumber, side) {
 	if (side == null) return `${lineNumber}`;
 	return `${side === "deletions" ? "D" : "A"}${lineNumber}`;
 }
-function renderItem(item, fileContainer) {
+function renderItem(item, fileContainer, forceRender = false) {
 	if (item.type === "diff") return item.instance.render({
 		deferManagers: true,
 		fileContainer,
 		fileDiff: item.item.fileDiff,
+		forceRender,
 		lineAnnotations: item.item.annotations
 	});
 	else return item.instance.render({
 		deferManagers: true,
 		fileContainer,
 		file: item.item.file,
+		forceRender,
 		lineAnnotations: item.item.annotations
 	});
 }