From 12c9e4e07b2aeed6f617fc03967ae5390442ecff Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Tue, 20 Dec 2022 00:13:41 +0100
Subject: [PATCH] chore(core,nodes): remove mounted hook for initial clamp

Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com>
---
 .../core/src/components/Nodes/NodeWrapper.vue | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/packages/core/src/components/Nodes/NodeWrapper.vue b/packages/core/src/components/Nodes/NodeWrapper.vue
index 3c6a7e50..e3fba6ba 100644
--- a/packages/core/src/components/Nodes/NodeWrapper.vue
+++ b/packages/core/src/components/Nodes/NodeWrapper.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { isNumber } from '@vueuse/core'
+import type { ReactiveVariable } from 'vue/macros'
 import type { GraphNode, HandleConnectable, NodeComponent, SnapGrid, XYZPosition } from '../../types'
 import { ARIA_NODE_DESC_KEY } from '../../utils/a11y'
 
@@ -42,7 +43,7 @@ const {
 
 const updateNodePositions = useUpdateNodePositions()
 
-const node = $(useVModel(props, 'node'))
+const node: ReactiveVariable<GraphNode> = $(useVModel(props, 'node'))
 
 const parentNode = $computed(() => (node.parentNode ? getNode(node.parentNode) : undefined))
 
@@ -50,8 +51,6 @@ const connectedEdges = $computed(() => getConnectedEdges([node], edges))
 
 const nodeElement = ref()
 
-const initialized = ref(false)
-
 provide(NodeRef, nodeElement)
 
 const { emit, on } = useNodeHooks(node, emits)
@@ -129,7 +128,7 @@ watch(
 
     updatePosition(xyzPos, parentX && parentY ? { x: parentX, y: parentY, z: parentZ || 0 } : undefined)
   },
-  { flush: 'post', immediate: true },
+  { flush: 'pre', immediate: true },
 )
 
 function updatePosition(nodePos: XYZPosition, parentPos?: XYZPosition) {
@@ -142,19 +141,13 @@ function updatePosition(nodePos: XYZPosition, parentPos?: XYZPosition) {
   node.computedPosition = nextPos
 }
 
-onNodesInitialized(() => {
-  initialized.value = true
-})
+until(() => node.initialized)
+  .toBe(true)
+  .then(() => {
+    const { position } = calcNextPosition(node, node.computedPosition, nodeExtent, parentNode)
 
-onMounted(() => {
-  until(initialized)
-    .toBe(true)
-    .then(() => {
-      const { position } = calcNextPosition(node, node.computedPosition, nodeExtent, parentNode)
-
-      node.computedPosition = { ...node.computedPosition, ...position }
-    })
-})
+    node.computedPosition = { ...node.computedPosition, ...position }
+  })
 
 function updateInternals() {
   if (nodeElement.value) updateNodeDimensions([{ id, nodeElement: nodeElement.value, forceUpdate: true }])