From bb0b9049eaf1aef273d99872c701527824c6a5f0 Mon Sep 17 00:00:00 2001
From: Braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Thu, 25 Nov 2021 14:20:59 +0100
Subject: [PATCH] fix(flow): props not being watched on time

* updated example for UpdateNode

Signed-off-by: Braks <78412429+bcakmakoglu@users.noreply.github.com>
---
 examples/UpdateNode/UpdateNodeExample.vue | 21 ++++++-----
 src/container/VueFlow/VueFlow.vue         | 46 +++++++++++------------
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/examples/UpdateNode/UpdateNodeExample.vue b/examples/UpdateNode/UpdateNodeExample.vue
index c4c4ae88..16787a60 100644
--- a/examples/UpdateNode/UpdateNodeExample.vue
+++ b/examples/UpdateNode/UpdateNodeExample.vue
@@ -10,9 +10,11 @@ const initialElements: Elements = [
 ]
 
 const elements = ref<Elements>(initialElements)
-const nodeName = ref<string>('Node 1')
-const nodeBg = ref<string>('#eee')
-const nodeHidden = ref<boolean>(false)
+const opts = ref({
+  bg: '#eee',
+  name: 'Node 1',
+  hidden: false,
+})
 
 const updateNode = () => {
   elements.value = elements.value.map((el) => {
@@ -20,29 +22,30 @@ const updateNode = () => {
       // it's important that you create a new object here in order to notify react flow about the change
       el.data = {
         ...el.data,
-        label: nodeName.value,
+        label: opts.value.name,
       }
-      el.style = { backgroundColor: nodeBg.value }
-      el.isHidden = nodeHidden.value
+      el.style = { backgroundColor: opts.value.bg }
+      el.isHidden = opts.value.hidden
     }
 
     return el
   })
 }
+
 onMounted(updateNode)
 </script>
 <template>
   <VueFlow v-model="elements" :default-zoom="1.5" :min-zoom="0.2" :max-zoom="4">
     <div class="updatenode__controls">
       <label>label:</label>
-      <input v-model="nodeName" @input="updateNode" />
+      <input v-model="opts.name" @input="updateNode" />
 
       <label class="updatenode__bglabel">background:</label>
-      <input v-model="nodeBg" type="color" @input="updateNode" />
+      <input v-model="opts.bg" type="color" @input="updateNode" />
 
       <div class="updatenode__checkboxwrapper">
         <label>hidden:</label>
-        <input v-model="nodeHidden" type="checkbox" @input="updateNode" />
+        <input v-model="opts.hidden" type="checkbox" @change="updateNode" />
       </div>
     </div>
   </VueFlow>
diff --git a/src/container/VueFlow/VueFlow.vue b/src/container/VueFlow/VueFlow.vue
index bfb5e20b..0c3842d9 100644
--- a/src/container/VueFlow/VueFlow.vue
+++ b/src/container/VueFlow/VueFlow.vue
@@ -108,15 +108,12 @@ const props = withDefaults(defineProps<FlowProps>(), {
 const store = initFlow(emit, typeof props.storageKey === 'string' ? props.storageKey : props.id)
 const elements = useVModel(props, 'modelValue', emit)
 
-// if there are preloaded elements we overwrite the current elements with the stored ones
-if (store.elements.length) elements.value = store.elements
-
 const options = Object.assign({}, store.$state, props)
 
 invoke(async () => {
   store.setState(options)
-  await store.setElements(elements.value)
-  elements.value = store.elements
+  // if there are preloaded elements we overwrite the current elements with the stored ones
+  await store.setElements(store.elements.length ? store.elements : elements.value)
   store.isReady = true
 
   // if ssr we can't wait for dimensions, they'll never really exist
@@ -137,27 +134,28 @@ invoke(async () => {
   }
   store.hooks.load.trigger(instance)
   store.instance = instance
-  watch(
-    () => props,
-    () => store.setState(props),
-    { flush: 'post', deep: true },
-  )
-  watch(
-    () => props.modelValue.length,
-    () => store.setElements(elements.value),
-  )
-  const { pause, resume } = pausableWatch(elements, store.setElements, { flush: 'post' })
-  watch(
-    () => store.elements,
-    (val) => {
-      pause()
-      elements.value = val
-      nextTick(resume)
-    },
-    { flush: 'post', deep: true },
-  )
 })
 
+watch(
+  () => props,
+  () => store.setState(props),
+  { flush: 'post', deep: true },
+)
+watch(
+  () => props.modelValue.length,
+  () => store.setElements(elements.value),
+)
+const { pause, resume } = pausableWatch(elements, store.setElements, { flush: 'post' })
+watch(
+  () => store.elements,
+  (val) => {
+    pause()
+    elements.value = val
+    nextTick(resume)
+  },
+  { flush: 'post', deep: true },
+)
+
 const transitionName = computed(() => {
   let name = ''
   if (typeof store.loading === 'object' && store.loading.transition) {