@lvce-editor/virtual-dom-worker 1.9.0 → 1.10.0

package/dist/index.js

@@ -158,10 +158,12 @@ var applyPendingPatches = (patches, pendingPatches, skip) => {
   pendingPatches.length = 0;
 };
 
-// src/parts/GetKeys/GetKeys.ts
+// src/parts/IsKey/IsKey.ts
 var isKey = (key) => {
   return key !== "type" && key !== "childCount";
 };
+
+// src/parts/GetKeys/GetKeys.ts
 var getKeys = (node) => {
   const keys = Object.keys(node).filter(isKey);
   return keys;
@@ -195,6 +197,13 @@ var diff = (oldNodes, newNodes) => {
     if (siblingOffset > 0) {
     }
     if (siblingOffset === maxSiblingOffset) {
+      indexStack.pop();
+      indexStack.pop();
+      pendingPatches.push(NavigateParent, 0);
+      maxSiblingOffset = indexStack.pop();
+      siblingOffset = indexStack.pop() + 1;
+    }
+    while (siblingOffset === maxSiblingOffset) {
       pendingPatches.push(NavigateParent, 0);
       maxSiblingOffset = indexStack.pop();
       siblingOffset = indexStack.pop() + 1;
@@ -252,6 +261,9 @@ var diff = (oldNodes, newNodes) => {
       }
     }
     if (hasAttributeChanges) {
+      if (siblingOffset > 0) {
+        pendingPatches.push(NavigateSibling, siblingOffset);
+      }
       applyPendingPatches(patches, pendingPatches, 0);
       for (const key of newKeys) {
         if (oldNode[key] !== newNode[key]) {
@@ -289,6 +301,7 @@ var diff = (oldNodes, newNodes) => {
       }
       i += getTotalChildCount(oldNodes, i);
       j++;
+      siblingOffset++;
       continue;
     }
     if (newNode.childCount) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/virtual-dom-worker",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "main": "dist/index.js",
   "type": "module",
   "keywords": [],

package/src/parts/GetKeys/GetKeys.ts

@@ -1,10 +1,7 @@
+import * as IsKey from '../IsKey/IsKey.ts'
 import { VirtualDomNode } from '../VirtualDomNode/VirtualDomNode.ts'
 
-const isKey = (key: string): boolean => {
-  return key !== 'type' && key !== 'childCount'
-}
-
 export const getKeys = (node: VirtualDomNode): readonly string[] => {
-  const keys = Object.keys(node).filter(isKey)
+  const keys = Object.keys(node).filter(IsKey.isKey)
   return keys
 }

package/src/parts/IsKey/IsKey.ts

@@ -0,0 +1,3 @@
+export const isKey = (key: string): boolean => {
+  return key !== 'type' && key !== 'childCount'
+}

package/src/parts/VirtualDomDiff/VirtualDomDiff.ts

@@ -24,7 +24,17 @@ export const diff = (
     if (siblingOffset > 0) {
       // pendingPatches.push(PatchType.NavigateSibling, siblingOffset)
     }
+
+    // TODO maybe don't have the current element in indexstack
     if (siblingOffset === maxSiblingOffset) {
+      indexStack.pop()
+      indexStack.pop()
+      pendingPatches.push(PatchType.NavigateParent, 0)
+      maxSiblingOffset = indexStack.pop() as number
+      siblingOffset = (indexStack.pop() as number) + 1
+    }
+
+    while (siblingOffset === maxSiblingOffset) {
       pendingPatches.push(PatchType.NavigateParent, 0)
       maxSiblingOffset = indexStack.pop() as number
       siblingOffset = (indexStack.pop() as number) + 1
@@ -93,6 +103,9 @@ export const diff = (
     }
 
     if (hasAttributeChanges) {
+      if (siblingOffset > 0) {
+        pendingPatches.push(PatchType.NavigateSibling, siblingOffset)
+      }
       ApplyPendingPatches.applyPendingPatches(patches, pendingPatches, 0)
 
       for (const key of newKeys) {
@@ -133,6 +146,7 @@ export const diff = (
       }
       i += GetTotalChildCount.getTotalChildCount(oldNodes, i)
       j++
+      siblingOffset++
       continue
     }