From 3d65627de57249d976a74b744371788c62a5b304 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Mon, 6 Feb 2023 14:02:46 +0100
Subject: [PATCH] chore(core): cleanup node filter fn

---
 packages/core/src/store/utils.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/store/utils.ts b/packages/core/src/store/utils.ts
index d7944141..0023db71 100644
--- a/packages/core/src/store/utils.ts
+++ b/packages/core/src/store/utils.ts
@@ -141,11 +141,16 @@ export function fitView(get: StoreApi<ReactFlowState>['getState'], options: Inte
 
   if ((options.initial && !fitViewOnInitDone && fitViewOnInit) || !options.initial) {
     if (d3Zoom && d3Selection) {
-      let nodes: Node[] = getNodes().filter((n) => (options.includeHiddenNodes ? n.width && n.height : !n.hidden));
+      const nodes = getNodes().filter((n) => {
+        const isVisible = (options.includeHiddenNodes ? n.width && n.height : !n.hidden);
+        let shouldInclude = true;
 
-      if (options.nodes?.length) {
-        nodes = nodes.filter((n) => options.nodes?.includes(n.id))
-      }
+        if (options.nodes?.length) {
+          shouldInclude = options.nodes.includes(n.id);
+        }
+
+        return isVisible && shouldInclude;
+      });
 
       const nodesInitialized = nodes.every((n) => n.width && n.height);