@pierre/diffs 1.3.0-rc.4 → 1.3.1

package/dist/components/FileDiff.js

@@ -19,7 +19,9 @@ import { createUnsafeCSSStyleNode } from "../utils/createUnsafeCSSStyleNode.js";
 import { getMeasuredScrollbarGutter } from "../utils/scrollbarGutter.js";
 import { patchScrollbarGutterSize, wrapThemeCSS, wrapUnsafeCSS } from "../utils/cssWrappers.js";
 import { getOrCreateCodeNode } from "../utils/getOrCreateCodeNode.js";
+import { guardWebKitScrollDuringRebuild } from "../utils/guardWebKitScrollDuringRebuild.js";
 import { upsertHostThemeStyle } from "../utils/hostTheme.js";
+import { isSafari } from "../utils/platform.js";
 import { prerenderHTMLIfNecessary } from "../utils/prerenderHTMLIfNecessary.js";
 import { setPreNodeProperties } from "../utils/setWrapperNodeProps.js";
 import "./web-components.js";
@@ -254,6 +256,12 @@ var FileDiff = class {
 		if (this.codeAdditions != null) this.codeAdditions.scrollLeft = position;
 		if (this.codeDeletions != null) this.codeDeletions.scrollLeft = position;
 	}
+	__getEffectiveCodeOptions() {
+		return {
+			...this.options,
+			...this.hunksRenderer.getEffectiveCodeOptions()
+		};
+	}
 	cleanUp(recycle = false) {
 		dequeueRender(this.handleEditSessionRender);
 		this.emitPostRender(true);
@@ -475,8 +483,13 @@ var FileDiff = class {
 		if (fileDiff == null && hasFileInput && (filesDidChange || this.fileDiff == null)) nextParsedFileDiff = parseDiffFromFile(fileInput.oldFile, fileInput.newFile, this.options.parseDiffOptions);
 		const { renderRange: previousRenderRange } = this;
 		this.renderRange = nextRenderRange;
-		this.deletionFile = oldFile;
-		this.additionFile = newFile;
+		if (hasFileInput) {
+			this.deletionFile = oldFile;
+			this.additionFile = newFile;
+		} else if (fileDiff != null) {
+			this.deletionFile = void 0;
+			this.additionFile = void 0;
+		}
 		if (fileDiff != null) this.fileDiff = fileDiff;
 		else if (nextParsedFileDiff != null) {
 			diffDidChange = true;
@@ -1130,7 +1143,28 @@ var FileDiff = class {
 		if (shadowRoot == null || this.themeCSSStyle == null) return;
 		this.themeCSSStyle.textContent = patchScrollbarGutterSize(this.themeCSSStyle.textContent ?? "", getMeasuredScrollbarGutter(shadowRoot));
 	}
+	shouldGuardRebuildScroll() {
+		return this.editor != null && isSafari();
+	}
 	applyHunksToDOM(pre, result) {
+		if (this.shouldGuardRebuildScroll()) guardWebKitScrollDuringRebuild(pre, () => this.replaceCodeColumns(pre, result));
+		else this.replaceCodeColumns(pre, result);
+	}
+	applyCodeColumnsInPlace(code, ast, rowCount) {
+		const columns = this.getColumnPair(code);
+		if (columns == null) return false;
+		const gutterChildren = getElementChildren(ast[0]);
+		const contentChildren = getElementChildren(ast[1]);
+		if (gutterChildren == null || contentChildren == null) return false;
+		columns.gutter.innerHTML = toHtml(gutterChildren);
+		columns.content.innerHTML = toHtml(contentChildren);
+		if (rowCount !== this.lastRowCount) {
+			columns.gutter.style.setProperty("grid-row", `span ${rowCount}`);
+			columns.content.style.setProperty("grid-row", `span ${rowCount}`);
+		}
+		return true;
+	}
+	replaceCodeColumns(pre, result) {
 		const { overflow = "scroll" } = this.options;
 		const containerSize = (this.options.hunkSeparators ?? "line-info") === "line-info";
 		const rowSpan = overflow === "wrap" ? result.rowCount : void 0;
@@ -1154,7 +1188,7 @@ var FileDiff = class {
 				rowSpan,
 				containerSize
 			});
-			this.codeUnified.innerHTML = this.hunksRenderer.renderPartialHTML(unifiedAST);
+			if (!this.applyCodeColumnsInPlace(this.codeUnified, unifiedAST, result.rowCount)) this.codeUnified.innerHTML = this.hunksRenderer.renderPartialHTML(unifiedAST);
 			codeElements.push(this.codeUnified);
 		} else if (deletionsAST != null || additionsAST != null) {
 			if (deletionsAST != null) {
@@ -1167,7 +1201,7 @@ var FileDiff = class {
 					rowSpan,
 					containerSize
 				});
-				this.codeDeletions.innerHTML = this.hunksRenderer.renderPartialHTML(deletionsAST);
+				if (!this.applyCodeColumnsInPlace(this.codeDeletions, deletionsAST, result.rowCount)) this.codeDeletions.innerHTML = this.hunksRenderer.renderPartialHTML(deletionsAST);
 				codeElements.push(this.codeDeletions);
 			} else {
 				this.codeDeletions?.remove();
@@ -1183,7 +1217,7 @@ var FileDiff = class {
 					rowSpan,
 					containerSize
 				});
-				this.codeAdditions.innerHTML = this.hunksRenderer.renderPartialHTML(additionsAST);
+				if (!this.applyCodeColumnsInPlace(this.codeAdditions, additionsAST, result.rowCount)) this.codeAdditions.innerHTML = this.hunksRenderer.renderPartialHTML(additionsAST);
 				codeElements.push(this.codeAdditions);
 			} else {
 				this.codeAdditions?.remove();
@@ -1224,8 +1258,8 @@ var FileDiff = class {
 			overlapEnd,
 			diffStyle
 		});
-		if (trimResult < 0) throw new Error("applyPartialRender: failed to trim to overlap");
-		if (this.lastRowCount < trimResult) throw new Error("applyPartialRender: trimmed beyond DOM row count");
+		if (trimResult < 0) throw new Error("FileDiff.applyPartialRender: failed to trim to overlap");
+		if (this.lastRowCount < trimResult) throw new Error("FileDiff.applyPartialRender: trimmed beyond DOM row count");
 		let rowCount = this.lastRowCount - trimResult;
 		const renderChunk = (startingLine, totalLines) => {
 			if (totalLines <= 0 || this.fileDiff == null) return;
@@ -1296,11 +1330,15 @@ var FileDiff = class {
 		const ast = this.hunksRenderer.renderCodeAST("unified", hunksResult);
 		const gutterChildren = getElementChildren(ast?.[0]);
 		const contentChildren = getElementChildren(ast?.[1]);
-		for (const [el, astChildren] of [[columns.gutter, gutterChildren], [columns.content, contentChildren]]) if (astChildren != null) el.innerHTML = toHtml(astChildren);
-		if (hunksResult.rowCount !== this.lastRowCount) {
-			this.applyRowSpan("unified", columns, hunksResult.rowCount);
-			this.lastRowCount = hunksResult.rowCount;
-		}
+		const applyColumns = () => {
+			for (const [el, astChildren] of [[columns.gutter, gutterChildren], [columns.content, contentChildren]]) if (astChildren != null) el.innerHTML = toHtml(astChildren);
+			if (hunksResult.rowCount !== this.lastRowCount) {
+				this.applyRowSpan("unified", columns, hunksResult.rowCount);
+				this.lastRowCount = hunksResult.rowCount;
+			}
+		};
+		if (this.shouldGuardRebuildScroll()) guardWebKitScrollDuringRebuild(this.pre, applyColumns);
+		else applyColumns();
 		this.renderSeparators(hunksResult.hunkData);
 		this.managersDirty = true;
 		this.flushManagers();
@@ -1487,21 +1525,21 @@ var FileDiff = class {
 		element.style.setProperty("grid-row", `span ${size}`);
 		element.style.setProperty("min-height", `calc(${size} * 1lh)`);
 	}
+	getColumnPair(code) {
+		if (code == null) return;
+		const gutter = code.children[0];
+		const content = code.children[1];
+		if (!(gutter instanceof HTMLElement) || !(content instanceof HTMLElement) || gutter.dataset.gutter == null || content.dataset.content == null) return;
+		return {
+			gutter,
+			content
+		};
+	}
 	getCodeColumns(diffStyle, codeUnified, codeDeletions, codeAdditions) {
-		function getColumns(code) {
-			if (code == null) return;
-			const gutter = code.children[0];
-			const content = code.children[1];
-			if (!(gutter instanceof HTMLElement) || !(content instanceof HTMLElement) || gutter.dataset.gutter == null || content.dataset.content == null) return;
-			return {
-				gutter,
-				content
-			};
-		}
-		if (diffStyle === "unified") return getColumns(codeUnified);
+		if (diffStyle === "unified") return this.getColumnPair(codeUnified);
 		else {
-			const deletions = getColumns(codeDeletions);
-			const additions = getColumns(codeAdditions);
+			const deletions = this.getColumnPair(codeDeletions);
+			const additions = this.getColumnPair(codeAdditions);
 			return deletions != null || additions != null ? [deletions, additions] : void 0;
 		}
 	}