@git-diff-view/react 0.0.18 → 0.0.20

package/index.d.ts

@@ -44,15 +44,15 @@ declare const lowlight: {
 	registered: (aliasOrName: string) => boolean;
 };
 export declare class DiffFile {
-	readonly _oldFileName: string;
-	readonly _newFileName: string;
-	readonly _diffList: string[];
 	readonly uuid?: string;
 	_version_: string;
+	_oldFileName: string;
 	_oldFileContent: string;
 	_oldFileLang: string;
+	_newFileName: string;
 	_newFileContent: string;
 	_newFileLang: string;
+	_diffList: string[];
 	diffLineLength: number;
 	splitLineLength: number;
 	unifiedLineLength: number;
@@ -60,19 +60,7 @@ export declare class DiffFile {
 	hasExpandSplitAll: boolean;
 	hasExpandUnifiedAll: boolean;
 	hasSomeLineCollapsed: boolean;
-	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;
+	static createInstance(data: FileData, bundle?: ReturnType<DiffFile["getBundle"] | DiffFile["_getFullBundle"]>): DiffFile;
 	constructor(_oldFileName: string, _oldFileContent: string, _newFileName: string, _newFileContent: string, _diffList: string[], _oldFileLang?: string, _newFileLang?: string, uuid?: string);
 	initId(): void;
 	getId(): string;
@@ -130,7 +118,7 @@ export declare class DiffFile {
 		theme: "light" | "dark";
 		isFullMerge: boolean;
 	};
-	mergeBundle: (data: ReturnType<DiffFile["getBundle"]>) => void;
+	mergeBundle: (data: ReturnType<DiffFile["getBundle"]>, notifyUpdate?: boolean) => void;
 	_getHighlighterName: () => string;
 	_getIsPureDiffRender: () => boolean;
 	_getTheme: () => "light" | "dark";
@@ -169,7 +157,7 @@ export declare class DiffFile {
 		version: string;
 		theme: "light" | "dark";
 	};
-	_mergeFullBundle: (data: ReturnType<DiffFile["_getFullBundle"]>) => void;
+	_mergeFullBundle: (data: ReturnType<DiffFile["_getFullBundle"]>, notifyUpdate?: boolean) => void;
 	_destroy: () => void;
 	clear: () => void;
 }
@@ -360,7 +348,10 @@ export declare const HiddenBidiCharsRegex: RegExp;
 export declare const _cacheMap: Cache$1<string, File$1>;
 export declare const checkDiffLineIncludeChange: (diffLine?: DiffLine) => boolean;
 export declare const composeLen = 40;
-export declare const getDiffRange: (additions: DiffLine[], deletions: DiffLine[]) => void;
+export declare const getDiffRange: (additions: DiffLine[], deletions: DiffLine[], { getAdditionRaw, getDeletionRaw, }: {
+	getAdditionRaw: (lineNumber: number) => string;
+	getDeletionRaw: (lineNumber: number) => string;
+}) => void;
 export declare const getFile: (raw: string, lang: string, theme: "light" | "dark", fileName?: string, uuid?: string) => File$1;
 export declare const getLang: (fileName: string) => string;
 export declare const getSplitContentLines: (diffFile: DiffFile) => DiffSplitContentLineItem[];
@@ -560,6 +551,19 @@ export type DiffUnifiedLineItem = {
 	index: number;
 	lineNumber: number;
 };
+export type FileData = {
+	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;
@@ -601,17 +605,17 @@ export type SyntaxNode = {
 	children?: SyntaxNode[];
 };
 declare const createDiffConfigStore: (props: DiffViewProps<any>, diffFileId: string) => import("reactivity-store").UseSelectorWithStore<{
-	id: import("reactivity-store").Ref<string>;
+	id: import("reactivity-store").Ref<string, string>;
 	setId: (_id: string) => string;
-	mode: import("reactivity-store").Ref<DiffModeEnum>;
+	mode: import("reactivity-store").Ref<DiffModeEnum, DiffModeEnum>;
 	setMode: (_mode: DiffModeEnum) => DiffModeEnum;
-	enableWrap: import("reactivity-store").Ref<boolean>;
+	enableWrap: import("reactivity-store").Ref<boolean, boolean>;
 	setEnableWrap: (_enableWrap: boolean) => boolean;
-	enableAddWidget: import("reactivity-store").Ref<boolean>;
+	enableAddWidget: import("reactivity-store").Ref<boolean, boolean>;
 	setEnableAddWidget: (_enableAddWidget: boolean) => boolean;
-	enableHighlight: import("reactivity-store").Ref<boolean>;
+	enableHighlight: import("reactivity-store").Ref<boolean, boolean>;
 	setEnableHighlight: (_enableHighlight: boolean) => boolean;
-	fontSize: import("reactivity-store").Ref<number>;
+	fontSize: import("reactivity-store").Ref<number, number>;
 	setFontSize: (_fontSize: number) => number;
 	extendData: import("reactivity-store").Ref<{
 		oldFile: {
@@ -624,6 +628,28 @@ declare const createDiffConfigStore: (props: DiffViewProps<any>, diffFileId: str
 				data: any;
 			};
 		};
+	}, {
+		oldFile: {
+			[x: string]: {
+				data: any;
+			};
+		};
+		newFile: {
+			[x: string]: {
+				data: any;
+			};
+		};
+	} | {
+		oldFile: {
+			[x: string]: {
+				data: any;
+			};
+		};
+		newFile: {
+			[x: string]: {
+				data: any;
+			};
+		};
 	}>;
 	setExtendData: (_extendData: DiffViewProps<any>["extendData"]) => void;
 	renderWidgetLine: import("reactivity-store").Ref<({ diffFile, side, lineNumber, onClose, }: {
@@ -631,6 +657,11 @@ declare const createDiffConfigStore: (props: DiffViewProps<any>, diffFileId: str
 		side: SplitSide;
 		diffFile: DiffFile;
 		onClose: () => void;
+	}) => import("react").ReactNode, ({ diffFile, side, lineNumber, onClose, }: {
+		lineNumber: number;
+		side: SplitSide;
+		diffFile: DiffFile;
+		onClose: () => void;
 	}) => import("react").ReactNode>;
 	setRenderWidgetLine: (_renderWidgetLine: ({ diffFile, side, lineNumber, onClose, }: {
 		lineNumber: number;
@@ -649,6 +680,12 @@ declare const createDiffConfigStore: (props: DiffViewProps<any>, diffFileId: str
 		data: any;
 		diffFile: DiffFile;
 		onUpdate: () => void;
+	}) => import("react").ReactNode, ({ diffFile, side, data, lineNumber, onUpdate, }: {
+		lineNumber: number;
+		side: SplitSide;
+		data: any;
+		diffFile: DiffFile;
+		onUpdate: () => void;
 	}) => import("react").ReactNode>;
 	setRenderExtendLine: (_renderExtendLine: ({ diffFile, side, data, lineNumber, onUpdate, }: {
 		lineNumber: number;

package/package.json

@@ -3,7 +3,7 @@
   "description": "@git-diff-view/react",
   "author": "MrWangJustToDo",
   "license": "MIT",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [
@@ -57,22 +57,22 @@
     "react diff component"
   ],
   "dependencies": {
-    "@git-diff-view/core": "^0.0.18",
+    "@git-diff-view/core": "^0.0.20",
     "@types/hast": "^3.0.0",
     "fast-diff": "^1.3.0",
     "highlight.js": "^11.9.0",
     "lowlight": "^3.1.0",
-    "reactivity-store": "^0.3.6",
+    "reactivity-store": "^0.3.7",
     "use-sync-external-store": "^1.2.2"
   },
   "devDependencies": {
     "@types/use-sync-external-store": "^0.0.3",
     "autoprefixer": "^10.4.20",
-    "postcss": "^8.4.43",
+    "postcss": "^8.4.47",
     "postcss-cli": "^11.0.0",
     "postcss-import": "^16.1.0",
     "react": "^18.0.0",
-    "tailwindcss": "^3.4.10"
+    "tailwindcss": "^3.4.14"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",

package/readme.md

@@ -23,6 +23,7 @@ import "@git-diff-view/react/styles/diff-view.css";
   diffViewHighlight={boolean}
   diffViewMode={DiffModeEnum.Split | DiffModeEnum.Unified}
   diffViewWrap={boolean}
+  diffViewTheme={'light' | 'dark'}
   diffViewAddWidget
   onAddWidgetClick={({ side, lineNumber }) => void}
   renderWidgetLine={({ onClose, side, lineNumber }) => ReactNode}
@@ -43,6 +44,7 @@ const file = generateDiffFile(
   data?.oldFile?.fileLang || "",
   data?.newFile?.fileLang || ""
 );
+file.initTheme('light' / 'dark');
 file.init();
 file.buildSplitDiffLines();
 file.buildUnifiedDiffLines();
@@ -58,6 +60,7 @@ const file = new DiffFile(
   data?.oldFile?.fileLang || "",
   data?.newFile?.fileLang || ""
 );
+file.initTheme('light' / 'dark');
 file.init();
 file.buildSplitDiffLines();
 file.buildUnifiedDiffLines();
@@ -83,6 +86,7 @@ const diffFile = DiffFile.createInstance(data || {}, bundle);
 | diffViewHighlight | enable syntax highlight, type: boolean |
 | diffViewMode     | the mode for the DiffView component, type: `DiffModeEnum.Split` or `DiffModeEnum.Unified` |
 | diffViewWrap     | enable code line auto wrap, type: boolean |
+| diffViewTheme    | the theme for the DiffView component, type: `light` or `dark` |
 | diffViewAddWidget| enable `addWidget` button, type: boolean |
 | onAddWidgetClick | when the `addWidget` button clicked, type: `({ side: "old" | "new", lineNumber: number }) => void` |