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

package/dist/Ryunix.esm.js

@@ -557,9 +557,19 @@ const clearContainer = (container) => {
 const commitRoot = () => {
   const state = getState();
   state.deletions.forEach(commitWork);
-  commitWork(state.wipRoot.child);
-  state.currentRoot = state.wipRoot;
-  state.wipRoot = null;
+
+  const finishedWork = state.wipRoot;
+
+  // Swap the currentRoot pointer BEFORE running effects
+  // This allows dispatches inside effects to base their new work on the just-finished tree
+  state.currentRoot = finishedWork;
+
+  commitWork(finishedWork.child);
+
+  // If wipRoot was not reassigned by a synchronous dispatch during effects, clear it
+  if (state.wipRoot === finishedWork) {
+    state.wipRoot = null;
+  }
 };
 
 const commitWork = (fiber) => {
@@ -592,7 +602,7 @@ const commitWork = (fiber) => {
     runEffects(fiber);
   } else if (fiber.effectTag === EFFECT_TAGS.DELETION) {
     cancelEffectsDeep(fiber);
-    commitDeletion(fiber, domParent);
+    commitDeletion(fiber);
     return
   }
 
@@ -602,11 +612,13 @@ const commitWork = (fiber) => {
 
 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;
     }
   }
@@ -619,6 +631,7 @@ const reconcileChildren = (wipFiber, elements) => {
   const state = getState();
   let index = 0;
   let prevSibling;
+  let isFirstChild = true;
 
   // Build map of old fibers by key/index
   const oldFiberMap = new Map();
@@ -626,7 +639,7 @@ const reconcileChildren = (wipFiber, elements) => {
   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++;
@@ -657,6 +670,7 @@ const reconcileChildren = (wipFiber, elements) => {
         effectTag: EFFECT_TAGS.UPDATE,
         hooks: matchedFiber.hooks,
         key: element.key,
+        index,
       };
       oldFiberMap.delete(key);
     } else {
@@ -669,6 +683,7 @@ const reconcileChildren = (wipFiber, elements) => {
         alternate: null,
         effectTag: EFFECT_TAGS.PLACEMENT,
         key: element.key,
+        index,
       };
 
       // Mark matched fiber for deletion if exists
@@ -680,8 +695,9 @@ const reconcileChildren = (wipFiber, elements) => {
     }
 
     // Link fibers
-    if (index === 0) {
+    if (isFirstChild) {
       wipFiber.child = newFiber;
+      isFirstChild = false;
     } else if (newFiber) {
       prevSibling.sibling = newFiber;
     }
@@ -803,14 +819,14 @@ const useReducer = (reducer, initialState, init) => {
     hook.queue.push(action);
 
     const currentState = getState();
-    currentState.wipRoot = currentState.currentRoot ? {
-      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,
+    const activeRoot = currentState.currentRoot || currentState.wipRoot;
+
+    if (!activeRoot) return
+
+    currentState.wipRoot = {
+      dom: activeRoot.dom,
+      props: activeRoot.props,
+      alternate: currentState.currentRoot || null,
     };
     currentState.deletions = [];
     currentState.hookIndex = 0;