From c1d5c35a0434f9bb6bfe4318d0566ee962e5093e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christopher=20M=C3=B6ller?= <chrtze@gmail.com>
Date: Thu, 21 Oct 2021 16:59:52 +0200
Subject: [PATCH] feat(nested-nodes): recursively get children of moved node

---
 src/container/NodeRenderer/index.tsx |  2 +-
 src/store/index.ts                   | 59 ++++++++++++++++------------
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/container/NodeRenderer/index.tsx b/src/container/NodeRenderer/index.tsx
index 58026bff..d78552ae 100644
--- a/src/container/NodeRenderer/index.tsx
+++ b/src/container/NodeRenderer/index.tsx
@@ -77,7 +77,7 @@ function Nodes({
       typeof node.height !== 'undefined';
     let childRect;
 
-    const childNodes = nodes.filter((n) => n.parentNode === node.id);
+    const childNodes = nodes.filter((n) => n.parentNode === node.id && !n.isHidden);
 
     // if (childNodes.length) {
     //   console.log(node.id, childNodes, getRectOfNodes(childNodes));
diff --git a/src/store/index.ts b/src/store/index.ts
index 9da0b50c..977ac643 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -38,6 +38,39 @@ const createNodeOrEdgeSelectionChange = (isSelected: boolean) => (item: Node | E
   isSelected,
 });
 
+// @todo needs refactoring / improvements
+function findMatchingNodes(id: string | undefined, nodes: Node[]): Node[] {
+  if (!id) {
+    return nodes.filter((n) => !!n.isSelected);
+  }
+
+  const result = [];
+  const children = [];
+
+  for (let i = 0; i < nodes.length; i++) {
+    const n = nodes[i];
+
+    if (n.id === id) {
+      result.push(n);
+    }
+
+    if (n.parentNode === id) {
+      children.push(n);
+    }
+  }
+
+  for (let i = 0; i < children.length; i++) {
+    const n = children[i];
+    const matches = findMatchingNodes(n.id, nodes);
+
+    for (let j = 0; j < matches.length; j++) {
+      result.push(matches[j]);
+    }
+  }
+
+  return result;
+}
+
 const createStore = () =>
   create<ReactFlowState>((set, get) => ({
     width: 0,
@@ -150,37 +183,13 @@ const createStore = () =>
         return res;
       }, []);
 
-      // const nodesToChange: NodeChange[] = flattenNodes(nodes).reduce((res, node) => {
-      //   const update = updates.find((u) => u.id === node.id);
-      //   if (update) {
-      //     const dimensions = getDimensions(update.nodeElement);
-      //     const doUpdate =
-      //       dimensions.width &&
-      //       dimensions.height &&
-      //       (node.width !== dimensions.width || node.height !== dimensions.height || update.forceUpdate);
-
-      //     if (doUpdate) {
-      //       const handleBounds = getHandleBounds(update.nodeElement, transform[2]);
-      //       const change = {
-      //         id: node.id,
-      //         type: 'dimensions',
-      //         dimensions,
-      //         handleBounds,
-      //       } as NodeChange;
-      //       res.push(change);
-      //     }
-      //   }
-
-      //   return res;
-      // }, initialChanges);
-
       onNodesChange?.(nodesToChange);
     },
     updateNodePosition: ({ id, diff, isDragging }: NodeDiffUpdate) => {
       const { onNodesChange, nodes, nodeExtent } = get();
 
       if (onNodesChange) {
-        const matchingNodes = nodes.filter((n) => n.id === id || n.parentNode === id || !!n.isSelected);
+        const matchingNodes = findMatchingNodes(id, nodes);
 
         if (matchingNodes?.length) {
           onNodesChange(