From 7ffad7770b99ed2b6adc2a5130a07175c0a42189 Mon Sep 17 00:00:00 2001
From: moklick <info@moritzklack.com>
Date: Thu, 18 Nov 2021 17:57:45 +0100
Subject: [PATCH] refactor(subgraphs): calculate z for child nodes

---
 package-lock.json  |  4 ++--
 package.json       |  2 +-
 src/store/utils.ts | 31 ++++++++++---------------------
 src/types/nodes.ts |  2 +-
 src/utils/index.ts |  2 ++
 5 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1756d2e2..17711e21 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "react-flow-renderer",
-  "version": "10.0.0-next.14",
+  "version": "10.0.0-next.16",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "react-flow-renderer",
-      "version": "10.0.0-next.14",
+      "version": "10.0.0-next.16",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.15.4",
diff --git a/package.json b/package.json
index b2fdbe7a..5f33733e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-flow-renderer",
-  "version": "10.0.0-next.14",
+  "version": "10.0.0-next.16",
   "engines": {
     "node": ">=12"
   },
diff --git a/src/store/utils.ts b/src/store/utils.ts
index fbfc1a09..8247df6b 100644
--- a/src/store/utils.ts
+++ b/src/store/utils.ts
@@ -1,4 +1,5 @@
 import { Node, Edge, NodeInternals, NodeInternalsItem, XYZPosition } from '../types';
+import { isNumeric } from '../utils';
 
 type ParentNodes = Record<string, boolean>;
 
@@ -13,22 +14,10 @@ function calculateXYZPosition(
   }
   const parentNode = nodeInternals.get(node.parentNode)!;
 
-  // +1 for each recursion level
-  let zAddition = 1;
-
-  // +2 if it's a parent node, so that groups/parents are always on top
-  if (parentNodes[node.parentNode!]) {
-    zAddition = 2;
-  }
-
-  if (parentNode.z) {
-    zAddition += parentNode.z;
-  }
-
   return calculateXYZPosition(parentNode, nodeInternals, parentNodes, {
     x: (result.x ?? 0) + (parentNode.position?.x ?? 0),
     y: (result.y ?? 0) + (parentNode.position?.y ?? 0),
-    z: (result.z ?? 0) + zAddition,
+    z: parentNode.z > node.z ? parentNode.z : node.z,
   });
 }
 
@@ -72,7 +61,7 @@ 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 z = isNumeric(node.zIndex) ? node.zIndex : node.dragging || node.selected ? 1000 : 0;
     const internals: NodeInternalsItem = {
       ...nodeInternals.get(node.id),
       ...node,
@@ -89,26 +78,26 @@ export function createNodeInternals(nodes: Node[], nodeInternals: NodeInternals)
     nextNodeInternals.set(node.id, internals);
   });
 
-  nodes.forEach((node) => {
-    const updatedInternals: NodeInternalsItem = nextNodeInternals.get(node.id)!;
-
+  nextNodeInternals.forEach((node) => {
     if (node.parentNode && !nextNodeInternals.has(node.parentNode)) {
       throw new Error(`Parent node ${node.parentNode} not found`);
     }
 
     if (node.parentNode || parentNodes[node.id]) {
-      const { x, y } = calculateXYZPosition(node, nextNodeInternals, parentNodes, {
+      const { x, y, z } = calculateXYZPosition(node, nextNodeInternals, parentNodes, {
         ...node.position,
-        z: 0,
+        z: node.z,
       });
 
-      updatedInternals.positionAbsolute = {
+      node.positionAbsolute = {
         x,
         y,
       };
 
+      node.z = z;
+
       if (parentNodes[node.id]) {
-        updatedInternals.isParent = true;
+        node.isParent = true;
       }
     }
   });
diff --git a/src/types/nodes.ts b/src/types/nodes.ts
index fe11ef48..ed9fcfdc 100644
--- a/src/types/nodes.ts
+++ b/src/types/nodes.ts
@@ -104,7 +104,7 @@ export type NodeDimensionUpdate = {
 export type NodeInternalsItem = Node & {
   positionAbsolute?: XYPosition;
   handleBounds?: NodeHandleBounds;
-  z?: number;
+  z: number;
   isParent?: boolean;
 };
 
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 084f5beb..926977cb 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -38,3 +38,5 @@ export const boxToRect = ({ x, y, x2, y2 }: Box): Rect => ({
 
 export const getBoundsofRects = (rect1: Rect, rect2: Rect): Rect =>
   boxToRect(getBoundsOfBoxes(rectToBox(rect1), rectToBox(rect2)));
+
+export const isNumeric = (n: any): n is number => !isNaN(n) && isFinite(n);