refactor(nodes-z): groups start with z=2

xyflow · Nov 9, 2021 · f0e79c6 · f0e79c6
1 parent 8a2ac1e
commit f0e79c6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-flow-renderer",
-  "version": "10.0.0-next.13",
+  "version": "10.0.0-next.14",
   "engines": {
     "node": ">=12"
   },

diff --git a/src/store/utils.ts b/src/store/utils.ts
@@ -36,14 +36,15 @@ export function createNodeInternals(nodes: Node[], nodeInternals: NodeInternals)
   const parentNodes: ParentNodes = {};
 
   nodes.forEach((node) => {
+    const z = node.zIndex ? node.zIndex : node.dragging || node.selected ? 1000 : 0;
     const internals: NodeInternalsItem = {
       ...nodeInternals.get(node.id),
       id: node.id,
       width: node.width || null,
       height: node.height || null,
       position: node.position,
       positionAbsolute: node.position,
-      z: node.dragging || node.selected ? 1000 : node.zIndex || 0,
+      z,
     };
     if (node.parentNode) {
       internals.parentNode = node.parentNode;
@@ -59,7 +60,7 @@ export function createNodeInternals(nodes: Node[], nodeInternals: NodeInternals)
       let startingZ = updatedInternals.z || 0;
 
       if (!startingZ) {
-        if (parentNodes[node.id] && node.parentNode) {
+        if (parentNodes[node.id]) {
           startingZ = 2;
         } else if (node.parentNode) {
           startingZ = 1;