@dcl/react-ecs 7.21.1-22918726402.commit-ee210ee → 7.21.1-23203004012.commit-7c64ac2

package/dist/reconciler/index.js

@@ -156,11 +156,15 @@ export function createReconciler(engine, pointerEvents) {
             const rightOfChild = parent._child.find((c) => c.rightOf === child.entity);
             if (rightOfChild) {
                 rightOfChild.rightOf = child.rightOf;
-                // Re-order parent._child array
-                parent._child = parent._child.filter((c) => c.entity !== child.entity);
-                parent._child.push(child);
                 updateTree(rightOfChild, { rightOf: rightOfChild.rightOf });
             }
+            // Always remove from old position and push to end for reorders.
+            // Previously, filter/push was inside the if(rightOfChild) block, so when
+            // rightOfChild was not found (child was last), the child stayed at its old
+            // position. This caused _child[length-2] to potentially be the child itself,
+            // producing a self-referencing rightOf.
+            parent._child = parent._child.filter((c) => c.entity !== child.entity);
+            parent._child.push(child);
             // Its a re-order. We are the last element, so we need to fetch the element before us.
             child.rightOf = parent._child[parent._child.length - 2]?.entity;
         }
@@ -174,13 +178,14 @@ export function createReconciler(engine, pointerEvents) {
     }
     function removeChild(parentInstance, child) {
         const childIndex = parentInstance._child.findIndex((c) => c.entity === child.entity);
-        const childToModify = parentInstance._child[childIndex + 1];
-        if (childToModify) {
-            childToModify.rightOf = child.rightOf;
-            updateTree(childToModify, { rightOf: child.rightOf });
+        if (childIndex !== -1) {
+            const childToModify = parentInstance._child[childIndex + 1];
+            if (childToModify) {
+                childToModify.rightOf = child.rightOf;
+                updateTree(childToModify, { rightOf: child.rightOf });
+            }
+            parentInstance._child.splice(childIndex, 1);
         }
-        // Mutate 💀
-        parentInstance._child.splice(childIndex, 1);
         removeChildEntity(child);
     }
     function updateOnChange(entity, componentId, state) {
@@ -258,6 +263,23 @@ export function createReconciler(engine, pointerEvents) {
             }
         },
         insertBefore(parentInstance, child, beforeChild) {
+            // Handle reorder: if child already exists in this parent, remove it from its old position
+            // and fix up the old neighbor's rightOf before inserting at the new position.
+            const existingIndex = parentInstance._child.findIndex((c) => c.entity === child.entity);
+            if (existingIndex !== -1) {
+                // If beforeChild.rightOf already points to child, child is already in the correct
+                // position in the rightOf chain. Setting child.rightOf = beforeChild.rightOf would
+                // produce a self-cycle (child.rightOf = child.entity).
+                if (beforeChild.rightOf === child.entity) {
+                    return;
+                }
+                const oldNextSibling = parentInstance._child[existingIndex + 1];
+                if (oldNextSibling) {
+                    oldNextSibling.rightOf = child.rightOf;
+                    updateTree(oldNextSibling, { rightOf: oldNextSibling.rightOf });
+                }
+                parentInstance._child.splice(existingIndex, 1);
+            }
             const beforeChildIndex = parentInstance._child.findIndex((c) => c.entity === beforeChild.entity);
             parentInstance._child = [
                 ...parentInstance._child.slice(0, beforeChildIndex),

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dcl/react-ecs",
   "description": "Decentraland ECS",
-  "version": "7.21.1-22918726402.commit-ee210ee",
+  "version": "7.21.1-23203004012.commit-7c64ac2",
   "author": "DCL",
   "bugs": "https://github.com/decentraland/js-sdk-toolchain/issues",
   "dependencies": {
-    "@dcl/ecs": "7.21.1-22918726402.commit-ee210ee",
+    "@dcl/ecs": "7.21.1-23203004012.commit-7c64ac2",
     "react": "^18.2.0",
     "react-reconciler": "^0.29.0"
   },
@@ -40,5 +40,5 @@
     "tsconfig": "./tsconfig.json"
   },
   "types": "./dist/index.d.ts",
-  "commit": "ee210ee78e334e8e696dbae117a8e0019aa13c97"
+  "commit": "7c64ac29ee3f34e79019b4435854537a261721ab"
 }