@git-diff-view/react 0.0.5 → 0.0.6

package/dist/cjs/index.development.js

@@ -1515,6 +1515,7 @@ lowlight.register("vue", function hljsDefineVue(hljs) {
 const highlighter = lowlight;
 let _autoDetectLang = true;
 let _maxLineToIgnoreSyntax = 2000;
+const _ignoreSyntaxHighlightList = [];
 Object.defineProperty(highlighter, "maxLineToIgnoreSyntax", {
     get: () => _maxLineToIgnoreSyntax,
 });
@@ -1531,11 +1532,21 @@ Object.defineProperty(highlighter, "setAutoDetectLang", {
         _autoDetectLang = v;
     },
 });
+Object.defineProperty(highlighter, "ignoreSyntaxHighlightList", {
+    get: () => _ignoreSyntaxHighlightList,
+});
+Object.defineProperty(highlighter, "setIgnoreSyntaxHighlightList", {
+    value: (v) => {
+        _ignoreSyntaxHighlightList.length = 0;
+        _ignoreSyntaxHighlightList.push(...v);
+    },
+});
 
 const map = new LRUCache({ max: 30 });
 class File {
     raw;
     lang;
+    fileName;
     ast;
     rawFile = {};
     hasDoRaw = false;
@@ -1544,9 +1555,10 @@ class File {
     hasDoSyntax = false;
     syntaxLength;
     maxLineNumber = 0;
-    constructor(raw, lang) {
+    constructor(raw, lang, fileName) {
         this.raw = raw;
         this.lang = lang;
+        this.fileName = fileName;
         Object.defineProperty(this, "__v_skip", { value: true });
     }
     doSyntax({ autoDetectLang, registerHighlighter, }) {
@@ -1569,6 +1581,11 @@ class File {
             console.warn(`ignore syntax for current file, because the rawLength is too long: ${this.rawLength}`);
             return;
         }
+        if (this.fileName &&
+            _highlighter.ignoreSyntaxHighlightList.some((item) => item instanceof RegExp ? item.test(this.fileName) : this.fileName === item)) {
+            console.warn(`ignore syntax for current file, because the fileName is in the ignoreSyntaxHighlightList: ${this.fileName}`);
+            return;
+        }
         if (hasRegisteredLang) {
             this.ast = _highlighter.highlight(this.lang, this.raw);
         }
@@ -1588,10 +1605,18 @@ class File {
         const rawArray = rawString.split("\n");
         this.rawLength = rawArray.length;
         this.maxLineNumber = rawArray.length;
-        this.rawFile = rawArray.reduce((p, item, index) => ({
-            ...p,
-            [index + 1]: index < rawArray.length - 1 ? item + "\n" : item,
-        }), {});
+        this.rawFile = {};
+        for (let i = 0; i < rawArray.length; i++) {
+            this.rawFile[i + 1] = i < rawArray.length - 1 ? rawArray[i] + "\n" : rawArray[i];
+        }
+        // reduce 对于大数组性能很差
+        // this.rawFile = rawArray.reduce(
+        //   (p, item, index) => ({
+        //     ...p,
+        //     [index + 1]: index < rawArray.length - 1 ? item + "\n" : item,
+        //   }),
+        //   {}
+        // );
         this.hasDoRaw = true;
     }
     #doAST() {
@@ -1682,11 +1707,11 @@ class File {
         }
     }
 }
-const getFile = (raw, lang) => {
-    const key = raw + "--" + "0.0.5" + "--" + lang;
+const getFile = (raw, lang, fileName) => {
+    const key = raw + "--" + "0.0.6" + "--" + lang;
     if (map.has(key))
         return map.get(key);
-    const file = new File(raw, lang);
+    const file = new File(raw, lang, fileName);
     map.set(key, file);
     return file;
 };
@@ -1720,10 +1745,20 @@ function relativeChanges(stringA, stringB) {
     let aRange = { location: 0, length: stringA.length };
     const _stringA = stringA.trimEnd();
     const _stringB = stringB.trimEnd();
-    if (_stringA === _stringB) {
+    const aEndStr = stringA.slice(-2);
+    const bEndStr = stringB.slice(-2);
+    if (_stringA === _stringB && aEndStr !== bEndStr && (aEndStr === "\r\n" || bEndStr === "\r\n")) {
         return {
-            stringARange: { location: _stringA.length, length: stringA.length - _stringA.length },
-            stringBRange: { location: _stringB.length, length: stringB.length - _stringB.length },
+            stringARange: {
+                location: _stringA.length,
+                length: stringA.length - _stringA.length,
+                isNewLineSymbolChanged: true,
+            },
+            stringBRange: {
+                location: _stringB.length,
+                length: stringB.length - _stringB.length,
+                isNewLineSymbolChanged: true,
+            },
         };
     }
     if (isInValidString(stringA) || isInValidString(stringB)) {
@@ -1745,6 +1780,16 @@ function relativeChanges(stringA, stringB) {
     aRange.length -= suffixLength;
     return { stringARange: aRange, stringBRange: bRange };
 }
+/** Check two string have a diff range */
+function hasRelativeChange(stringA, stringB) {
+    const _stringA = stringA.trim();
+    const _stringB = stringB.trim();
+    const { stringARange, stringBRange } = relativeChanges(_stringA, _stringB);
+    return (stringARange.location > 0 ||
+        stringBRange.location > 0 ||
+        stringARange.length < _stringA.length ||
+        stringBRange.length < _stringB.length);
+}
 
 /** indicate what a line in the diff represents */
 var DiffLineType;
@@ -1963,11 +2008,14 @@ const getDiffRange = (additions, deletions) => {
         for (let i = 0; i < len; i++) {
             const addition = additions[i];
             const deletion = deletions[i];
-            const { stringARange, stringBRange } = relativeChanges(addition.text, deletion.text);
-            addition.needRematch = true;
-            addition.range = stringARange;
-            deletion.needRematch = true;
-            deletion.range = stringBRange;
+            const hasDiffRange = hasRelativeChange(addition.text, deletion.text);
+            if (hasDiffRange) {
+                const { stringARange, stringBRange } = relativeChanges(addition.text, deletion.text);
+                addition.needRematch = true;
+                addition.range = stringARange;
+                deletion.needRematch = true;
+                deletion.range = stringBRange;
+            }
         }
     }
 };
@@ -2342,10 +2390,8 @@ class DiffFile {
     #splitLeftLines = [];
     #splitRightLines = [];
     #splitHunksLines;
-    #splitLastStartIndex;
     #unifiedLines = [];
     #unifiedHunksLines;
-    #unifiedLastStartIndex;
     #listeners = [];
     #hasInitRaw = false;
     #hasInitSyntax = false;
@@ -2353,6 +2399,7 @@ class DiffFile {
     #hasBuildUnified = false;
     #updateCount = 0;
     #composeByDiff = false;
+    _version_ = "0.0.6";
     _oldFileContent = "";
     _oldFileLang = "";
     _newFileContent = "";
@@ -2403,10 +2450,10 @@ class DiffFile {
         if (!this._oldFileContent && !this._newFileContent)
             return;
         if (this._oldFileContent) {
-            this.#oldFileResult = getFile(this._oldFileContent, this._oldFileLang);
+            this.#oldFileResult = getFile(this._oldFileContent, this._oldFileLang, this._oldFileName);
         }
         if (this._newFileContent) {
-            this.#newFileResult = getFile(this._newFileContent, this._newFileLang);
+            this.#newFileResult = getFile(this._newFileContent, this._newFileLang, this._newFileName);
         }
     }
     #composeRaw() {
@@ -2448,8 +2495,8 @@ class DiffFile {
                 return;
             this._oldFileContent = oldFileContent;
             this._newFileContent = newFileContent;
-            this.#oldFileResult = getFile(this._oldFileContent, this._oldFileLang);
-            this.#newFileResult = getFile(this._newFileContent, this._newFileLang);
+            this.#oldFileResult = getFile(this._oldFileContent, this._oldFileLang, this._oldFileName);
+            this.#newFileResult = getFile(this._newFileContent, this._newFileLang, this._newFileName);
             // all of the file just compose by diff, so we can not do the expand action
             this.#composeByDiff = true;
         }
@@ -2470,7 +2517,7 @@ class DiffFile {
             if (newFileContent === this._oldFileContent)
                 return;
             this._newFileContent = newFileContent;
-            this.#newFileResult = getFile(this._newFileContent, this._newFileLang);
+            this.#newFileResult = getFile(this._newFileContent, this._newFileLang, this._newFileName);
         }
         else if (this.#newFileResult) {
             let oldLineNumber = 1;
@@ -2489,7 +2536,7 @@ class DiffFile {
             if (oldFileContent === this._newFileContent)
                 return;
             this._oldFileContent = oldFileContent;
-            this.#oldFileResult = getFile(this._oldFileContent, this._oldFileLang);
+            this.#oldFileResult = getFile(this._oldFileContent, this._oldFileLang, this._oldFileName);
         }
         this.#composeRaw();
     }
@@ -2517,9 +2564,14 @@ class DiffFile {
                 getDiffRange(additions, deletions);
             });
         });
-        this.#diffLines = this.#diffListResults
-            .reduce((p, c) => p.concat(...c.hunks.reduce((_p, _c) => _p.concat(..._c.lines), [])), [])
-            .map((i, index) => {
+        this.#diffLines = [];
+        const tmp = [];
+        this.#diffListResults.forEach((item) => {
+            item.hunks.forEach((_item) => {
+                tmp.push(..._item.lines);
+            });
+        });
+        this.#diffLines = tmp.map((i, index) => {
             const typedI = i;
             typedI.index = index;
             if (typedI.type === DiffLineType.Hunk) {
@@ -2534,28 +2586,49 @@ class DiffFile {
                     oldLength: Number(oldNumLength),
                     newStartIndex: +Number(newNumStartIndex),
                     newLength: Number(newNumLength),
+                    _oldStartIndex: -Number(oldNumStartIndex),
+                    _oldLength: Number(oldNumLength),
+                    _newStartIndex: +Number(newNumStartIndex),
+                    _newLength: Number(newNumLength),
                 };
             }
             return typedI;
         });
-        this.#oldFileDiffLines = this.#diffLines.reduce((p, c) => {
-            if (c.oldLineNumber) {
-                this.diffLineLength = Math.max(this.diffLineLength, c.oldLineNumber);
-                return { ...p, [c.oldLineNumber]: c };
+        // this.#diffLines = this.#diffListResults
+        //   .reduce<DiffLine[]>((p, c) => p.concat(...c.hunks.reduce<DiffLine[]>((_p, _c) => _p.concat(..._c.lines), [])), [])
+        //   .map<DiffLineItem>((i, index) => {
+        //     const typedI = i as DiffLineItem;
+        //     typedI.index = index;
+        //     if (typedI.type === DiffLineType.Hunk) {
+        //       const numInfo = typedI.text.split("@@")?.[1].split(" ").filter(Boolean);
+        //       const oldNumInfo = numInfo?.[0] || "";
+        //       const newNumInfo = numInfo?.[1] || "";
+        //       const [oldNumStartIndex, oldNumLength] = oldNumInfo.split(",");
+        //       const [newNumStartIndex, newNumLength] = newNumInfo.split(",");
+        //       const typedTypeI = typedI as DiffHunkItem;
+        //       typedTypeI.hunkInfo = {
+        //         oldStartIndex: -Number(oldNumStartIndex),
+        //         oldLength: Number(oldNumLength),
+        //         newStartIndex: +Number(newNumStartIndex),
+        //         newLength: Number(newNumLength),
+        //       };
+        //     }
+        //     return typedI;
+        //   });
+        this.#oldFileDiffLines = {};
+        this.#diffLines.forEach((item) => {
+            if (item.oldLineNumber) {
+                this.diffLineLength = Math.max(this.diffLineLength, item.oldLineNumber);
+                this.#oldFileDiffLines[item.oldLineNumber] = item;
             }
-            else {
-                return p;
-            }
-        }, {});
-        this.#newFileDiffLines = this.#diffLines.reduce((p, c) => {
-            if (c.newLineNumber) {
-                this.diffLineLength = Math.max(this.diffLineLength, c.newLineNumber);
-                return { ...p, [c.newLineNumber]: c };
-            }
-            else {
-                return p;
+        });
+        this.#newFileDiffLines = {};
+        this.#diffLines.forEach((item) => {
+            if (item.newLineNumber) {
+                this.diffLineLength = Math.max(this.diffLineLength, item.newLineNumber);
+                this.#newFileDiffLines[item.newLineNumber] = item;
             }
-        }, {});
+        });
     }
     #composeSyntax({ autoDetectLang, registerHighlighter, }) {
         this.#oldFileResult?.doSyntax({ autoDetectLang, registerHighlighter });
@@ -2623,14 +2696,27 @@ class DiffFile {
         const maxOldFileLineNumber = this.#oldFileResult?.maxLineNumber || 0;
         const maxNewFileLineNumber = this.#newFileResult?.maxLineNumber || 0;
         while (oldFileLineNumber <= maxOldFileLineNumber || newFileLineNumber <= maxNewFileLineNumber) {
-            const oldRawLine = this.#getOldRawLine(oldFileLineNumber);
             const oldDiffLine = this.#getOldDiffLine(oldFileLineNumber);
-            const newRawLine = this.#getNewRawLine(newFileLineNumber);
             const newDiffLine = this.#getNewDiffLine(newFileLineNumber);
+            const oldRawLine = this.#getOldRawLine(oldFileLineNumber);
+            const newRawLine = this.#getNewRawLine(newFileLineNumber);
             const oldLineHasChange = oldDiffLine?.isIncludeableLine();
             const newLineHasChange = newDiffLine?.isIncludeableLine();
             const len = this.#splitRightLines.length;
             const isHidden = !oldDiffLine && !newDiffLine;
+            if ((oldDiffLine && !newDiffLine && oldDiffLine.newLineNumber && oldDiffLine.newLineNumber > newFileLineNumber) ||
+                (!oldDiffLine && newDiffLine && newDiffLine.oldLineNumber && newDiffLine.oldLineNumber > oldFileLineNumber)) {
+                if (this.#composeByDiff) {
+                    oldDiffLine && newFileLineNumber++;
+                    newDiffLine && oldFileLineNumber++;
+                    continue;
+                }
+                else {
+                    {
+                        console.error("some error happen for generate diff line!");
+                    }
+                }
+            }
             if (!oldDiffLine && !newRawLine && !oldDiffLine && !newDiffLine)
                 break;
             if ((oldLineHasChange && newLineHasChange) || (!oldLineHasChange && !newLineHasChange)) {
@@ -2639,12 +2725,14 @@ class DiffFile {
                     value: oldRawLine,
                     diff: oldDiffLine,
                     isHidden,
+                    _isHidden: isHidden,
                 });
                 this.#splitRightLines.push({
                     lineNumber: newFileLineNumber++,
                     value: newRawLine,
                     diff: newDiffLine,
                     isHidden,
+                    _isHidden: isHidden,
                 });
             }
             else if (oldLineHasChange) {
@@ -2652,6 +2740,8 @@ class DiffFile {
                     lineNumber: oldFileLineNumber++,
                     value: oldRawLine,
                     diff: oldDiffLine,
+                    isHidden,
+                    _isHidden: isHidden,
                 });
                 this.#splitRightLines.push({});
             }
@@ -2661,6 +2751,8 @@ class DiffFile {
                     lineNumber: newFileLineNumber++,
                     value: newRawLine,
                     diff: newDiffLine,
+                    isHidden,
+                    _isHidden: isHidden,
                 });
             }
             if (!prevIsHidden && isHidden) {
@@ -2678,18 +2770,48 @@ class DiffFile {
                             startHiddenIndex: hideStart,
                             endHiddenIndex: len,
                             plainText: typedPrevious.text,
+                            _startHiddenIndex: hideStart,
+                            _endHiddenIndex: len,
+                            _plainText: typedPrevious.text,
                         };
                         hideStart = Infinity;
                     }
                     this.#splitHunksLines = {
                         ...this.#splitHunksLines,
-                        [len]: previous,
+                        [len]: typedPrevious,
                     };
                 }
             }
         }
+        // have last hunk
+        if (Number.isFinite(hideStart)) {
+            const lastDiff = new DiffLine("", DiffLineType.Hunk, null, null, null);
+            const lastHunk = lastDiff;
+            lastHunk.isLast = true;
+            lastHunk.splitInfo = {
+                startHiddenIndex: hideStart,
+                endHiddenIndex: this.#splitRightLines.length,
+                _startHiddenIndex: hideStart,
+                _endHiddenIndex: this.#splitRightLines.length,
+                // just for placeholder
+                plainText: "",
+                oldStartIndex: 0,
+                newStartIndex: 0,
+                oldLength: 0,
+                newLength: 0,
+                _plainText: "",
+                _oldStartIndex: 0,
+                _newStartIndex: 0,
+                _oldLength: 0,
+                _newLength: 0,
+            };
+            this.#splitHunksLines = {
+                ...this.#splitHunksLines,
+                [this.#splitRightLines.length]: lastHunk,
+            };
+            hideStart = Infinity;
+        }
         this.splitLineLength = this.#splitRightLines.length;
-        this.#splitLastStartIndex = hideStart;
         this.#hasBuildSplit = true;
         this.notifyAll();
     }
@@ -2711,6 +2833,19 @@ class DiffFile {
             const newLineHasChange = newDiffLine?.isIncludeableLine();
             const len = this.#unifiedLines.length;
             const isHidden = !oldDiffLine && !newDiffLine;
+            if ((oldDiffLine && !newDiffLine && oldDiffLine.newLineNumber && oldDiffLine.newLineNumber > newFileLineNumber) ||
+                (!oldDiffLine && newDiffLine && newDiffLine.oldLineNumber && newDiffLine.oldLineNumber > oldFileLineNumber)) {
+                if (this.#composeByDiff) {
+                    oldDiffLine && newFileLineNumber++;
+                    newDiffLine && oldFileLineNumber++;
+                    continue;
+                }
+                else {
+                    {
+                        console.error("some error happen for generate diff line!");
+                    }
+                }
+            }
             if (!oldRawLine && !newRawLine && !newDiffLine && !oldDiffLine)
                 break;
             if (!oldLineHasChange && !newLineHasChange) {
@@ -2720,6 +2855,7 @@ class DiffFile {
                     value: newRawLine,
                     diff: newDiffLine,
                     isHidden,
+                    _isHidden: isHidden,
                 });
             }
             else if (oldLineHasChange) {
@@ -2727,6 +2863,8 @@ class DiffFile {
                     oldLineNumber: oldFileLineNumber++,
                     value: oldRawLine,
                     diff: oldDiffLine,
+                    isHidden,
+                    _isHidden: isHidden,
                 });
             }
             else if (newLineHasChange) {
@@ -2734,6 +2872,8 @@ class DiffFile {
                     newLineNumber: newFileLineNumber++,
                     value: newRawLine,
                     diff: newDiffLine,
+                    isHidden,
+                    _isHidden: isHidden,
                 });
             }
             if (!prevIsHidden && isHidden) {
@@ -2751,18 +2891,48 @@ class DiffFile {
                             startHiddenIndex: hideStart,
                             endHiddenIndex: len,
                             plainText: typedPrevious.text,
+                            _startHiddenIndex: hideStart,
+                            _endHiddenIndex: len,
+                            _plainText: typedPrevious.text,
                         };
                         hideStart = Infinity;
                     }
                     this.#unifiedHunksLines = {
                         ...this.#unifiedHunksLines,
-                        [len]: previous,
+                        [len]: typedPrevious,
                     };
                 }
             }
         }
+        // have last hunk
+        if (Number.isFinite(hideStart)) {
+            const lastDiff = new DiffLine("", DiffLineType.Hunk, null, null, null);
+            const lastHunk = lastDiff;
+            lastHunk.isLast = true;
+            lastHunk.unifiedInfo = {
+                startHiddenIndex: hideStart,
+                endHiddenIndex: this.#unifiedLines.length,
+                _startHiddenIndex: hideStart,
+                _endHiddenIndex: this.#unifiedLines.length,
+                // just for placeholder
+                plainText: "",
+                oldStartIndex: 0,
+                newStartIndex: 0,
+                oldLength: 0,
+                newLength: 0,
+                _plainText: "",
+                _oldStartIndex: 0,
+                _newStartIndex: 0,
+                _oldLength: 0,
+                _newLength: 0,
+            };
+            this.#unifiedHunksLines = {
+                ...this.#unifiedHunksLines,
+                [this.#unifiedLines.length]: lastHunk,
+            };
+            hideStart = Infinity;
+        }
         this.unifiedLineLength = this.#unifiedLines.length;
-        this.#unifiedLastStartIndex = hideStart;
         this.#hasBuildUnified = true;
         this.notifyAll();
     }
@@ -2775,9 +2945,9 @@ class DiffFile {
     getSplitHunkLine = (index) => {
         return this.#splitHunksLines?.[index];
     };
-    onSplitHunkExpand = (dir, index) => {
+    onSplitHunkExpand = (dir, index, needTrigger = true) => {
         const current = this.#splitHunksLines?.[index];
-        if (!current)
+        if (!current || !current.splitInfo)
             return;
         if (dir === "all") {
             for (let i = current.splitInfo.startHiddenIndex; i < current.splitInfo.endHiddenIndex; i++) {
@@ -2788,7 +2958,6 @@ class DiffFile {
                 if (rightLine?.isHidden)
                     rightLine.isHidden = false;
             }
-            current.splitInfo.plainText = current.text;
             current.splitInfo = {
                 ...current.splitInfo,
                 ...current.hunkInfo,
@@ -2805,13 +2974,25 @@ class DiffFile {
                 if (rightLine?.isHidden)
                     rightLine.isHidden = false;
             }
-            current.splitInfo = {
-                ...current.splitInfo,
-                startHiddenIndex: current.splitInfo.startHiddenIndex + composeLen,
-                plainText: `@@ -${current.splitInfo.oldStartIndex},${current.splitInfo.oldLength} +${current.splitInfo.newStartIndex},${current.splitInfo.newLength}`,
-            };
+            if (current.isLast) {
+                current.splitInfo = {
+                    ...current.splitInfo,
+                    startHiddenIndex: current.splitInfo.startHiddenIndex + composeLen,
+                };
+            }
+            else {
+                current.splitInfo = {
+                    ...current.splitInfo,
+                    startHiddenIndex: current.splitInfo.startHiddenIndex + composeLen,
+                    plainText: `@@ -${current.splitInfo.oldStartIndex},${current.splitInfo.oldLength} +${current.splitInfo.newStartIndex},${current.splitInfo.newLength}`,
+                };
+            }
         }
         else {
+            if (current.isLast) {
+                console.error("the last hunk can not expand up!");
+                return;
+            }
             for (let i = current.splitInfo.endHiddenIndex - composeLen; i < current.splitInfo.endHiddenIndex; i++) {
                 const leftLine = this.#splitLeftLines[i];
                 const rightLine = this.#splitRightLines[i];
@@ -2836,25 +3017,7 @@ class DiffFile {
             delete this.#splitHunksLines?.[index];
             this.#splitHunksLines[current.splitInfo.endHiddenIndex] = current;
         }
-        this.notifyAll();
-    };
-    onSplitLastExpand = (expandAll) => {
-        if (!this.#splitLastStartIndex || !Number.isFinite(this.#splitLastStartIndex))
-            return;
-        const start = this.#splitLastStartIndex;
-        const end = expandAll ? this.splitLineLength : this.#splitLastStartIndex + composeLen;
-        for (let i = start; i < end; i++) {
-            const leftLine = this.#splitLeftLines[i];
-            const rightLine = this.#splitRightLines[i];
-            if (leftLine?.isHidden)
-                leftLine.isHidden = false;
-            if (rightLine?.isHidden)
-                rightLine.isHidden = false;
-        }
-        this.#splitLastStartIndex = end;
-        this.#splitLastStartIndex =
-            this.#splitLastStartIndex >= this.splitLineLength ? Infinity : this.#splitLastStartIndex;
-        this.notifyAll();
+        needTrigger && this.notifyAll();
     };
     getUnifiedLine = (index) => {
         return this.#unifiedLines[index];
@@ -2862,9 +3025,9 @@ class DiffFile {
     getUnifiedHunkLine = (index) => {
         return this.#unifiedHunksLines?.[index];
     };
-    onUnifiedHunkExpand = (dir, index) => {
+    onUnifiedHunkExpand = (dir, index, needTrigger = true) => {
         const current = this.#unifiedHunksLines?.[index];
-        if (!current)
+        if (!current || !current.unifiedInfo)
             return;
         if (dir === "all") {
             for (let i = current.unifiedInfo.startHiddenIndex; i < current.unifiedInfo.endHiddenIndex; i++) {
@@ -2873,7 +3036,6 @@ class DiffFile {
                     unifiedLine.isHidden = false;
                 }
             }
-            current.unifiedInfo.plainText = current.text;
             current.unifiedInfo = {
                 ...current.unifiedInfo,
                 ...current.hunkInfo,
@@ -2887,13 +3049,25 @@ class DiffFile {
                 if (unifiedLine?.isHidden)
                     unifiedLine.isHidden = false;
             }
-            current.unifiedInfo = {
-                ...current.unifiedInfo,
-                startHiddenIndex: current.unifiedInfo.startHiddenIndex + composeLen,
-                plainText: `@@ -${current.unifiedInfo.oldStartIndex},${current.unifiedInfo.oldLength} +${current.unifiedInfo.newStartIndex},${current.unifiedInfo.newLength}`,
-            };
+            if (current.isLast) {
+                current.unifiedInfo = {
+                    ...current.unifiedInfo,
+                    startHiddenIndex: current.unifiedInfo.startHiddenIndex + composeLen,
+                };
+            }
+            else {
+                current.unifiedInfo = {
+                    ...current.unifiedInfo,
+                    startHiddenIndex: current.unifiedInfo.startHiddenIndex + composeLen,
+                    plainText: `@@ -${current.unifiedInfo.oldStartIndex},${current.unifiedInfo.oldLength} +${current.unifiedInfo.newStartIndex},${current.unifiedInfo.newLength}`,
+                };
+            }
         }
         else {
+            if (current.isLast) {
+                console.error("the last hunk can not expand up!");
+                return;
+            }
             for (let i = current.unifiedInfo.endHiddenIndex - composeLen; i < current.unifiedInfo.endHiddenIndex; i++) {
                 const unifiedLine = this.#unifiedLines[i];
                 if (unifiedLine?.isHidden)
@@ -2915,21 +3089,87 @@ class DiffFile {
             delete this.#unifiedHunksLines?.[index];
             this.#unifiedHunksLines[current.unifiedInfo.endHiddenIndex] = current;
         }
+        needTrigger && this.notifyAll();
+    };
+    onAllExpand = (mode) => {
+        if (mode === "split") {
+            Object.keys(this.#splitHunksLines || {}).forEach((key) => {
+                this.onSplitHunkExpand("all", +key, false);
+            });
+        }
+        else {
+            Object.keys(this.#unifiedHunksLines || {}).forEach((key) => {
+                this.onUnifiedHunkExpand("all", +key, false);
+            });
+        }
         this.notifyAll();
     };
-    onUnifiedLastExpand = (expandAll) => {
-        if (!this.#unifiedLastStartIndex || !Number.isFinite(this.#unifiedLastStartIndex))
-            return;
-        const start = this.#unifiedLastStartIndex;
-        const end = expandAll ? this.unifiedLineLength : this.#unifiedLastStartIndex + composeLen;
-        for (let i = start; i < end; i++) {
-            const unifiedLine = this.#unifiedLines[i];
-            if (unifiedLine?.isHidden)
-                unifiedLine.isHidden = false;
-        }
-        this.#unifiedLastStartIndex = end;
-        this.#unifiedLastStartIndex =
-            this.#unifiedLastStartIndex >= this.unifiedLineLength ? Infinity : this.#unifiedLastStartIndex;
+    onAllCollapse = (mode) => {
+        if (mode === "split") {
+            Object.values(this.#splitLeftLines || {}).forEach((item) => {
+                if (!item.isHidden && item._isHidden) {
+                    item.isHidden = item._isHidden;
+                }
+            });
+            Object.values(this.#splitRightLines || {}).forEach((item) => {
+                if (!item.isHidden && item._isHidden) {
+                    item.isHidden = item._isHidden;
+                }
+            });
+            Object.values(this.#splitHunksLines || {}).forEach((item) => {
+                if (!item.splitInfo)
+                    return;
+                item.splitInfo = {
+                    ...item.splitInfo,
+                    oldStartIndex: item.splitInfo._oldStartIndex,
+                    oldLength: item.splitInfo._oldLength,
+                    newStartIndex: item.splitInfo._newStartIndex,
+                    newLength: item.splitInfo._newLength,
+                    startHiddenIndex: item.splitInfo._startHiddenIndex,
+                    endHiddenIndex: item.splitInfo._endHiddenIndex,
+                    plainText: item.splitInfo._plainText,
+                };
+            });
+            Object.keys(this.#splitHunksLines || {}).forEach((key) => {
+                const item = this.#splitHunksLines[key];
+                if (!item.splitInfo)
+                    return;
+                if (item.splitInfo.endHiddenIndex !== +key) {
+                    delete this.#splitHunksLines[key];
+                    this.#splitHunksLines[item.splitInfo.endHiddenIndex] = item;
+                }
+            });
+        }
+        else {
+            Object.values(this.#unifiedLines || {}).forEach((item) => {
+                if (!item.isHidden && item._isHidden) {
+                    item.isHidden = item._isHidden;
+                }
+            });
+            Object.values(this.#unifiedHunksLines || {}).forEach((item) => {
+                if (!item.unifiedInfo)
+                    return;
+                item.unifiedInfo = {
+                    ...item.unifiedInfo,
+                    oldStartIndex: item.unifiedInfo._oldStartIndex,
+                    oldLength: item.unifiedInfo._oldLength,
+                    newStartIndex: item.unifiedInfo._newStartIndex,
+                    newLength: item.unifiedInfo._newLength,
+                    startHiddenIndex: item.unifiedInfo._startHiddenIndex,
+                    endHiddenIndex: item.unifiedInfo._endHiddenIndex,
+                    plainText: item.unifiedInfo._plainText,
+                };
+            });
+            Object.keys(this.#unifiedHunksLines || {}).forEach((key) => {
+                const item = this.#unifiedHunksLines[key];
+                if (!item.unifiedInfo)
+                    return;
+                if (item.unifiedInfo.endHiddenIndex !== +key) {
+                    delete this.#unifiedHunksLines[key];
+                    this.#unifiedHunksLines[item.unifiedInfo.endHiddenIndex] = item;
+                }
+            });
+        }
         this.notifyAll();
     };
     getOldSyntaxLine = (lineNumber) => {
@@ -2954,19 +3194,6 @@ class DiffFile {
         });
     };
     getUpdateCount = () => this.#updateCount;
-    getNeedShowExpandAll = (mode) => {
-        if (mode === "split") {
-            return (this.#splitLastStartIndex &&
-                Number.isFinite(this.#splitLastStartIndex) &&
-                (this.getSplitLeftLine(this.splitLineLength - 1)?.isHidden ||
-                    this.getSplitRightLine(this.splitLineLength - 1)?.isHidden));
-        }
-        else {
-            return (this.#unifiedLastStartIndex &&
-                Number.isFinite(this.#unifiedLastStartIndex) &&
-                this.getUnifiedLine(this.unifiedLineLength - 1)?.isHidden);
-        }
-    };
     getExpandEnabled = () => !this.#composeByDiff;
     getBundle = () => {
         // common
@@ -2987,11 +3214,10 @@ class DiffFile {
         const splitLeftLines = this.#splitLeftLines;
         const splitRightLines = this.#splitRightLines;
         const splitHunkLines = this.#splitHunksLines;
-        const splitLastStartIndex = this.#splitLastStartIndex;
         // unified
         const unifiedLines = this.#unifiedLines;
         const unifiedHunkLines = this.#unifiedHunksLines;
-        const unifiedLastStartIndex = this.#unifiedLastStartIndex;
+        const version = this._version_;
         return {
             hasInitRaw,
             hasInitSyntax,
@@ -3008,11 +3234,10 @@ class DiffFile {
             splitLeftLines,
             splitRightLines,
             splitHunkLines,
-            splitLastStartIndex,
             unifiedLines,
             unifiedHunkLines,
-            unifiedLastStartIndex,
             composeByDiff,
+            version
         };
     };
     mergeBundle = (data) => {
@@ -3032,10 +3257,11 @@ class DiffFile {
         this.#splitLeftLines = data.splitLeftLines;
         this.#splitRightLines = data.splitRightLines;
         this.#splitHunksLines = data.splitHunkLines;
-        this.#splitLastStartIndex = data.splitLastStartIndex;
         this.#unifiedLines = data.unifiedLines;
         this.#unifiedHunksLines = data.unifiedHunkLines;
-        this.#unifiedLastStartIndex = data.unifiedLastStartIndex;
+        if (this._version_ !== data.version) {
+            console.error('the version of the `diffInstance` is not match, some error may happen!');
+        }
         this.notifyAll();
     };
     _addClonedInstance = (instance) => {
@@ -3111,7 +3337,6 @@ var DiffFileLineType;
     DiffFileLineType[DiffFileLineType["content"] = 2] = "content";
     DiffFileLineType[DiffFileLineType["widget"] = 3] = "widget";
     DiffFileLineType[DiffFileLineType["extend"] = 4] = "extend";
-    DiffFileLineType[DiffFileLineType["lastHunk"] = 5] = "lastHunk";
 })(DiffFileLineType || (DiffFileLineType = {}));
 const getSplitLines = (diffFile, options) => {
     const splitLineLength = diffFile.splitLineLength;
@@ -3139,15 +3364,6 @@ const getSplitLines = (diffFile, options) => {
         extendLine &&
             splitLines.push({ type: DiffFileLineType.extend, index, lineNumber: index + 1, extendLine: extendLine });
     });
-    const lastHunkLine = diffFile.getNeedShowExpandAll("split");
-    const expandEnabled = diffFile.getExpandEnabled();
-    if (lastHunkLine && expandEnabled) {
-        splitLines.push({
-            type: DiffFileLineType.lastHunk,
-            index: splitLineLength,
-            lineNumber: splitLineLength + 1,
-        });
-    }
     return splitLines;
 };
 const getSplitContentLines = (diffFile) => {
@@ -3173,15 +3389,6 @@ const getUnifiedLines = (diffFile, options) => {
         extendLine &&
             unifiedLines.push({ type: DiffFileLineType.extend, index, lineNumber: index + 1, extendLine: extendLine });
     });
-    const lastHunkLine = diffFile.getNeedShowExpandAll("unified");
-    const expandEnabled = diffFile.getExpandEnabled();
-    if (lastHunkLine && expandEnabled) {
-        unifiedLines.push({
-            type: DiffFileLineType.lastHunk,
-            index: unifiedLineLength,
-            lineNumber: unifiedLineLength + 1,
-        });
-    }
     return unifiedLines;
 };
 const getUnifiedContentLine = (diffFile) => {
@@ -3434,22 +3641,26 @@ const _DiffSplitHunkLine = ({ index, diffFile, side, lineNumber, }) => {
         currentHunk.splitInfo &&
         currentHunk.splitInfo.endHiddenIndex - currentHunk.splitInfo.startHiddenIndex < composeLen;
     const isFirstLine = currentHunk && currentHunk.index === 0;
+    const isLastLine = currentHunk && currentHunk.isLast;
     return (React__namespace.createElement("tr", { "data-line": `${lineNumber}-hunk`, "data-state": "hunk", "data-side": exports.SplitSide[side], className: "diff-line diff-line-hunk" }, enableHunkAction ? (React__namespace.createElement(React__namespace.Fragment, null,
         React__namespace.createElement("td", { className: "diff-line-hunk-action sticky left-0 p-[1px] w-[1%] min-w-[40px] select-none", style: {
                 backgroundColor: `var(${hunkLineNumberBGName})`,
                 color: `var(${plainLineNumberColorName})`,
             } }, expandEnabled ? (isFirstLine ? (React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[6px] cursor-pointer rounded-[2px]", title: "Expand Up", "data-title": "Expand Up", onClick: () => diffFile.onSplitHunkExpand("up", index) },
-            React__namespace.createElement(ExpandUp, { className: "fill-current" }))) : isExpandAll ? (React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[6px] cursor-pointer rounded-[2px]", title: "Expand All", "data-title": "Expand All", onClick: () => diffFile.onSplitHunkExpand("all", index) },
+            React__namespace.createElement(ExpandUp, { className: "fill-current" }))) : isLastLine ? (React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[6px] cursor-pointer rounded-[2px] relative", title: "Expand Down", "data-title": "Expand Down", onClick: () => {
+                diffFile.onSplitHunkExpand("down", index);
+            } },
+            React__namespace.createElement(ExpandDown, { className: "fill-current" }))) : isExpandAll ? (React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[6px] cursor-pointer rounded-[2px]", title: "Expand All", "data-title": "Expand All", onClick: () => diffFile.onSplitHunkExpand("all", index) },
             React__namespace.createElement(ExpandAll, { className: "fill-current" }))) : (React__namespace.createElement(React__namespace.Fragment, null,
             React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[2px] cursor-pointer rounded-[2px]", title: "Expand Down", "data-title": "Expand Down", onClick: () => diffFile.onSplitHunkExpand("down", index) },
                 React__namespace.createElement(ExpandDown, { className: "fill-current" })),
             React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[2px] cursor-pointer rounded-[2px]", title: "Expand Up", "data-title": "Expand Up", onClick: () => diffFile.onSplitHunkExpand("up", index) },
-                React__namespace.createElement(ExpandUp, { className: "fill-current" }))))) : (React__namespace.createElement("span", null, "\u2002"))),
+                React__namespace.createElement(ExpandUp, { className: "fill-current" }))))) : (React__namespace.createElement("div", { className: "min-h-[28px]" }, "\u2002"))),
         React__namespace.createElement("td", { className: "diff-line-hunk-content pr-[10px] align-middle", style: { backgroundColor: `var(${hunkContentBGName})` } },
             React__namespace.createElement("div", { className: "pl-[1.5em]", style: {
                     color: `var(${hunkContentColorName})`,
                 } }, currentHunk.splitInfo.plainText)))) : (React__namespace.createElement("td", { className: "diff-line-hunk-placeholder select-none", colSpan: 2, style: { backgroundColor: `var(${hunkContentBGName})` } },
-        React__namespace.createElement("span", null, "\u2002")))));
+        React__namespace.createElement("div", { className: "min-h-[28px]" }, "\u2002")))));
 };
 const DiffSplitHunkLine$1 = ({ index, diffFile, side, lineNumber, }) => {
     const currentHunk = diffFile.getSplitHunkLine(index);
@@ -3460,33 +3671,6 @@ const DiffSplitHunkLine$1 = ({ index, diffFile, side, lineNumber, }) => {
         return null;
     return React__namespace.createElement(_DiffSplitHunkLine, { index: index, diffFile: diffFile, side: side, lineNumber: lineNumber });
 };
-const _DiffSplitLastHunkLine = ({ diffFile, side }) => {
-    const enableHunkAction = side === exports.SplitSide.old;
-    useSyncHeight({
-        selector: `tr[data-line="last-hunk"]`,
-        side: exports.SplitSide[exports.SplitSide.old],
-        enable: side === exports.SplitSide.new,
-    });
-    return (React__namespace.createElement("tr", { "data-line": "last-hunk", "data-state": "hunk", "data-side": exports.SplitSide[side], className: "diff-line diff-line-hunk" }, enableHunkAction ? (React__namespace.createElement(React__namespace.Fragment, null,
-        React__namespace.createElement("td", { className: "diff-line-hunk-action sticky left-0 p-[1px] w-[1%] min-w-[40px] select-none", style: {
-                backgroundColor: `var(${hunkLineNumberBGName})`,
-                color: `var(${plainLineNumberColorName})`,
-            } },
-            React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[6px] cursor-pointer rounded-[2px] relative", title: "Expand Down", "data-title": "Expand Down", onClick: () => {
-                    diffFile.onSplitLastExpand();
-                } },
-                React__namespace.createElement(ExpandDown, { className: "fill-current" }))),
-        React__namespace.createElement("td", { className: "diff-line-hunk-content pr-[10px] align-middle select-none", style: { backgroundColor: `var(${hunkContentBGName})` } },
-            React__namespace.createElement("span", null, "\u2002")))) : (React__namespace.createElement("td", { className: "diff-line-hunk-placeholder select-none", colSpan: 2, style: { backgroundColor: `var(${hunkContentBGName})` } },
-        React__namespace.createElement("span", null, "\u2002")))));
-};
-const DiffSplitLastHunkLine$1 = ({ diffFile, side }) => {
-    const currentIsShow = diffFile.getNeedShowExpandAll("split");
-    const expandEnabled = diffFile.getExpandEnabled();
-    if (!currentIsShow || !expandEnabled)
-        return null;
-    return React__namespace.createElement(_DiffSplitLastHunkLine, { diffFile: diffFile, side: side });
-};
 
 const DiffSplitAddWidget = ({ side, className, lineNumber, onWidgetClick, onOpenAddWidget, }) => {
     return (React__namespace.createElement("div", { className: "diff-add-widget-wrapper" + (className ? " " + className : ""), style: {
@@ -3521,16 +3705,25 @@ const DiffUnifiedAddWidget = ({ lineNumber, side, onWidgetClick, onOpenAddWidget
 
 const DiffString = ({ rawLine, diffLine, operator, }) => {
     const range = diffLine?.range;
-    if (range && range.length > 0 && range.length < rawLine.length) {
+    if (range) {
         const str1 = rawLine.slice(0, range.location);
         const str2 = rawLine.slice(range.location, range.location + range.length);
         const str3 = rawLine.slice(range.location + range.length);
+        const isNewLineSymbolChanged = range.isNewLineSymbolChanged;
         return (React__namespace.createElement("span", { className: "diff-line-content-raw" },
             React__namespace.createElement("span", { "data-range-start": range.location, "data-range-end": range.location + range.length },
                 str1,
                 React__namespace.createElement("span", { "data-diff-highlight": true, className: "rounded-[0.2em]", style: {
                         backgroundColor: operator === "add" ? `var(${addContentHighlightBGName})` : `var(${delContentHighlightBGName})`,
-                    } }, str2 === "\r" ? "␍" : str2 === "\n" ? "␊" : str2 === "\r\n" ? "␍␊" : str2),
+                    } }, isNewLineSymbolChanged
+                    ? str2 === "\r"
+                        ? "␍"
+                        : str2 === "\n"
+                            ? "␊"
+                            : str2 === "\r\n"
+                                ? "␍␊"
+                                : str2
+                    : str2),
                 str3)));
     }
     return React__namespace.createElement("span", { className: "diff-line-content-raw" }, rawLine);
@@ -3540,7 +3733,7 @@ const DiffSyntax = ({ rawLine, diffLine, operator, syntaxLine, }) => {
         return React__namespace.createElement(DiffString, { rawLine: rawLine, diffLine: diffLine, operator: operator });
     }
     const range = diffLine?.range;
-    if (range && range.length > 0 && range.length < syntaxLine.valueLength) {
+    if (range) {
         return (React__namespace.createElement("span", { className: "diff-line-syntax-raw" },
             React__namespace.createElement("span", { "data-range-start": range.location, "data-range-end": range.location + range.length }, syntaxLine.nodeList?.map(({ node, wrapper }, index) => {
                 if (node.endIndex < range.location || range.location + range.length < node.startIndex) {
@@ -3554,6 +3747,7 @@ const DiffSyntax = ({ rawLine, diffLine, operator, syntaxLine, }) => {
                     const str3 = node.value.slice(index1 + range.length);
                     const isStart = str1.length || range.location === node.startIndex;
                     const isEnd = str3.length || node.endIndex === range.location + range.length - 1;
+                    const isNewLineSymbolChanged = range.isNewLineSymbolChanged;
                     return (React__namespace.createElement("span", { key: index, "data-start": node.startIndex, "data-end": node.endIndex, className: wrapper?.properties?.className?.join(" ") },
                         str1,
                         React__namespace.createElement("span", { "data-diff-highlight": true, style: {
@@ -3562,7 +3756,15 @@ const DiffSyntax = ({ rawLine, diffLine, operator, syntaxLine, }) => {
                                 borderBottomLeftRadius: isStart ? "0.2em" : undefined,
                                 borderTopRightRadius: isEnd ? "0.2em" : undefined,
                                 borderBottomRightRadius: isEnd ? "0.2em" : undefined,
-                            } }, str2 === "\r" ? "␍" : str2 === "\n" ? "␊" : str2 === "\r\n" ? "␍␊" : str2),
+                            } }, isNewLineSymbolChanged
+                            ? str2 === "\r"
+                                ? "␍"
+                                : str2 === "\n"
+                                    ? "␊"
+                                    : str2 === "\r\n"
+                                        ? "␍␊"
+                                        : str2
+                            : str2),
                         str3));
                 }
             }))));
@@ -3725,7 +3927,7 @@ const DiffSplitViewTable = ({ side, diffFile, width }) => {
                 React__namespace.createElement(DiffSplitLine$1, { index: line.index, side: side, lineNumber: line.lineNumber, diffFile: diffFile }),
                 React__namespace.createElement(DiffSplitWidgetLine$1, { index: line.index, side: side, lineNumber: line.lineNumber, diffFile: diffFile }),
                 React__namespace.createElement(DiffSplitExtendLine$1, { index: line.index, side: side, lineNumber: line.lineNumber, diffFile: diffFile })))),
-            React__namespace.createElement(DiffSplitLastHunkLine$1, { side: side, diffFile: diffFile }))));
+            React__namespace.createElement(DiffSplitHunkLine$1, { side: side, index: diffFile.splitLineLength, lineNumber: diffFile.splitLineLength, diffFile: diffFile }))));
 };
 const DiffSplitViewNormal = React.memo(({ diffFile }) => {
     const ref1 = React.useRef(null);
@@ -3815,42 +4017,26 @@ const DiffSplitHunkLine = ({ index, diffFile, lineNumber, }) => {
         currentHunk.splitInfo &&
         currentHunk.splitInfo.startHiddenIndex < currentHunk.splitInfo.endHiddenIndex;
     const isFirstLine = currentHunk && currentHunk.index === 0;
+    const isLastLine = currentHunk && currentHunk.isLast;
     if (!currentIsShow)
         return null;
     return (React__namespace.createElement("tr", { "data-line": `${lineNumber}-hunk`, "data-state": "hunk", className: "diff-line diff-line-hunk" },
         React__namespace.createElement("td", { className: "diff-line-hunk-action p-[1px] w-[1%] min-w-[40px] select-none", style: {
                 backgroundColor: `var(${hunkLineNumberBGName})`,
                 color: `var(${plainLineNumberColorName})`,
-            } }, expandEnabled &&
-            (isFirstLine ? (React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[6px] cursor-pointer rounded-[2px]", title: "Expand Up", "data-title": "Expand Up", onClick: () => diffFile.onSplitHunkExpand("up", index) },
-                React__namespace.createElement(ExpandUp, { className: "fill-current" }))) : isExpandAll ? (React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[6px] cursor-pointer rounded-[2px]", title: "Expand All", "data-title": "Expand All", onClick: () => diffFile.onSplitHunkExpand("all", index) },
-                React__namespace.createElement(ExpandAll, { className: "fill-current" }))) : (React__namespace.createElement(React__namespace.Fragment, null,
-                React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[2px] cursor-pointer rounded-[2px]", title: "Expand Down", "data-title": "Expand Down", onClick: () => diffFile.onSplitHunkExpand("down", index) },
-                    React__namespace.createElement(ExpandDown, { className: "fill-current" })),
-                React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[2px] cursor-pointer rounded-[2px]", title: "Expand Up", "data-title": "Expand Up", onClick: () => diffFile.onSplitHunkExpand("up", index) },
-                    React__namespace.createElement(ExpandUp, { className: "fill-current" })))))),
+            } }, expandEnabled ? (isFirstLine ? (React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[6px] cursor-pointer rounded-[2px]", title: "Expand Up", "data-title": "Expand Up", onClick: () => diffFile.onSplitHunkExpand("up", index) },
+            React__namespace.createElement(ExpandUp, { className: "fill-current" }))) : isLastLine ? (React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[6px] cursor-pointer rounded-[2px]", title: "Expand Down", "data-title": "Expand Down", onClick: () => diffFile.onSplitHunkExpand("down", index) },
+            React__namespace.createElement(ExpandDown, { className: "fill-current" }))) : isExpandAll ? (React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[6px] cursor-pointer rounded-[2px]", title: "Expand All", "data-title": "Expand All", onClick: () => diffFile.onSplitHunkExpand("all", index) },
+            React__namespace.createElement(ExpandAll, { className: "fill-current" }))) : (React__namespace.createElement(React__namespace.Fragment, null,
+            React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[2px] cursor-pointer rounded-[2px]", title: "Expand Down", "data-title": "Expand Down", onClick: () => diffFile.onSplitHunkExpand("down", index) },
+                React__namespace.createElement(ExpandDown, { className: "fill-current" })),
+            React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[2px] cursor-pointer rounded-[2px]", title: "Expand Up", "data-title": "Expand Up", onClick: () => diffFile.onSplitHunkExpand("up", index) },
+                React__namespace.createElement(ExpandUp, { className: "fill-current" }))))) : (React__namespace.createElement("div", { className: "min-h-[28px]" }, "\u2002"))),
         React__namespace.createElement("td", { className: "diff-line-hunk-content pr-[10px] align-middle", style: { backgroundColor: `var(${hunkContentBGName})` }, colSpan: 3 },
             React__namespace.createElement("div", { className: "pl-[1.5em]", style: {
                     color: `var(${hunkContentColorName})`,
                 } }, currentHunk.splitInfo.plainText))));
 };
-const DiffSplitLastHunkLine = ({ diffFile }) => {
-    const currentIsShow = diffFile.getNeedShowExpandAll("split");
-    const expandEnabled = diffFile.getExpandEnabled();
-    if (!currentIsShow || !expandEnabled)
-        return null;
-    return (React__namespace.createElement("tr", { "data-line": "last-hunk", "data-state": "hunk", className: "diff-line diff-line-hunk" },
-        React__namespace.createElement("td", { className: "diff-line-hunk-action p-[1px] w-[1%] min-w-[40px] select-none", style: {
-                backgroundColor: `var(${hunkLineNumberBGName})`,
-                color: `var(${plainLineNumberColorName})`,
-            } },
-            React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[6px] cursor-pointer rounded-[2px]", title: "Expand Down", "data-title": "Expand Down", onClick: () => {
-                    diffFile.onSplitLastExpand();
-                } },
-                React__namespace.createElement(ExpandDown, { className: "fill-current" }))),
-        React__namespace.createElement("td", { className: "diff-line-hunk-content pr-[10px] align-middle select-none", colSpan: 3, style: { backgroundColor: `var(${hunkContentBGName})` } },
-            React__namespace.createElement("span", null, "\u2002"))));
-};
 
 const _DiffSplitLine = ({ index, diffFile, lineNumber }) => {
     const oldLine = diffFile.getSplitLeftLine(index);
@@ -3943,7 +4129,6 @@ const DiffSplitWidgetLine = ({ index, diffFile, lineNumber, }) => {
     return React__namespace.createElement(_DiffSplitWidgetLine, { index: index, diffFile: diffFile, lineNumber: lineNumber });
 };
 
-/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
 const Style = ({ useSelector, id, }) => {
     const splitRef = useSelector((s) => s.splitRef);
     return (React__namespace.createElement("style", null, splitRef === exports.SplitSide.old
@@ -4014,7 +4199,7 @@ const DiffSplitViewWrap = React.memo(({ diffFile }) => {
                         React__namespace.createElement(DiffSplitLine, { index: line.index, lineNumber: line.lineNumber, diffFile: diffFile }),
                         React__namespace.createElement(DiffSplitWidgetLine, { index: line.index, lineNumber: line.lineNumber, diffFile: diffFile }),
                         React__namespace.createElement(DiffSplitExtendLine, { index: line.index, lineNumber: line.lineNumber, diffFile: diffFile })))),
-                    React__namespace.createElement(DiffSplitLastHunkLine, { diffFile: diffFile }))))));
+                    React__namespace.createElement(DiffSplitHunkLine, { index: diffFile.splitLineLength, lineNumber: diffFile.splitLineLength, diffFile: diffFile }))))));
 });
 DiffSplitViewWrap.displayName = "DiffSplitViewWrap";
 
@@ -4026,11 +4211,14 @@ const DiffSplitView = React.memo(({ diffFile }) => {
         const widgetSide = reactivityStore.ref(undefined);
         const widgetLineNumber = reactivityStore.ref(undefined);
         const setWidget = ({ side, lineNumber }) => {
+            const { renderWidgetLine } = useDiffContext.getReadonlyState();
+            if (typeof renderWidgetLine !== "function")
+                return;
             widgetSide.value = side;
             widgetLineNumber.value = lineNumber;
         };
         return { widgetSide, widgetLineNumber, setWidget };
-    }), []);
+    }), [useDiffContext]);
     const contextValue = React.useMemo(() => ({ useWidget }), [useWidget]);
     shim.useSyncExternalStore(diffFile.subscribe, diffFile.getUpdateCount);
     React.useEffect(() => {
@@ -4093,17 +4281,19 @@ const _DiffUnifiedHunkLine = ({ index, diffFile, lineNumber, }) => {
         currentHunk.unifiedInfo &&
         currentHunk.unifiedInfo.endHiddenIndex - currentHunk.unifiedInfo.startHiddenIndex < composeLen;
     const isFirstLine = currentHunk && currentHunk.index === 0;
+    const isLastLine = currentHunk && currentHunk.isLast;
     return (React__namespace.createElement("tr", { "data-line": `${lineNumber}-hunk`, "data-state": "hunk", className: "diff-line diff-line-hunk" },
         React__namespace.createElement("td", { className: "diff-line-hunk-action sticky left-0 p-[1px] w-[1%] min-w-[100px] select-none", style: {
                 backgroundColor: `var(${hunkLineNumberBGName})`,
                 color: `var(${plainLineNumberColorName})`,
             } }, expandEnabled ? (isFirstLine ? (React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[6px] cursor-pointer rounded-[2px]", title: "Expand Up", "data-title": "Expand Up", onClick: () => diffFile.onUnifiedHunkExpand("up", index) },
-            React__namespace.createElement(ExpandUp, { className: "fill-current" }))) : isExpandAll ? (React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[6px] cursor-pointer rounded-[2px]", title: "Expand All", "data-title": "Expand All", onClick: () => diffFile.onUnifiedHunkExpand("all", index) },
+            React__namespace.createElement(ExpandUp, { className: "fill-current" }))) : isLastLine ? (React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[6px] cursor-pointer rounded-[2px]", title: "Expand Down", "data-title": "Expand Down", onClick: () => diffFile.onUnifiedHunkExpand("down", index) },
+            React__namespace.createElement(ExpandDown, { className: "fill-current" }))) : isExpandAll ? (React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[6px] cursor-pointer rounded-[2px]", title: "Expand All", "data-title": "Expand All", onClick: () => diffFile.onUnifiedHunkExpand("all", index) },
             React__namespace.createElement(ExpandAll, { className: "fill-current" }))) : (React__namespace.createElement(React__namespace.Fragment, null,
             React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[2px] cursor-pointer rounded-[2px]", title: "Expand Down", "data-title": "Expand Down", onClick: () => diffFile.onUnifiedHunkExpand("down", index) },
                 React__namespace.createElement(ExpandDown, { className: "fill-current" })),
             React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[2px] cursor-pointer rounded-[2px]", title: "Expand Up", "data-title": "Expand Up", onClick: () => diffFile.onUnifiedHunkExpand("up", index) },
-                React__namespace.createElement(ExpandUp, { className: "fill-current" }))))) : null),
+                React__namespace.createElement(ExpandUp, { className: "fill-current" }))))) : (React__namespace.createElement("div", { className: "min-h-[28px]" }, "\u2002"))),
         React__namespace.createElement("td", { className: "diff-line-hunk-content pr-[10px] align-middle", style: { backgroundColor: `var(${hunkContentBGName})` } },
             React__namespace.createElement("div", { className: "pl-[1.5em]", style: {
                     whiteSpace: enableWrap ? "pre-wrap" : "pre",
@@ -4120,21 +4310,6 @@ const DiffUnifiedHunkLine = ({ index, diffFile, lineNumber, }) => {
         return null;
     return React__namespace.createElement(_DiffUnifiedHunkLine, { index: index, diffFile: diffFile, lineNumber: lineNumber });
 };
-const DiffUnifiedLastHunkLine = ({ diffFile }) => {
-    const currentIsShow = diffFile.getNeedShowExpandAll("unified");
-    const expandEnabled = diffFile.getExpandEnabled();
-    if (!currentIsShow || !expandEnabled)
-        return null;
-    return (React__namespace.createElement("tr", { "data-line": "last-hunk", "data-state": "hunk", className: "diff-line diff-line-hunk" },
-        React__namespace.createElement("td", { className: "diff-line-hunk-action sticky left-0 w-[1%] min-w-[100px] select-none", style: {
-                backgroundColor: `var(${hunkLineNumberBGName})`,
-                color: `var(${plainLineNumberColorName})`,
-            } },
-            React__namespace.createElement("button", { className: "w-full diff-widget-tooltip hover:bg-blue-300 flex justify-center items-center py-[6px] cursor-pointer rounded-[2px]", title: "Expand Down", "data-title": "Expand Down", onClick: () => diffFile.onUnifiedLastExpand() },
-                React__namespace.createElement(ExpandDown, { className: "fill-current" }))),
-        React__namespace.createElement("td", { className: "diff-line-hunk-content pr-[10px] align-middle", style: { backgroundColor: `var(${hunkContentBGName})` } },
-            React__namespace.createElement("span", null, "\u2002"))));
-};
 
 const DiffUnifiedOldLine = ({ index, diffLine, rawLine, syntaxLine, lineNumber, diffFile, setWidget, enableWrap, enableAddWidget, enableHighlight, onAddWidgetClick, }) => {
     return (React__namespace.createElement("tr", { "data-line": index, "data-state": "diff", className: "diff-line group" },
@@ -4262,16 +4437,20 @@ const onMouseDown = (e) => {
     }
 };
 const DiffUnifiedView = React.memo(({ diffFile }) => {
+    const { useDiffContext } = useDiffViewContext();
     // performance optimization
     const useWidget = React.useMemo(() => reactivityStore.createStore(() => {
         const widgetSide = reactivityStore.ref(undefined);
         const widgetLineNumber = reactivityStore.ref(undefined);
         const setWidget = ({ side, lineNumber }) => {
+            const { renderWidgetLine } = useDiffContext.getReadonlyState();
+            if (typeof renderWidgetLine !== "function")
+                return;
             widgetSide.value = side;
             widgetLineNumber.value = lineNumber;
         };
         return { widgetSide, widgetLineNumber, setWidget };
-    }), []);
+    }), [useDiffContext]);
     const contextValue = React.useMemo(() => ({ useWidget }), [useWidget]);
     shim.useSyncExternalStore(diffFile.subscribe, diffFile.getUpdateCount);
     React.useEffect(() => {
@@ -4296,7 +4475,7 @@ const DiffUnifiedView = React.memo(({ diffFile }) => {
                             React__namespace.createElement(DiffUnifiedLine, { index: item.index, lineNumber: item.lineNumber, diffFile: diffFile }),
                             React__namespace.createElement(DiffUnifiedWidgetLine, { index: item.index, lineNumber: item.lineNumber, diffFile: diffFile }),
                             React__namespace.createElement(DiffUnifiedExtendLine, { index: item.index, lineNumber: item.lineNumber, diffFile: diffFile })))),
-                        React__namespace.createElement(DiffUnifiedLastHunkLine, { diffFile: diffFile })))))));
+                        React__namespace.createElement(DiffUnifiedHunkLine, { index: diffFile.unifiedLineLength, lineNumber: diffFile.unifiedLineLength, diffFile: diffFile })))))));
 });
 DiffUnifiedView.displayName = "DiffUnifiedView";
 
@@ -4409,7 +4588,7 @@ const _InternalDiffView = (props) => {
     ]);
     const value = React.useMemo(() => ({ useDiffContext }), [useDiffContext]);
     return (React__namespace.createElement(DiffViewContext.Provider, { value: value },
-        React__namespace.createElement("div", { className: "diff-tailwindcss-wrapper" },
+        React__namespace.createElement("div", { className: "diff-tailwindcss-wrapper", "data-component": "git-diff-view", "data-version": `${"0.0.6"}` },
             React__namespace.createElement("div", { className: "diff-style-root", style: {
                     // @ts-ignore
                     [diffFontSizeName]: diffViewFontSize + "px",
@@ -4417,7 +4596,7 @@ const _InternalDiffView = (props) => {
                 React__namespace.createElement("div", { id: `diff-root${diffFileId}`, className: "diff-view-wrapper" + (className ? ` ${className}` : ""), style: style }, diffViewMode === exports.DiffModeEnum.Split ? (React__namespace.createElement(DiffSplitView, { diffFile: diffFile })) : (React__namespace.createElement(DiffUnifiedView, { diffFile: diffFile })))))));
 };
 const InternalDiffView = React.memo(_InternalDiffView);
-const DiffView = (props) => {
+const DiffViewWithRef = (props, ref) => {
     const { registerHighlighter, autoDetectLang, data, diffFile: _diffFile, ...restProps } = props;
     const diffFile = React.useMemo(() => {
         if (_diffFile) {
@@ -4454,11 +4633,14 @@ const DiffView = (props) => {
         }
     }, [diffFile, _diffFile]);
     useUnmount(() => diffFile._destroy(), [diffFile]);
+    React.useImperativeHandle(ref, () => ({ getDiffFileInstance: () => diffFile }), [diffFile]);
     if (!diffFile)
         return null;
     return (React__namespace.createElement(InternalDiffView, { key: diffFile.getId(), ...restProps, diffFile: diffFile, diffViewFontSize: restProps.diffViewFontSize || 14 }));
 };
-const version = "0.0.5";
+const DiffView = React.forwardRef(DiffViewWithRef);
+DiffView.displayName = "DiffView";
+const version = "0.0.6";
 
 exports.DiffView = DiffView;
 exports.DiffViewContext = DiffViewContext;