fix merge usage

Author: MrWangJustToDo

packages/core/src/diff-file.ts

@@ -813,6 +813,10 @@ export class DiffFile {
 
   getBundle = () => {
     // common
+    const hasInitRaw = this.#hasInitRaw;
+    const hasInitSyntax = this.#hasInitSyntax;
+    const hasBuildSplit = this.#hasBuildSplit;
+    const hasBuildUnified = this.#hasBuildUnified;
     const oldFileLines = this.#oldFileLines;
     const oldFileDiffLines = this.#oldFileDiffLines;
     const oldFileSyntaxLines = this.#oldFileSyntaxLines;
@@ -835,6 +839,10 @@ export class DiffFile {
     const unifiedLastStartIndex = this.#unifiedLastStartIndex;
 
     return {
+      hasInitRaw,
+      hasInitSyntax,
+      hasBuildSplit,
+      hasBuildUnified,
       oldFileLines,
       oldFileDiffLines,
       oldFileSyntaxLines,
@@ -856,10 +864,10 @@ export class DiffFile {
   };
 
   mergeBundle = (data: ReturnType<DiffFile["getBundle"]>) => {
-    this.#hasInitRaw = true;
-    this.#hasInitSyntax = true;
-    this.#hasBuildSplit = true;
-    this.#hasBuildUnified = true;
+    this.#hasInitRaw = data.hasInitRaw;
+    this.#hasInitSyntax = data.hasInitSyntax;
+    this.#hasBuildSplit = data.hasBuildSplit;
+    this.#hasBuildUnified = data.hasBuildUnified;
     this.#composeByDiff = data.composeByDiff;
 
     this.#oldFileLines = data.oldFileLines;
@@ -882,4 +890,28 @@ export class DiffFile {
 
     this.notifyAll();
   };
+
+  _getFullBundle = () => {
+    const bundle = this.getBundle();
+    const oldFileResult = this.#oldFileResult;
+    const newFileResult = this.#newFileResult;
+    const diffLines = this.#diffLines;
+    const diffListResults = this.#diffListResults;
+
+    return {
+      ...bundle,
+      oldFileResult,
+      newFileResult,
+      diffLines,
+      diffListResults,
+    };
+  };
+
+  _mergeFullBundle = (data: ReturnType<DiffFile["_getFullBundle"]>) => {
+    this.mergeBundle(data);
+    this.#oldFileResult = data.oldFileResult;
+    this.#newFileResult = data.newFileResult;
+    this.#diffLines = data.diffLines;
+    this.#diffListResults = data.diffListResults;
+  };
 }

packages/react/src/components/DiffView.tsx

@@ -274,7 +274,7 @@ export const DiffView = <T extends unknown>(props: DiffViewProps<T>) => {
   const diffFile = useMemo(() => {
     if (_diffFile) {
       const diffFile = DiffFile.createInstance({});
-      diffFile.mergeBundle(_diffFile.getBundle());
+      diffFile._mergeFullBundle(_diffFile._getFullBundle());
       return diffFile;
     } else if (data) {
       return new DiffFile(

packages/vue/src/components/DiffView.tsx

@@ -70,7 +70,7 @@ export const DiffView = defineComponent<
     const getInstance = () => {
       if (props.diffFile) {
         const diffFile = DiffFile.createInstance({});
-        diffFile.mergeBundle(props.diffFile.getBundle());
+        diffFile._mergeFullBundle(props.diffFile._getFullBundle());
         return diffFile;
       }
       if (props.data)

ui/react-example/src/Example.tsx

@@ -200,9 +200,10 @@ export function Example() {
       delete (reactRoot.current as any)?.__fiber__;
       reactApp.current?.render?.(reactElement);
       // mount vue
-      vueApp.current?.unmount?.();
       vueApp.current = createApp(vueElement);
       vueApp.current.mount(vueRef.current!);
+
+      return () => vueApp.current?.unmount?.();
     }
   }, [diffFileInstance, reactElement]);