From ab78dc7de1c9030dcb98e965aa7010158f657464 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Wed, 1 Mar 2023 10:12:25 +0100
Subject: [PATCH] chore(core): cleanup viewport helper

Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com>
---
 packages/core/src/composables/useViewport.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/composables/useViewport.ts b/packages/core/src/composables/useViewport.ts
index 7074ba74..e2e8e547 100644
--- a/packages/core/src/composables/useViewport.ts
+++ b/packages/core/src/composables/useViewport.ts
@@ -23,11 +23,16 @@ const initialViewportHelper: ExtendedViewport = {
 }
 
 export default (state: State, getters: ComputedGetters) => {
-  const { nodes, d3Zoom, d3Selection, dimensions, translateExtent, minZoom, maxZoom, viewport, snapToGrid, snapGrid } = $(state)
+  const { nodes, d3Zoom, d3Selection, dimensions, translateExtent, minZoom, maxZoom, viewport, snapToGrid, snapGrid, hooks } =
+    $(state)
 
   const { getNodes } = $(getters)
 
-  const nodesInitialized = computed(() => nodes.filter((node) => node.initialized).length === nodes.length)
+  const nodesInitialized = ref(false)
+
+  hooks.nodesInitialized.on(() => {
+    nodesInitialized.value = true
+  })
 
   const isReady = computed(() => !!d3Zoom && !!d3Selection && !!dimensions.width && !!dimensions.height && nodesInitialized.value)