react-diff-viewer-continued 4.1.0 → 4.1.2

package/lib/cjs/src/index.js

@@ -161,6 +161,11 @@ class DiffViewer extends React.Component {
         super(props);
         // Cache for on-demand word diff computation
         this.wordDiffCache = new Map();
+        // Refs for measuring content column width and character width
+        this.contentColumnRef = React.createRef();
+        this.charMeasureRef = React.createRef();
+        this.stickyHeaderRef = React.createRef();
+        this.resizeObserver = null;
         /**
          * Computes word diff on-demand for a line, with caching.
          * This is used when word diff was deferred during initial computation.
@@ -211,8 +216,28 @@ class DiffViewer extends React.Component {
         this.onBlockExpand = (id) => {
             const prevState = this.state.expandedBlocks.slice();
             prevState.push(id);
-            this.setState({
-                expandedBlocks: prevState,
+            this.setState({ expandedBlocks: prevState }, () => this.recalculateOffsets());
+        };
+        /**
+         * Recalculates cumulative offsets based on current measurements.
+         * Called on resize and when blocks are expanded/collapsed.
+         */
+        this.recalculateOffsets = () => {
+            var _a;
+            if (!this.props.infiniteLoading)
+                return;
+            const columnWidth = this.measureContentColumnWidth();
+            const charWidth = this.measureCharWidth();
+            if (!columnWidth)
+                return;
+            const cacheKey = this.getMemoisedKey();
+            const { lineInformation, lineBlocks, blocks } = (_a = this.state.computedDiffResult[cacheKey]) !== null && _a !== void 0 ? _a : {};
+            if (!lineInformation)
+                return;
+            const offsets = this.buildCumulativeOffsets(lineInformation, lineBlocks, blocks, this.state.expandedBlocks, this.props.showDiffOnly, charWidth, columnWidth, this.props.splitView);
+            this.setState({ cumulativeOffsets: offsets, contentColumnWidth: columnWidth, charWidth }, () => {
+                // Force a scroll position update to recalculate visible rows with new offsets
+                this.onScroll();
             });
         };
         /**
@@ -256,10 +281,6 @@ class DiffViewer extends React.Component {
         this.renderWordDiff = (diffArray, renderer) => {
             var _a, _b;
             const showHighlight = this.shouldHighlightWordDiff();
-            const { compareMethod } = this.props;
-            // Don't apply syntax highlighting for JSON/YAML - their word diffs are computed
-            // on-demand from raw strings and syntax highlighting creates messy fragmented tokens.
-            const skipSyntaxHighlighting = compareMethod === DiffMethod.JSON || compareMethod === DiffMethod.YAML;
             // Reconstruct the full line from diff chunks
             const fullLine = diffArray
                 .map((d) => (typeof d.value === "string" ? d.value : ""))
@@ -270,9 +291,9 @@ class DiffViewer extends React.Component {
             if (fullLine.length > MAX_LINE_LENGTH) {
                 return [_jsx("span", { children: fullLine }, "long-line")];
             }
-            // If we have a renderer and syntax highlighting is enabled, try to highlight
-            // the full line first, then apply diff styling to preserve proper tokenization.
-            if (renderer && !skipSyntaxHighlighting) {
+            // If we have a renderer, try to highlight the full line first,
+            // then apply diff styling to preserve proper tokenization.
+            if (renderer) {
                 // Get the syntax-highlighted content
                 const highlighted = renderer(fullLine);
                 // Check if the renderer uses dangerouslySetInnerHTML (common with Prism, highlight.js, etc.)
@@ -379,7 +400,7 @@ class DiffViewer extends React.Component {
                             [this.styles.diffRemoved]: removed,
                             [this.styles.diffChanged]: changed,
                             [this.styles.highlightedLine]: highlightLine,
-                        }), children: _jsxs("pre", { children: [added && "+", removed && "-"] }) }), _jsx("td", { className: cn(this.styles.content, {
+                        }), children: _jsxs("pre", { children: [added && "+", removed && "-"] }) }), _jsx("td", { ref: prefix === LineNumberPrefix.LEFT && !this.state.cumulativeOffsets ? this.contentColumnRef : undefined, className: cn(this.styles.content, {
                             [this.styles.emptyLine]: !content,
                             [this.styles.diffAdded]: added,
                             [this.styles.diffRemoved]: removed,
@@ -517,7 +538,13 @@ class DiffViewer extends React.Component {
                 : Math.round(this.props.extraLinesSurroundingDiff);
             const { lineBlocks, blocks } = computeHiddenBlocks(lineInformation, diffLines, extraLines);
             this.state.computedDiffResult[cacheKey] = { lineInformation, lineBlocks, blocks };
-            this.setState((prev) => (Object.assign(Object.assign({}, prev), { computedDiffResult: this.state.computedDiffResult, isLoading: false })));
+            this.setState((prev) => (Object.assign(Object.assign({}, prev), { computedDiffResult: this.state.computedDiffResult, isLoading: false })), () => {
+                // Trigger offset recalculation after diff is computed and rendered
+                // Use requestAnimationFrame to ensure DOM is ready for measurement
+                if (this.props.infiniteLoading) {
+                    requestAnimationFrame(() => this.recalculateOffsets());
+                }
+            });
         });
         /**
          * Handles scroll events on the scrollable container.
@@ -528,7 +555,13 @@ class DiffViewer extends React.Component {
             const container = this.state.scrollableContainerRef.current;
             if (!container || !this.props.infiniteLoading)
                 return;
-            const newStartRow = Math.floor(container.scrollTop / DiffViewer.ESTIMATED_ROW_HEIGHT);
+            // Account for sticky header height in scroll calculations
+            const headerHeight = this.getStickyHeaderHeight();
+            const contentScrollTop = Math.max(0, container.scrollTop - headerHeight);
+            const { cumulativeOffsets } = this.state;
+            const newStartRow = cumulativeOffsets
+                ? this.findLineAtOffset(contentScrollTop, cumulativeOffsets)
+                : Math.floor(contentScrollTop / DiffViewer.ESTIMATED_ROW_HEIGHT);
             // Only update state if the start row changed (avoid unnecessary re-renders)
             if (newStartRow !== this.state.visibleStartRow) {
                 this.setState({ visibleStartRow: newStartRow });
@@ -538,9 +571,9 @@ class DiffViewer extends React.Component {
          * Generates the entire diff view with virtualization support.
          */
         this.renderDiff = () => {
-            var _a;
+            var _a, _b, _c, _d, _e, _f;
             const { splitView, infiniteLoading, showDiffOnly } = this.props;
-            const { computedDiffResult, expandedBlocks, visibleStartRow, scrollableContainerRef } = this.state;
+            const { computedDiffResult, expandedBlocks, visibleStartRow, scrollableContainerRef, cumulativeOffsets } = this.state;
             const cacheKey = this.getMemoisedKey();
             const { lineInformation = [], lineBlocks = [], blocks = [] } = (_a = computedDiffResult[cacheKey]) !== null && _a !== void 0 ? _a : {};
             // Calculate visible range for virtualization
@@ -549,9 +582,32 @@ class DiffViewer extends React.Component {
             const buffer = 5; // render extra rows above/below viewport
             if (infiniteLoading && scrollableContainerRef.current) {
                 const container = scrollableContainerRef.current;
-                const viewportRows = Math.ceil(container.clientHeight / DiffViewer.ESTIMATED_ROW_HEIGHT);
-                visibleRowStart = Math.max(0, visibleStartRow - buffer);
-                visibleRowEnd = visibleStartRow + viewportRows + buffer;
+                // Account for sticky header height in scroll calculations
+                const headerHeight = this.getStickyHeaderHeight();
+                const contentScrollTop = Math.max(0, container.scrollTop - headerHeight);
+                if (cumulativeOffsets) {
+                    // Variable height mode: use binary search to find visible range
+                    const totalHeight = cumulativeOffsets[cumulativeOffsets.length - 1] || 0;
+                    const lastRowIndex = cumulativeOffsets.length - 2;
+                    visibleRowStart = Math.max(0, this.findLineAtOffset(contentScrollTop, cumulativeOffsets) - buffer);
+                    visibleRowEnd = this.findLineAtOffset(contentScrollTop + container.clientHeight, cumulativeOffsets) + buffer;
+                    // IMPORTANT: The calculated offsets may overestimate row heights (based on char count),
+                    // but actual CSS rendering might produce shorter rows. To prevent empty space,
+                    // ensure we render at least enough rows to fill the viewport using ESTIMATED_ROW_HEIGHT
+                    // as a conservative minimum.
+                    const minRowsToFillViewport = Math.ceil(container.clientHeight / DiffViewer.ESTIMATED_ROW_HEIGHT);
+                    visibleRowEnd = Math.max(visibleRowEnd, visibleRowStart + minRowsToFillViewport + buffer);
+                    // Also ensure we render all rows when near the bottom
+                    if (contentScrollTop + container.clientHeight >= totalHeight - buffer * DiffViewer.ESTIMATED_ROW_HEIGHT) {
+                        visibleRowEnd = lastRowIndex + buffer;
+                    }
+                }
+                else {
+                    // Fixed height fallback
+                    const viewportRows = Math.ceil(container.clientHeight / DiffViewer.ESTIMATED_ROW_HEIGHT);
+                    visibleRowStart = Math.max(0, visibleStartRow - buffer);
+                    visibleRowEnd = visibleStartRow + viewportRows + buffer;
+                }
             }
             // First pass: build a map of lineIndex -> renderedRowIndex
             // This accounts for code folding where some lines don't render or render as fold indicators
@@ -589,6 +645,7 @@ class DiffViewer extends React.Component {
             const diffNodes = [];
             let topPadding = 0;
             let firstVisibleFound = false;
+            let lastRenderedRowIndex = -1;
             seenBlocks.clear();
             for (let lineIndex = 0; lineIndex < lineInformation.length; lineIndex++) {
                 const line = lineInformation[lineIndex];
@@ -606,9 +663,13 @@ class DiffViewer extends React.Component {
                 }
                 // Calculate top padding from the first visible row
                 if (!firstVisibleFound) {
-                    topPadding = rowIndex * DiffViewer.ESTIMATED_ROW_HEIGHT;
+                    topPadding = cumulativeOffsets
+                        ? cumulativeOffsets[rowIndex] || 0
+                        : rowIndex * DiffViewer.ESTIMATED_ROW_HEIGHT;
                     firstVisibleFound = true;
                 }
+                // Track the last rendered row for bottom padding calculation
+                lastRenderedRowIndex = rowIndex;
                 // Render the line
                 if (showDiffOnly) {
                     const blockIndex = lineBlocks[lineIndex];
@@ -628,15 +689,41 @@ class DiffViewer extends React.Component {
                     ? this.renderSplitView(line, lineIndex)
                     : this.renderInlineView(line, lineIndex));
             }
+            // Calculate total content height
+            const totalContentHeight = cumulativeOffsets
+                ? cumulativeOffsets[cumulativeOffsets.length - 1] || 0
+                : totalRenderedRows * DiffViewer.ESTIMATED_ROW_HEIGHT;
+            // Calculate bottom padding: space after the last rendered row
+            const bottomPadding = cumulativeOffsets && lastRenderedRowIndex >= 0
+                ? totalContentHeight - (cumulativeOffsets[lastRenderedRowIndex + 1] || totalContentHeight)
+                : 0;
             return {
                 diffNodes,
                 blocks,
                 lineInformation,
                 totalRenderedRows,
                 topPadding,
+                bottomPadding,
+                totalContentHeight,
+                renderedCount: diffNodes.length,
+                // Debug info
+                debug: {
+                    visibleRowStart,
+                    visibleRowEnd,
+                    totalRows: totalRenderedRows,
+                    offsetsLength: (_b = cumulativeOffsets === null || cumulativeOffsets === void 0 ? void 0 : cumulativeOffsets.length) !== null && _b !== void 0 ? _b : 0,
+                    renderedCount: diffNodes.length,
+                    scrollTop: (_d = (_c = scrollableContainerRef.current) === null || _c === void 0 ? void 0 : _c.scrollTop) !== null && _d !== void 0 ? _d : 0,
+                    headerHeight: this.getStickyHeaderHeight(),
+                    contentScrollTop: scrollableContainerRef.current
+                        ? Math.max(0, scrollableContainerRef.current.scrollTop - this.getStickyHeaderHeight())
+                        : 0,
+                    clientHeight: (_f = (_e = scrollableContainerRef.current) === null || _e === void 0 ? void 0 : _e.clientHeight) !== null && _f !== void 0 ? _f : 0,
+                }
             };
         };
         this.render = () => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
             const { oldValue, newValue, useDarkTheme, leftTitle, rightTitle, splitView, compareMethod, hideLineNumbers, nonce, } = this.props;
             if (typeof compareMethod === "string" &&
                 compareMethod !== DiffMethod.JSON) {
@@ -690,9 +777,12 @@ class DiffViewer extends React.Component {
                 overflowX: 'hidden',
                 height: this.props.infiniteLoading.containerHeight
             } : {};
-            const totalContentHeight = nodes.totalRenderedRows * DiffViewer.ESTIMATED_ROW_HEIGHT;
+            // Only apply noWrap when infiniteLoading is enabled but we don't have cumulative offsets yet
+            // Once offsets are calculated, we enable pre-wrap for proper text wrapping
+            const shouldNoWrap = !!this.props.infiniteLoading && !this.state.cumulativeOffsets;
             const tableElement = (_jsxs("table", { className: cn(this.styles.diffContainer, {
                     [this.styles.splitView]: splitView,
+                    [this.styles.noWrap]: shouldNoWrap,
                 }), onMouseUp: () => {
                     const elements = document.getElementsByClassName("right");
                     for (let i = 0; i < elements.length; i++) {
@@ -705,13 +795,42 @@ class DiffViewer extends React.Component {
                         element.classList.remove(this.styles.noSelect);
                     }
                 }, children: [_jsxs("colgroup", { children: [!this.props.hideLineNumbers && _jsx("col", { width: "50px" }), !splitView && !this.props.hideLineNumbers && _jsx("col", { width: "50px" }), this.props.renderGutter && _jsx("col", { width: "50px" }), _jsx("col", { width: "28px" }), _jsx("col", { width: "auto" }), splitView && (_jsxs(_Fragment, { children: [!this.props.hideLineNumbers && _jsx("col", { width: "50px" }), this.props.renderGutter && _jsx("col", { width: "50px" }), _jsx("col", { width: "28px" }), _jsx("col", { width: "auto" })] }))] }), _jsx("tbody", { children: nodes.diffNodes })] }));
-            return (_jsxs("div", { style: Object.assign(Object.assign({}, scrollDivStyle), { position: 'relative' }), onScroll: this.onScroll, ref: this.state.scrollableContainerRef, children: [(!this.props.hideSummary || leftTitle || rightTitle) && (_jsxs("div", { className: this.styles.stickyHeader, children: [!this.props.hideSummary && (_jsxs("div", { className: this.styles.summary, role: "banner", children: [_jsx("button", { type: "button", className: this.styles.allExpandButton, onClick: () => {
+            return (_jsxs("div", { style: Object.assign(Object.assign({}, scrollDivStyle), { position: 'relative' }), onScroll: this.onScroll, ref: this.state.scrollableContainerRef, children: [(!this.props.hideSummary || leftTitle || rightTitle) && (_jsxs("div", { ref: this.stickyHeaderRef, className: this.styles.stickyHeader, children: [!this.props.hideSummary && (_jsxs("div", { className: this.styles.summary, role: "banner", children: [_jsx("button", { type: "button", className: this.styles.allExpandButton, onClick: () => {
                                             this.setState({
                                                 expandedBlocks: allExpanded
                                                     ? []
                                                     : nodes.blocks.map((b) => b.index),
-                                            });
-                                        }, children: allExpanded ? _jsx(Fold, {}) : _jsx(Expand, {}) }), " ", totalChanges, _jsx("div", { style: { display: "flex", gap: "1px" }, children: blocks }), this.props.summary ? _jsx("span", { children: this.props.summary }) : null] })), (leftTitle || rightTitle) && (_jsxs("div", { className: this.styles.columnHeaders, children: [_jsx("div", { className: this.styles.titleBlock, children: leftTitle ? (_jsx("pre", { className: this.styles.contentText, children: leftTitle })) : null }), splitView && (_jsx("div", { className: this.styles.titleBlock, children: rightTitle ? (_jsx("pre", { className: this.styles.contentText, children: rightTitle })) : null }))] }))] })), this.state.isLoading && LoadingElement && _jsx(LoadingElement, {}), this.props.infiniteLoading ? (_jsx("div", { style: { minHeight: totalContentHeight, paddingTop: nodes.topPadding }, children: tableElement })) : (tableElement)] }));
+                                            }, () => this.recalculateOffsets());
+                                        }, children: allExpanded ? _jsx(Fold, {}) : _jsx(Expand, {}) }), " ", totalChanges, _jsx("div", { style: { display: "flex", gap: "1px" }, children: blocks }), this.props.summary ? _jsx("span", { children: this.props.summary }) : null] })), (leftTitle || rightTitle) && (_jsxs("div", { className: this.styles.columnHeaders, children: [_jsx("div", { className: this.styles.titleBlock, children: leftTitle ? (_jsx("pre", { className: this.styles.contentText, children: leftTitle })) : null }), splitView && (_jsx("div", { className: this.styles.titleBlock, children: rightTitle ? (_jsx("pre", { className: this.styles.contentText, children: rightTitle })) : null }))] }))] })), this.state.isLoading && LoadingElement && _jsx(LoadingElement, {}), this.props.infiniteLoading ? (_jsx("div", { style: {
+                            height: nodes.totalContentHeight,
+                            position: 'relative',
+                        }, children: _jsx("div", { style: {
+                                position: 'absolute',
+                                top: nodes.topPadding,
+                                left: 0,
+                                right: 0,
+                            }, children: tableElement }) })) : (tableElement), _jsx("span", { ref: this.charMeasureRef, style: {
+                            position: 'absolute',
+                            top: 0,
+                            left: '-9999px',
+                            visibility: 'hidden',
+                            whiteSpace: 'pre',
+                            fontFamily: 'monospace',
+                            fontSize: 12,
+                        }, "aria-hidden": "true", children: "M" }), this.props.infiniteLoading && this.props.showDebugInfo && (_jsxs("div", { style: {
+                            position: 'fixed',
+                            top: 10,
+                            right: 10,
+                            background: 'rgba(0,0,0,0.85)',
+                            color: '#0f0',
+                            padding: '10px',
+                            fontFamily: 'monospace',
+                            fontSize: '11px',
+                            zIndex: 9999,
+                            borderRadius: '4px',
+                            maxWidth: '300px',
+                            lineHeight: 1.4,
+                        }, children: [_jsx("div", { style: { fontWeight: 'bold', marginBottom: '5px', color: '#fff' }, children: "Debug Info" }), _jsxs("div", { children: ["scrollTop: ", nodes.debug.scrollTop] }), _jsxs("div", { children: ["headerHeight: ", nodes.debug.headerHeight] }), _jsxs("div", { children: ["contentScrollTop: ", nodes.debug.contentScrollTop] }), _jsxs("div", { children: ["clientHeight: ", nodes.debug.clientHeight] }), _jsxs("div", { style: { marginTop: '5px', borderTop: '1px solid #444', paddingTop: '5px' }, children: [_jsxs("div", { children: ["visibleRowStart: ", nodes.debug.visibleRowStart] }), _jsxs("div", { children: ["visibleRowEnd: ", nodes.debug.visibleRowEnd] })] }), _jsxs("div", { style: { marginTop: '5px', borderTop: '1px solid #444', paddingTop: '5px' }, children: [_jsxs("div", { children: ["totalRows: ", nodes.debug.totalRows] }), _jsxs("div", { children: ["offsetsLength: ", nodes.debug.offsetsLength] }), _jsxs("div", { children: ["renderedCount: ", nodes.debug.renderedCount] })] }), _jsxs("div", { style: { marginTop: '5px', borderTop: '1px solid #444', paddingTop: '5px' }, children: [_jsxs("div", { children: ["topPadding: ", nodes.topPadding.toFixed(0)] }), _jsxs("div", { children: ["bottomPadding: ", nodes.bottomPadding.toFixed(0)] }), _jsxs("div", { children: ["totalContentHeight: ", nodes.totalContentHeight.toFixed(0)] })] }), _jsxs("div", { style: { marginTop: '5px', borderTop: '1px solid #444', paddingTop: '5px', color: '#ff0' }, children: [_jsxs("div", { children: ["cumulativeOffsets: ", this.state.cumulativeOffsets ? 'SET' : 'NULL'] }), _jsxs("div", { children: ["columnWidth: ", (_b = (_a = this.state.contentColumnWidth) === null || _a === void 0 ? void 0 : _a.toFixed(0)) !== null && _b !== void 0 ? _b : 'N/A', "px"] }), _jsxs("div", { children: ["charWidth: ", (_d = (_c = this.state.charWidth) === null || _c === void 0 ? void 0 : _c.toFixed(2)) !== null && _d !== void 0 ? _d : 'N/A', "px"] }), _jsxs("div", { children: ["charsPerRow: ", this.state.contentColumnWidth && this.state.charWidth ? Math.floor(this.state.contentColumnWidth / this.state.charWidth) : 'N/A'] })] }), this.state.cumulativeOffsets && (_jsxs("div", { style: { marginTop: '5px', borderTop: '1px solid #444', paddingTop: '5px', color: '#0ff', fontSize: '10px' }, children: [_jsxs("div", { children: ["offsets[", nodes.debug.visibleRowEnd, "]: ", (_f = (_e = this.state.cumulativeOffsets[nodes.debug.visibleRowEnd]) === null || _e === void 0 ? void 0 : _e.toFixed(0)) !== null && _f !== void 0 ? _f : 'N/A'] }), _jsxs("div", { children: ["offsets[", nodes.debug.totalRows - 1, "]: ", (_h = (_g = this.state.cumulativeOffsets[nodes.debug.totalRows - 1]) === null || _g === void 0 ? void 0 : _g.toFixed(0)) !== null && _h !== void 0 ? _h : 'N/A'] }), _jsxs("div", { children: ["offsets[", nodes.debug.totalRows, "]: ", (_k = (_j = this.state.cumulativeOffsets[nodes.debug.totalRows]) === null || _j === void 0 ? void 0 : _j.toFixed(0)) !== null && _k !== void 0 ? _k : 'N/A'] }), _jsxs("div", { style: { marginTop: '3px' }, children: ["viewportEnd: ", (nodes.debug.contentScrollTop + nodes.debug.clientHeight).toFixed(0)] }), _jsxs("div", { style: { marginTop: '3px', color: '#f0f' }, children: ["scrollHeight: ", (_m = (_l = this.state.scrollableContainerRef.current) === null || _l === void 0 ? void 0 : _l.scrollHeight) !== null && _m !== void 0 ? _m : 'N/A'] }), _jsxs("div", { children: ["maxScrollTop: ", ((_p = (_o = this.state.scrollableContainerRef.current) === null || _o === void 0 ? void 0 : _o.scrollHeight) !== null && _p !== void 0 ? _p : 0) - nodes.debug.clientHeight] })] }))] }))] }));
         };
         this.state = {
             expandedBlocks: [],
@@ -719,9 +838,117 @@ class DiffViewer extends React.Component {
             scrollableContainerRef: React.createRef(),
             computedDiffResult: {},
             isLoading: false,
-            visibleStartRow: 0
+            visibleStartRow: 0,
+            contentColumnWidth: null,
+            charWidth: null,
+            cumulativeOffsets: null,
         };
     }
+    /**
+     * Gets the height of the sticky header, if present.
+     */
+    getStickyHeaderHeight() {
+        var _a;
+        return ((_a = this.stickyHeaderRef.current) === null || _a === void 0 ? void 0 : _a.offsetHeight) || 0;
+    }
+    /**
+     * Measures the width of a single character in the monospace font.
+     * Falls back to 7.2px if measurement fails.
+     */
+    measureCharWidth() {
+        const span = this.charMeasureRef.current;
+        if (!span)
+            return 7.2; // fallback
+        return span.getBoundingClientRect().width || 7.2;
+    }
+    /**
+     * Measures the available width for content in a content column.
+     * Falls back to estimating from container width if direct measurement fails.
+     */
+    measureContentColumnWidth() {
+        // Try direct measurement first
+        const cell = this.contentColumnRef.current;
+        if (cell && cell.clientWidth > 0) {
+            const style = window.getComputedStyle(cell);
+            const padding = parseFloat(style.paddingLeft) + parseFloat(style.paddingRight);
+            const width = cell.clientWidth - padding;
+            if (width > 0)
+                return width;
+        }
+        // Fallback: estimate from container width
+        // In split view: container has 2 content columns + gutters (50px each) + markers (28px each)
+        // In unified view: 1 content column + 2 gutters + 1 marker
+        const container = this.state.scrollableContainerRef.current;
+        if (!container || container.clientWidth <= 0)
+            return null;
+        const containerWidth = container.clientWidth;
+        const gutterWidth = this.props.hideLineNumbers ? 0 : 50;
+        const markerWidth = 28;
+        const gutterCount = this.props.splitView ? 2 : 2; // left gutter(s)
+        const markerCount = this.props.splitView ? 2 : 1;
+        const contentColumns = this.props.splitView ? 2 : 1;
+        const fixedWidth = gutterCount * gutterWidth + markerCount * markerWidth;
+        const availableWidth = containerWidth - fixedWidth;
+        return Math.max(100, availableWidth / contentColumns); // minimum 100px
+    }
+    /**
+     * Gets the text length from a value that may be a string or DiffInformation array.
+     */
+    getTextLength(value) {
+        if (!value)
+            return 0;
+        if (typeof value === 'string')
+            return value.length;
+        return value.reduce((sum, d) => sum + (typeof d.value === 'string' ? d.value.length : 0), 0);
+    }
+    /**
+     * Builds cumulative vertical offsets for each line based on character count and column width.
+     * This allows accurate scroll position calculations with variable row heights.
+     */
+    buildCumulativeOffsets(lineInformation, lineBlocks, blocks, expandedBlocks, showDiffOnly, charWidth, columnWidth, splitView) {
+        var _a, _b;
+        const offsets = [0];
+        const seenBlocks = new Set();
+        for (let i = 0; i < lineInformation.length; i++) {
+            const line = lineInformation[i];
+            if (showDiffOnly) {
+                const blockIndex = lineBlocks[i];
+                if (blockIndex !== undefined && !expandedBlocks.includes(blockIndex)) {
+                    const isLastLine = blocks[blockIndex].endLine === i;
+                    if (!seenBlocks.has(blockIndex) && isLastLine) {
+                        seenBlocks.add(blockIndex);
+                        offsets.push(offsets[offsets.length - 1] + DiffViewer.ESTIMATED_ROW_HEIGHT);
+                    }
+                    continue;
+                }
+            }
+            // Calculate visual rows for this line
+            const leftLen = ((_a = line.left) === null || _a === void 0 ? void 0 : _a.value) ? this.getTextLength(line.left.value) : 0;
+            const rightLen = ((_b = line.right) === null || _b === void 0 ? void 0 : _b.value) ? this.getTextLength(line.right.value) : 0;
+            const maxLen = splitView ? Math.max(leftLen, rightLen) : (leftLen || rightLen);
+            const charsPerRow = Math.floor(columnWidth / charWidth);
+            const visualRows = charsPerRow > 0 ? Math.max(1, Math.ceil(maxLen / charsPerRow)) : 1;
+            offsets.push(offsets[offsets.length - 1] + visualRows * DiffViewer.ESTIMATED_ROW_HEIGHT);
+        }
+        return offsets;
+    }
+    /**
+     * Binary search to find the line index at a given scroll offset.
+     */
+    findLineAtOffset(scrollTop, offsets) {
+        let low = 0;
+        let high = offsets.length - 2;
+        while (low < high) {
+            const mid = Math.floor((low + high + 1) / 2);
+            if (offsets[mid] <= scrollTop) {
+                low = mid;
+            }
+            else {
+                high = mid - 1;
+            }
+        }
+        return low;
+    }
     componentDidUpdate(prevProps) {
         if (prevProps.oldValue !== this.props.oldValue ||
             prevProps.newValue !== this.props.newValue ||
@@ -730,13 +957,32 @@ class DiffViewer extends React.Component {
             prevProps.linesOffset !== this.props.linesOffset) {
             // Clear word diff cache when diff changes
             this.wordDiffCache.clear();
-            this.setState((prev) => (Object.assign(Object.assign({}, prev), { isLoading: true, visibleStartRow: 0 })));
+            // Reset scroll position to top
+            const container = this.state.scrollableContainerRef.current;
+            if (container) {
+                container.scrollTop = 0;
+            }
+            this.setState((prev) => (Object.assign(Object.assign({}, prev), { isLoading: true, visibleStartRow: 0, cumulativeOffsets: null })));
             this.memoisedCompute();
         }
     }
     componentDidMount() {
         this.setState((prev) => (Object.assign(Object.assign({}, prev), { isLoading: true })));
         this.memoisedCompute();
+        // Set up ResizeObserver for recalculating offsets on container resize
+        if (typeof ResizeObserver !== 'undefined' && this.props.infiniteLoading) {
+            this.resizeObserver = new ResizeObserver(() => {
+                requestAnimationFrame(() => this.recalculateOffsets());
+            });
+            const container = this.state.scrollableContainerRef.current;
+            if (container) {
+                this.resizeObserver.observe(container);
+            }
+        }
+    }
+    componentWillUnmount() {
+        var _a;
+        (_a = this.resizeObserver) === null || _a === void 0 ? void 0 : _a.disconnect();
     }
 }
 DiffViewer.defaultProps = {

package/lib/cjs/src/styles.d.ts

@@ -28,6 +28,7 @@ export interface ReactDiffViewerStyles {
     content?: string;
     column?: string;
     noSelect?: string;
+    noWrap?: string;
     splitView?: string;
     allExpandButton?: string;
     [key: string]: string | undefined;

package/lib/cjs/src/styles.js

@@ -72,6 +72,7 @@ export default (styleOverride, useDarkTheme = false, nonce = "") => {
     const { css, cx } = createEmotion({ key: "react-diff", nonce });
     const content = css({
         width: "auto",
+        overflow: "hidden",
         label: "content",
     });
     const splitView = css({
@@ -113,6 +114,9 @@ export default (styleOverride, useDarkTheme = false, nonce = "") => {
         },
         label: "diff-container",
         borderCollapse: "collapse",
+        "@media (max-width: 768px)": {
+            minWidth: "unset",
+        },
     });
     const lineContent = css({
         overflow: "hidden",
@@ -130,6 +134,16 @@ export default (styleOverride, useDarkTheme = false, nonce = "") => {
         userSelect: "none",
         label: "unselectable",
     });
+    const noWrap = css({
+        label: "no-wrap",
+        pre: {
+            whiteSpace: "pre",
+        },
+        [`.${contentText}`]: {
+            whiteSpace: "pre",
+            lineBreak: "auto",
+        },
+    });
     const allExpandButton = css({
         background: "transparent",
         border: "none",
@@ -376,6 +390,7 @@ export default (styleOverride, useDarkTheme = false, nonce = "") => {
         blockDeletion,
         wordRemoved,
         noSelect: unselectable,
+        noWrap,
         codeFoldGutter,
         codeFoldExpandButton,
         codeFoldContentContainer,