@unsetsoft/ryunixjs 1.2.4-canary.14 → 1.2.4-canary.15

package/dist/Ryunix.umd.js

@@ -598,7 +598,7 @@
       runEffects(fiber);
     } else if (fiber.effectTag === EFFECT_TAGS.DELETION) {
       cancelEffectsDeep(fiber);
-      commitDeletion(fiber, domParent);
+      commitDeletion(fiber);
       return
     }
 
@@ -608,11 +608,13 @@
 
   const commitDeletion = (fiber, domParent) => {
     if (fiber.dom) {
-      domParent.removeChild(fiber.dom);
+      if (fiber.dom.parentNode) {
+        fiber.dom.parentNode.removeChild(fiber.dom);
+      }
     } else {
       let child = fiber.child;
       while (child) {
-        commitDeletion(child, domParent);
+        commitDeletion(child);
         child = child.sibling;
       }
     }
@@ -625,6 +627,7 @@
     const state = getState();
     let index = 0;
     let prevSibling;
+    let isFirstChild = true;
 
     // Build map of old fibers by key/index
     const oldFiberMap = new Map();
@@ -632,7 +635,7 @@
     let position = 0;
 
     while (oldFiber) {
-      const key = oldFiber.key ?? `__index_${position}__`;
+      const key = oldFiber.key ?? `__index_${oldFiber.index ?? position}__`;
       oldFiberMap.set(key, oldFiber);
       oldFiber = oldFiber.sibling;
       position++;
@@ -663,6 +666,7 @@
           effectTag: EFFECT_TAGS.UPDATE,
           hooks: matchedFiber.hooks,
           key: element.key,
+          index,
         };
         oldFiberMap.delete(key);
       } else {
@@ -675,6 +679,7 @@
           alternate: null,
           effectTag: EFFECT_TAGS.PLACEMENT,
           key: element.key,
+          index,
         };
 
         // Mark matched fiber for deletion if exists
@@ -686,8 +691,9 @@
       }
 
       // Link fibers
-      if (index === 0) {
+      if (isFirstChild) {
         wipFiber.child = newFiber;
+        isFirstChild = false;
       } else if (newFiber) {
         prevSibling.sibling = newFiber;
       }
@@ -809,14 +815,10 @@
       hook.queue.push(action);
 
       const currentState = getState();
-      currentState.wipRoot = currentState.currentRoot ? {
+      currentState.wipRoot = {
         dom: currentState.currentRoot.dom,
         props: currentState.currentRoot.props,
         alternate: currentState.currentRoot,
-      } : {
-        dom: currentState.wipRoot ? currentState.wipRoot.dom : currentState.containerRoot,
-        props: currentState.wipRoot ? currentState.wipRoot.props : { children: [] },
-        alternate: null,
       };
       currentState.deletions = [];
       currentState.hookIndex = 0;