improve

Author: MrWangJustToDo

packages/react/src/components/DiffView.tsx

@@ -97,7 +97,9 @@ type DiffViewProps_2<T> = Omit<DiffViewProps<T>, "data"> & {
   };
 };
 
-const InternalDiffView = <T extends unknown>(props: Omit<DiffViewProps<T>, "data" | "registerHighlighter">) => {
+const InternalDiffView = <T extends unknown>(
+  props: Omit<DiffViewProps<T>, "data" | "registerHighlighter"> & { isMounted: boolean }
+) => {
   const {
     diffFile,
     className,
@@ -111,12 +113,11 @@ const InternalDiffView = <T extends unknown>(props: Omit<DiffViewProps<T>, "data
     extendData,
     diffViewAddWidget,
     onAddWidgetClick,
+    isMounted,
   } = props;
 
   const diffFileId = useMemo(() => diffFile.getId(), [diffFile]);
 
-  const isMounted = useIsMounted();
-
   const wrapperRef = useRef<HTMLDivElement>();
 
   // performance optimization
@@ -291,6 +292,8 @@ const DiffViewWithRef = <T extends unknown>(
     diffFileRef.current = diffFile;
   }
 
+  const isMounted = useIsMounted();
+
   useEffect(() => {
     if (_diffFile && diffFile) {
       _diffFile._addClonedInstance(diffFile);
@@ -328,6 +331,7 @@ const DiffViewWithRef = <T extends unknown>(
       key={diffFile.getId()}
       {...restProps}
       diffFile={diffFile}
+      isMounted={isMounted}
       diffViewMode={restProps.diffViewMode || DiffModeEnum.SplitGitHub}
       diffViewFontSize={restProps.diffViewFontSize || 14}
     />

packages/react/src/components/tools.ts

@@ -4,7 +4,7 @@ import { createStore, ref } from "reactivity-store";
 import type { DiffModeEnum, DiffViewProps, SplitSide } from "./DiffView";
 import type { RefObject } from "react";
 
-export const createDiffConfigStore = (props: DiffViewProps<any>, diffFileId: string) => {
+export const createDiffConfigStore = (props: DiffViewProps<any> & { isMounted: boolean }, diffFileId: string) => {
   return createStore(() => {
     const id = ref(diffFileId);
 
@@ -14,7 +14,7 @@ export const createDiffConfigStore = (props: DiffViewProps<any>, diffFileId: str
 
     const setMode = (_mode: DiffModeEnum) => (mode.value = _mode);
 
-    const mounted = ref(false);
+    const mounted = ref(props.isMounted);
 
     const setMounted = (_mounted: boolean) => (mounted.value = _mounted);