@git-diff-view/react 0.0.32 → 0.0.34

package/index.d.ts

@@ -38,16 +38,16 @@ declare class File$1 {
 	doRaw(): void;
 }
 declare const lowlight: {
-	highlight: (language: string, value: string, options?: Readonly<import("lowlight").Options>) => import("hast").Root;
-	highlightAuto: (value: string, options?: Readonly<import("lowlight").AutoOptions>) => import("hast").Root;
-	listLanguages: () => string[];
+	highlight: (language: string, value: string, options?: Readonly<import("lowlight").Options> | null | undefined) => import("hast").Root;
+	highlightAuto: (value: string, options?: Readonly<import("lowlight").AutoOptions> | null | undefined) => import("hast").Root;
+	listLanguages: () => Array<string>;
 	register: {
 		(grammars: Readonly<Record<string, import("highlight.js").LanguageFn>>): undefined;
 		(name: string, grammar: import("highlight.js").LanguageFn): undefined;
 	};
 	registerAlias: {
-		(aliases: Readonly<Record<string, string | readonly string[]>>): undefined;
-		(language: string, alias: string | readonly string[]): undefined;
+		(aliases: Readonly<Record<string, ReadonlyArray<string> | string>>): undefined;
+		(language: string, alias: ReadonlyArray<string> | string): undefined;
 	};
 	registered: (aliasOrName: string) => boolean;
 };
@@ -76,8 +76,32 @@ export declare class DiffFile {
 	additionLength: number;
 	deletionLength: number;
 	hasSomeLineCollapsed: boolean;
-	static createInstance(data: FileData_1, bundle?: ReturnType<DiffFile["getBundle"] | DiffFile["_getFullBundle"]>): DiffFile;
-	static createInstance(data: FileData_2, bundle?: ReturnType<DiffFile["getBundle"] | DiffFile["_getFullBundle"]>): DiffFile;
+	static createInstance(data: {
+		oldFile?: {
+			fileName?: string | null;
+			fileLang?: DiffHighlighterLang | null;
+			content?: string | null;
+		};
+		newFile?: {
+			fileName?: string | null;
+			fileLang?: DiffHighlighterLang | null;
+			content?: string | null;
+		};
+		hunks?: string[];
+	}, bundle?: ReturnType<DiffFile["getBundle"] | DiffFile["_getFullBundle"]>): DiffFile;
+	static createInstance(data: {
+		oldFile?: {
+			fileName?: string | null;
+			fileLang?: string | null;
+			content?: string | null;
+		};
+		newFile?: {
+			fileName?: string | null;
+			fileLang?: string | null;
+			content?: string | null;
+		};
+		hunks?: string[];
+	}, bundle?: ReturnType<DiffFile["getBundle"] | DiffFile["_getFullBundle"]>): DiffFile;
 	constructor(_oldFileName: string, _oldFileContent: string, _newFileName: string, _newFileContent: string, _diffList: string[], _oldFileLang?: DiffHighlighterLang, _newFileLang?: DiffHighlighterLang, uuid?: string);
 	constructor(_oldFileName: string, _oldFileContent: string, _newFileName: string, _newFileContent: string, _diffList: string[], _oldFileLang?: string, _newFileLang?: string, uuid?: string);
 	initId(): void;
@@ -115,12 +139,16 @@ export declare class DiffFile {
 		value: string;
 		template?: string;
 	};
-	getOldSyntaxLine: (lineNumber: number) => SyntaxLineWithTemplate;
+	getOldSyntaxLine: (lineNumber: number) => SyntaxLine & {
+		template?: string;
+	};
 	getNewPlainLine: (lineNumber: number) => {
 		value: string;
 		template?: string;
 	};
-	getNewSyntaxLine: (lineNumber: number) => SyntaxLineWithTemplate;
+	getNewSyntaxLine: (lineNumber: number) => SyntaxLine & {
+		template?: string;
+	};
 	subscribe: (listener: (() => void) & {
 		isSyncExternal?: boolean;
 	}) => () => void;
@@ -138,7 +166,9 @@ export declare class DiffFile {
 			value: string;
 			template?: string;
 		}>;
-		oldFileSyntaxLines: Record<number, SyntaxLineWithTemplate>;
+		oldFileSyntaxLines: Record<number, SyntaxLine & {
+			template?: string;
+		}>;
 		oldFilePlaceholderLines: Record<string, boolean>;
 		newFileLines: Record<number, string>;
 		newFileDiffLines: Record<string, DiffLineItem>;
@@ -146,7 +176,9 @@ export declare class DiffFile {
 			value: string;
 			template?: string;
 		}>;
-		newFileSyntaxLines: Record<number, SyntaxLineWithTemplate>;
+		newFileSyntaxLines: Record<number, SyntaxLine & {
+			template?: string;
+		}>;
 		newFilePlaceholderLines: Record<string, boolean>;
 		splitLineLength: number;
 		unifiedLineLength: number;
@@ -196,7 +228,9 @@ export declare class DiffFile {
 			value: string;
 			template?: string;
 		}>;
-		oldFileSyntaxLines: Record<number, SyntaxLineWithTemplate>;
+		oldFileSyntaxLines: Record<number, SyntaxLine & {
+			template?: string;
+		}>;
 		oldFilePlaceholderLines: Record<string, boolean>;
 		newFileLines: Record<number, string>;
 		newFileDiffLines: Record<string, DiffLineItem>;
@@ -204,7 +238,9 @@ export declare class DiffFile {
 			value: string;
 			template?: string;
 		}>;
-		newFileSyntaxLines: Record<number, SyntaxLineWithTemplate>;
+		newFileSyntaxLines: Record<number, SyntaxLine & {
+			template?: string;
+		}>;
 		newFilePlaceholderLines: Record<string, boolean>;
 		splitLineLength: number;
 		unifiedLineLength: number;
@@ -416,14 +452,12 @@ export declare class DiffParser {
 }
 /** How many new lines will be added to a diff hunk by default. */
 export declare const DefaultDiffExpansionStep = 40;
-/**
- * Regular expression matching invisible bidirectional Unicode characters that
- * may be interpreted or compiled differently than what it appears. More info:
- * https://github.co/hiddenchars
- */
-export declare const HiddenBidiCharsRegex: RegExp;
 export declare const _cacheMap: Cache$1<string, File$1>;
 export declare const changeDefaultComposeLength: (compose: number) => void;
+/**
+ * Change the maximum length of a line to ignore line diff.
+ */
+export declare const changeMaxLengthToIgnoreLineDiff: (length: number) => void;
 export declare const checkCurrentLineIsHidden: (diffFile: DiffFile, lineNumber: number, side: SplitSide) => {
 	split: boolean;
 	unified: boolean;
@@ -432,14 +466,9 @@ export declare const checkDiffLineIncludeChange: (diffLine?: DiffLine) => boolea
 export declare const defaultTransform: (content: string) => string;
 export declare const disableCache: () => void;
 export declare const getCurrentComposeLength: () => number;
-export declare const getDiffRange: (additions: DiffLine[], deletions: DiffLine[], { getAdditionRaw, getDeletionRaw, getAdditionSyntax, getDeletionSyntax, }: {
-	getAdditionRaw: (lineNumber: number) => string;
-	getDeletionRaw: (lineNumber: number) => string;
-	getAdditionSyntax: (lineNumber: number) => SyntaxLineWithTemplate;
-	getDeletionSyntax: (lineNumber: number) => SyntaxLineWithTemplate;
-}) => void;
 export declare const getEnableFastDiffTemplate: () => boolean;
 export declare const getLang: (fileName: string) => string;
+export declare const getMaxLengthToIgnoreLineDiff: () => number;
 export declare const getPlainDiffTemplate: ({ diffLine, rawLine, operator, }: {
 	diffLine: DiffLine;
 	rawLine: string;
@@ -455,12 +484,12 @@ export declare const getSplitContentLines: (diffFile: DiffFile) => DiffSplitCont
 export declare const getSplitLines: (diffFile: DiffFile) => DiffSplitLineItem[];
 export declare const getSyntaxDiffTemplate: ({ diffLine, syntaxLine, operator, }: {
 	diffLine: DiffLine;
-	syntaxLine: SyntaxLineWithTemplate;
+	syntaxLine: SyntaxLine;
 	operator: "add" | "del";
 }) => void;
 export declare const getSyntaxDiffTemplateByFastDiff: ({ diffLine, syntaxLine, operator, }: {
 	diffLine: DiffLine;
-	syntaxLine: SyntaxLineWithTemplate;
+	syntaxLine: SyntaxLine;
 	operator: "add" | "del";
 }) => void;
 export declare const getSyntaxLineTemplate: (line: SyntaxLine) => string;
@@ -480,7 +509,6 @@ export declare const highlighter: DiffHighlighter;
  * ```
  */
 export declare const isTransformEnabled: () => boolean;
-export declare const numIterator: <T>(num: number, cb: (index: number) => T) => T[];
 export declare const parseInstance: DiffParser;
 export declare const processAST: (ast: DiffAST) => {
 	syntaxFileObject: Record<number, SyntaxLine>;
@@ -512,6 +540,7 @@ export declare const processTransformForFile: (content: string) => string;
 export declare const processTransformTemplateContent: (content: string) => string;
 export declare const resetDefaultComposeLength: () => void;
 export declare const resetEnableFastDiffTemplate: () => void;
+export declare const resetMaxLengthToIgnoreLineDiff: () => void;
 /**
  * Resets all transformation functions to their default state and disables transformation.
  *
@@ -592,27 +621,11 @@ export declare enum SplitSide {
 }
 export declare function _getAST(raw: string, fileName?: string, lang?: DiffHighlighterLang, theme?: "light" | "dark"): DiffAST;
 export declare function _getAST(raw: string, fileName?: string, lang?: string, theme?: "light" | "dark"): DiffAST;
-export declare function assertNever(_: never, message: string): never;
 export declare function diffChanges(addition: DiffLine, deletion: DiffLine): {
 	addRange: DiffRange;
 	delRange: DiffRange;
 };
 export declare function escapeHtml(string: unknown): string;
-export declare function getFile(raw: string, lang: DiffHighlighterLang, theme: "light" | "dark", fileName?: string, uuid?: string): File$1;
-export declare function getFile(raw: string, lang: string, theme: "light" | "dark", fileName?: string, uuid?: string): File$1;
-/**
- * Calculates whether or not a hunk header can be expanded up, down, both, or if
- * the space represented by the hunk header is short and expansion there would
- * mean merging with the hunk above.
- *
- * @param hunkIndex     Index of the hunk to evaluate within the whole diff.
- * @param hunkHeader    Header of the hunk to evaluate.
- * @param previousHunk  Hunk previous to the one to evaluate. Null if the
- *                      evaluated hunk is the first one.
- */
-export declare function getHunkHeaderExpansionType(hunkIndex: number, hunkHeader: DiffHunkHeader, previousHunk: DiffHunk | null): DiffHunkExpansionType;
-/** Utility function for getting the digit count of the largest line number in an array of diff hunks */
-export declare function getLargestLineNumber(hunks: DiffHunk[]): number;
 /** Get the changed ranges in the strings, relative to each other. */
 export declare function relativeChanges(addition: DiffLine, deletion: DiffLine): {
 	addRange: IRange;
@@ -742,32 +755,6 @@ export type DiffUnifiedLineItem = {
 	index: number;
 	lineNumber: number;
 };
-export type FileData_1 = {
-	oldFile?: {
-		fileName?: string | null;
-		fileLang?: DiffHighlighterLang | null;
-		content?: string | null;
-	};
-	newFile?: {
-		fileName?: string | null;
-		fileLang?: DiffHighlighterLang | null;
-		content?: string | null;
-	};
-	hunks?: string[];
-};
-export type FileData_2 = {
-	oldFile?: {
-		fileName?: string | null;
-		fileLang?: string | null;
-		content?: string | null;
-	};
-	newFile?: {
-		fileName?: string | null;
-		fileLang?: string | null;
-		content?: string | null;
-	};
-	hunks?: string[];
-};
 export type HunkInfo = {
 	oldStartIndex: number;
 	newStartIndex: number;
@@ -924,36 +911,8 @@ declare const createDiffConfigStore: (props: DiffViewProps<any> & {
 	setOnAddWidgetClick: (_onAddWidgetClick: {
 		current: (lineNumber: number, side: SplitSide) => void;
 	}) => (lineNumber: number, side: SplitSide) => void;
-	onCreateUseWidgetHook: import("reactivity-store").Ref<(hook: import("reactivity-store").UseSelectorWithStore<{
-		widgetSide: import("reactivity-store").Ref<SplitSide, SplitSide>;
-		widgetLineNumber: import("reactivity-store").Ref<number, number>;
-		setWidget: ({ side, lineNumber }: {
-			side?: SplitSide;
-			lineNumber?: number;
-		}) => void;
-	}>) => void, (hook: import("reactivity-store").UseSelectorWithStore<{
-		widgetSide: import("reactivity-store").Ref<SplitSide, SplitSide>;
-		widgetLineNumber: import("reactivity-store").Ref<number, number>;
-		setWidget: ({ side, lineNumber }: {
-			side?: SplitSide;
-			lineNumber?: number;
-		}) => void;
-	}>) => void>;
-	setOnCreateUseWidgetHook: (_onCreateUseWidgetHook: (hook: import("reactivity-store").UseSelectorWithStore<{
-		widgetSide: import("reactivity-store").Ref<SplitSide, SplitSide>;
-		widgetLineNumber: import("reactivity-store").Ref<number, number>;
-		setWidget: ({ side, lineNumber }: {
-			side?: SplitSide;
-			lineNumber?: number;
-		}) => void;
-	}>) => void) => (hook: import("reactivity-store").UseSelectorWithStore<{
-		widgetSide: import("reactivity-store").Ref<SplitSide, SplitSide>;
-		widgetLineNumber: import("reactivity-store").Ref<number, number>;
-		setWidget: ({ side, lineNumber }: {
-			side?: SplitSide;
-			lineNumber?: number;
-		}) => void;
-	}>) => void;
+	onCreateUseWidgetHook: import("reactivity-store").Ref<(hook: ReturnType<typeof createDiffWidgetStore>) => void, (hook: ReturnType<typeof createDiffWidgetStore>) => void>;
+	setOnCreateUseWidgetHook: (_onCreateUseWidgetHook: (hook: ReturnType<typeof createDiffWidgetStore>) => void) => (hook: ReturnType<typeof createDiffWidgetStore>) => void;
 }>;
 declare const createDiffWidgetStore: (useDiffContextRef: RefObject<ReturnType<typeof createDiffConfigStore>>) => import("reactivity-store").UseSelectorWithStore<{
 	widgetSide: import("reactivity-store").Ref<SplitSide, SplitSide>;

package/package.json

@@ -3,7 +3,7 @@
   "description": "@git-diff-view/react",
   "author": "MrWangJustToDo",
   "license": "MIT",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [
@@ -61,20 +61,20 @@
     "react diff component"
   ],
   "dependencies": {
-    "@git-diff-view/core": "^0.0.32",
+    "@git-diff-view/core": "^0.0.34",
     "@types/hast": "^3.0.0",
     "fast-diff": "^1.3.0",
     "highlight.js": "^11.11.0",
     "lowlight": "^3.3.0",
-    "reactivity-store": "^0.3.11",
-    "use-sync-external-store": "^1.4.0"
+    "reactivity-store": "^0.3.12",
+    "use-sync-external-store": "^1.6.0"
   },
   "devDependencies": {
-    "@types/use-sync-external-store": "^0.0.6",
-    "autoprefixer": "^10.4.20",
+    "@types/use-sync-external-store": "^1.5.0",
+    "autoprefixer": "^10.4.21",
     "postcss": "^8.5.6",
-    "react": "^18.0.0",
-    "tailwindcss": "^3.4.17"
+    "react": "^19.2.0",
+    "tailwindcss": "^3.4.18"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",

package/src/components/DiffSplitViewNormal.tsx

@@ -6,6 +6,7 @@ import {
   diffFontSizeName,
   borderColorName,
   diffAsideWidthName,
+  getDiffIdFromElement,
 } from "@git-diff-view/utils";
 import { Fragment, memo, useEffect, useRef } from "react";
 import * as React from "react";
@@ -137,6 +138,12 @@ export const DiffSplitViewNormal = memo(({ diffFile }: { diffFile: DiffFile }) =
       return;
     }
 
+    const id = getDiffIdFromElement(ele as HTMLElement);
+
+    if (id && id !== `diff-root${diffFile.getId()}`) {
+      return;
+    }
+
     while (ele && ele instanceof HTMLElement) {
       const state = ele.getAttribute("data-state");
       const side = ele.getAttribute("data-side");

package/src/components/DiffSplitViewWrap.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { type DiffFile, getSplitContentLines } from "@git-diff-view/core";
-import { diffAsideWidthName, diffFontSizeName, removeAllSelection } from "@git-diff-view/utils";
+import { diffAsideWidthName, diffFontSizeName, getDiffIdFromElement, removeAllSelection } from "@git-diff-view/utils";
 import { Fragment, memo, useMemo, useRef } from "react";
 import * as React from "react";
 // SEE https://github.com/facebook/react/pull/25231
@@ -65,6 +65,12 @@ export const DiffSplitViewWrap = memo(({ diffFile }: { diffFile: DiffFile }) =>
       return;
     }
 
+    const id = getDiffIdFromElement(ele as HTMLElement);
+
+    if (id && id !== `diff-root${diffFile.getId()}`) {
+      return;
+    }
+
     while (ele && ele instanceof HTMLElement) {
       const state = ele.getAttribute("data-state");
       const side = ele.getAttribute("data-side");

package/src/components/DiffUnifiedView.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { getUnifiedContentLine, SplitSide } from "@git-diff-view/core";
-import { diffFontSizeName, removeAllSelection, diffAsideWidthName } from "@git-diff-view/utils";
+import { diffFontSizeName, removeAllSelection, diffAsideWidthName, getDiffIdFromElement } from "@git-diff-view/utils";
 import * as React from "react";
 import { Fragment, memo, useEffect, useMemo, useRef } from "react";
 import { useSyncExternalStore } from "use-sync-external-store/shim/index.js";
@@ -85,6 +85,12 @@ export const DiffUnifiedView = memo(({ diffFile }: { diffFile: DiffFile }) => {
       return;
     }
 
+    const id = getDiffIdFromElement(ele as HTMLElement);
+
+    if (id && id !== `diff-root${diffFile.getId()}`) {
+      return;
+    }
+
     while (ele && ele instanceof HTMLElement) {
       const state = ele.getAttribute("data-state");
       if (state) {

package/src/index.ts

@@ -1,3 +1,5 @@
+/* eslint-disable import/export */
+
 export * from "./components/DiffView";
 
 export * from "@git-diff-view/core";

package/styles/diff-view.css

@@ -105,7 +105,7 @@
   --tw-contain-paint:  ;
   --tw-contain-style:  ;
 }/*
-! tailwindcss v3.4.17 | MIT License | https://tailwindcss.com
+! tailwindcss v3.4.18 | MIT License | https://tailwindcss.com
 *//*
 1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
 2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)