update

Author: MrWangJustToDo

packages/cli/package.json

@@ -3,7 +3,7 @@
   "description": "@git-diff-view/cli",
   "author": "MrWangJustToDo",
   "license": "MIT",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "main": "index.mjs",
   "type": "module",
   "types": "index.d.ts",

packages/cli/src/components/DiffView.tsx

@@ -2,7 +2,7 @@
 import { DiffFile, _cacheMap, SplitSide } from "@git-diff-view/core";
 import { DiffModeEnum } from "@git-diff-view/utils";
 import { Box } from "ink";
-import React, { memo, useEffect, useMemo, useRef } from "react";
+import React, { forwardRef, memo, useEffect, useImperativeHandle, useMemo, useRef } from "react";
 
 import { useIsMounted } from "../hooks/useIsMounted";
 import { useUnmount } from "../hooks/useUnmount";
@@ -14,7 +14,7 @@ import { createDiffConfigStore } from "./tools";
 
 import type { DiffHighlighter, DiffHighlighterLang } from "@git-diff-view/core";
 import type { DOMElement } from "ink";
-import type { ReactNode, RefObject } from "react";
+import type { ForwardedRef, ReactNode, RefObject } from "react";
 
 _cacheMap.name = "@git-diff-view/cli";
 
@@ -182,10 +182,13 @@ const InternalDiffView = <T extends unknown>(
 
 const MemoedInternalDiffView = memo(InternalDiffView);
 
-const DiffViewContainer = <T extends unknown>(props: DiffViewProps<T>) => {
+const DiffViewContainerWithRef = <T extends unknown>(
+  props: DiffViewProps<T>,
+  ref: ForwardedRef<{ getDiffFileInstance: () => DiffFile }>
+) => {
   const { registerHighlighter, data, diffViewTheme, diffFile: _diffFile, width, ...restProps } = props;
 
-  const ref = useRef<DOMElement>(null);
+  const domRef = useRef<DOMElement>(null);
 
   const diffFile = useMemo(() => {
     if (_diffFile) {
@@ -246,19 +249,21 @@ const DiffViewContainer = <T extends unknown>(props: DiffViewProps<T>) => {
   // fix react strict mode error
   useUnmount(() => (__DEV__ ? diffFile?._destroy?.() : diffFile?.clear?.()), [diffFile]);
 
+  useImperativeHandle(ref, () => ({ getDiffFileInstance: () => diffFile }), [diffFile]);
+
   if (!diffFile) return null;
 
   return (
     <Box
-      ref={ref}
+      ref={domRef}
       width={width}
       flexGrow={typeof width === "number" ? undefined : 1}
       flexShrink={typeof width === "number" ? 0 : undefined}
     >
       <MemoedInternalDiffView
         key={diffFile.getId()}
         {...restProps}
-        wrapperRef={ref}
+        wrapperRef={domRef}
         diffFile={diffFile}
         isMounted={isMounted}
         diffViewTheme={diffViewTheme}
@@ -270,12 +275,21 @@ const DiffViewContainer = <T extends unknown>(props: DiffViewProps<T>) => {
 };
 
 // type helper function
-function ReactDiffView<T>(props: DiffViewProps_1<T>): JSX.Element;
-function ReactDiffView<T>(props: DiffViewProps_2<T>): JSX.Element;
-function ReactDiffView<T>(props: DiffViewProps<T>) {
-  return <DiffViewContainer {...props} />;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function ReactDiffView<T>(
+  props: DiffViewProps_1<T> & { ref?: ForwardedRef<{ getDiffFileInstance: () => DiffFile }> }
+): JSX.Element;
+function ReactDiffView<T>(
+  props: DiffViewProps_2<T> & { ref?: ForwardedRef<{ getDiffFileInstance: () => DiffFile }> }
+): JSX.Element;
+function ReactDiffView<T>(_props: DiffViewProps<T> & { ref?: ForwardedRef<{ getDiffFileInstance: () => DiffFile }> }) {
+  return <></>;
 }
 
-export const DiffView = ReactDiffView;
+const InnerDiffView = forwardRef(DiffViewContainerWithRef);
+
+InnerDiffView.displayName = "DiffView";
+
+export const DiffView = InnerDiffView as typeof ReactDiffView;
 
 export const version = __VERSION__;

packages/cli/test/index.mjs

@@ -1,8 +1,8 @@
 import { getDiffViewHighlighter } from "@git-diff-view/shiki";
-// import { createElement } from "@my-react/react";
-// import { Box, render, Text } from "@my-react/react-terminal";
-import { Box, render, Text } from "ink";
-import { createElement } from "react";
+import { createElement } from "@my-react/react";
+import { Box, render, Text } from "@my-react/react-terminal";
+// import { Box, render, Text } from "ink";
+// import { createElement } from "react";
 
 import { DiffView, DiffModeEnum } from "@git-diff-view/cli";
 

packages/core/index.d.ts

@@ -15,6 +15,7 @@ declare class File$1 {
 	readonly lang: DiffHighlighterLang | string;
 	readonly fileName?: string;
 	ast?: DiffAST;
+	theme?: "light" | "dark";
 	rawFile: Record<number, string>;
 	hasDoRaw: boolean;
 	rawLength?: number;

packages/core/package.json

@@ -3,7 +3,7 @@
   "description": "@git-diff-view/core",
   "author": "MrWangJustToDo",
   "license": "MIT",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [

packages/core/src/file.ts

@@ -34,6 +34,8 @@ type SyntaxLineWithTemplate = SyntaxLine & {
 export class File {
   ast?: DiffAST;
 
+  theme?: "light" | "dark";
+
   rawFile: Record<number, string> = {};
 
   hasDoRaw: boolean = false;
@@ -61,6 +63,8 @@ export class File {
 
     file.ast = data?.ast;
 
+    file.theme = data?.theme;
+
     file.rawFile = data?.rawFile || {};
 
     file.plainFile = data?.plainFile || {};
@@ -105,7 +109,7 @@ export class File {
     registerHighlighter?: Omit<DiffHighlighter, "getHighlighterEngine">;
     theme?: "light" | "dark";
   }) {
-    if (!this.raw || this.hasDoSyntax) return;
+    if (!this.raw || (this.hasDoSyntax && this.theme === theme)) return;
 
     const finalHighlighter = registerHighlighter || highlighter;
 
@@ -137,6 +141,8 @@ export class File {
 
     this.ast = supportEngin.getAST(this.raw, this.fileName, this.lang, theme);
 
+    this.theme = theme;
+
     if (!this.ast) return;
 
     const { syntaxFileObject, syntaxFileLineNumber } = supportEngin.processAST(this.ast);

packages/file/index.d.ts

@@ -14,6 +14,7 @@ declare class File$1 {
 	readonly lang: DiffHighlighterLang | string;
 	readonly fileName?: string;
 	ast?: DiffAST;
+	theme?: "light" | "dark";
 	rawFile: Record<number, string>;
 	hasDoRaw: boolean;
 	rawLength?: number;

packages/file/package.json

@@ -3,7 +3,7 @@
   "description": "@git-diff-view/file",
   "author": "MrWangJustToDo",
   "license": "MIT",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [

packages/lowlight/package.json

@@ -3,7 +3,7 @@
   "description": "@git-diff-view/lowlight",
   "author": "MrWangJustToDo",
   "license": "MIT",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [

packages/react/index.d.ts

@@ -14,6 +14,7 @@ declare class File$1 {
 	readonly lang: DiffHighlighterLang | string;
 	readonly fileName?: string;
 	ast?: DiffAST;
+	theme?: "light" | "dark";
 	rawFile: Record<number, string>;
 	hasDoRaw: boolean;
 	rawLength?: number;