From 9bca73d76251d89918dc2a69d47c60aeae6e3233 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Mon, 18 Jul 2022 19:35:37 +0200
Subject: [PATCH] fix(nodes): remove child nodes when parent gets removed

---
 .../container/SelectionPane/SelectionPane.vue | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/packages/vue-flow/src/container/SelectionPane/SelectionPane.vue b/packages/vue-flow/src/container/SelectionPane/SelectionPane.vue
index c8b48dd8..56f08b18 100644
--- a/packages/vue-flow/src/container/SelectionPane/SelectionPane.vue
+++ b/packages/vue-flow/src/container/SelectionPane/SelectionPane.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { EdgeChange, NodeChange } from '../../types'
+import type { EdgeChange, GraphNode, NodeChange } from '../../types'
 import { useKeyPress, useVueFlow } from '../../composables'
 import { getConnectedEdges } from '../../utils'
 import { NodesSelection, UserSelection } from '../../components'
@@ -18,6 +18,9 @@ const {
   setState,
   getSelectedEdges,
   getSelectedNodes,
+  getNodes,
+  removeNodes,
+  removeEdges,
 } = $(useVueFlow())
 
 const onClick = (event: MouseEvent) => {
@@ -33,19 +36,26 @@ const onContextMenu = (event: MouseEvent) => emits.paneContextMenu(event)
 const onWheel = (event: WheelEvent) => emits.paneScroll(event)
 
 useKeyPress($$(deleteKeyCode), (keyPressed) => {
-  const selectedNodes = getSelectedNodes
-  const selectedEdges = getSelectedEdges
-  if (keyPressed && (selectedNodes || selectedEdges)) {
-    const connectedEdges = (selectedNodes && getConnectedEdges(selectedNodes, edges)) ?? []
+  const nodesToRemove = getNodes.reduce<GraphNode[]>((res, node) => {
+    if (!node.selected && node.parentNode && res.find((n) => n.id === node.parentNode)) {
+      res.push(node)
+    } else if (node.selected) {
+      res.push(node)
+    }
 
-    const nodeChanges: NodeChange[] = selectedNodes.map((n) => ({ id: n.id, type: 'remove' }))
-    const edgeChanges: EdgeChange[] = [...selectedEdges, ...connectedEdges].map((e) => ({
-      id: e.id,
-      type: 'remove',
-    }))
+    return res
+  }, [])
 
-    emits.nodesChange(nodeChanges)
-    emits.edgesChange(edgeChanges)
+  const selectedEdges = edges.filter((e) => e.selected)
+
+  if (keyPressed && (nodesToRemove || selectedEdges)) {
+    if (selectedEdges.length > 0) {
+      removeEdges(selectedEdges)
+    }
+
+    if (nodesToRemove.length > 0) {
+      removeNodes(nodesToRemove)
+    }
 
     setState({
       nodesSelectionActive: false,