From c96f62f62280f8a934537ca3fa179c744f7a2199 Mon Sep 17 00:00:00 2001
From: Braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Sat, 11 Dec 2021 17:17:44 +0100
Subject: [PATCH] refactor(flow)!: properly nest components

Signed-off-by: Braks <78412429+bcakmakoglu@users.noreply.github.com>
---
 examples/CustomNode/ColorSelectorNode.vue     | 14 ++--
 examples/CustomNode/CustomNode.vue            |  6 +-
 examples/EdgeWithButton/ButtonEdge.vue        |  2 +-
 examples/Empty/EmptyExample.vue               |  6 +-
 examples/Stress/StressExample.vue             | 61 +---------------
 examples/Stress/utils.ts                      | 19 ++---
 src/composables/useHandle.ts                  |  2 +-
 src/container/Renderer/Renderer.vue           | 21 +++++-
 src/container/SelectionPane/SelectionPane.vue | 24 ++++++-
 src/container/VueFlow/VueFlow.vue             | 70 ++++++-------------
 src/container/ZoomPane/ZoomPane.vue           | 43 ++++++++----
 src/types/flow.ts                             |  2 +-
 12 files changed, 121 insertions(+), 149 deletions(-)

diff --git a/examples/CustomNode/ColorSelectorNode.vue b/examples/CustomNode/ColorSelectorNode.vue
index a43e567c..a0823f2f 100644
--- a/examples/CustomNode/ColorSelectorNode.vue
+++ b/examples/CustomNode/ColorSelectorNode.vue
@@ -25,13 +25,11 @@ const sourceHandleStyleB: CSSProperties = { ...targetHandleStyle, bottom: '10px'
 const onConnect = (params: Connection | Edge) => console.log('handle onConnect', params)
 </script>
 <template>
-  <div class="vue-flow__node-color-selector">
-    <Handle type="target" :position="Position.Left" :style="targetHandleStyle" :on-connect="onConnect" />
-    <div>
-      Custom Color Picker Node: <strong>{{ data.color }}</strong>
-    </div>
-    <input class="nodrag" type="color" :value="data.color" @input="props.data.onChange" />
-    <Handle id="a" type="source" :position="Position.Right" :style="sourceHandleStyleA" />
-    <Handle id="b" type="source" :position="Position.Right" :style="sourceHandleStyleB" />
+  <Handle type="target" :position="Position.Left" :style="targetHandleStyle" :on-connect="onConnect" />
+  <div>
+    Custom Color Picker Node: <strong>{{ data.color }}</strong>
   </div>
+  <input class="nodrag" type="color" :value="data.color" @input="props.data.onChange" />
+  <Handle id="a" type="source" :position="Position.Right" :style="sourceHandleStyleA" />
+  <Handle id="b" type="source" :position="Position.Right" :style="sourceHandleStyleB" />
 </template>
diff --git a/examples/CustomNode/CustomNode.vue b/examples/CustomNode/CustomNode.vue
index 5400a417..be4a5c82 100644
--- a/examples/CustomNode/CustomNode.vue
+++ b/examples/CustomNode/CustomNode.vue
@@ -63,7 +63,7 @@ onMounted(() => {
     {
       id: '1',
       type: 'input',
-      data: { label: 'An input node' },
+      label: 'An input node',
       position: { x: 0, y: 50 },
       sourcePosition: Position.Right,
     },
@@ -77,14 +77,14 @@ onMounted(() => {
     {
       id: '3',
       type: 'output',
-      data: { label: 'Output A' },
+      label: 'Output A',
       position: { x: 650, y: 25 },
       targetPosition: Position.Left,
     },
     {
       id: '4',
       type: 'output',
-      data: { label: 'Output B' },
+      label: 'Output B',
       position: { x: 650, y: 100 },
       targetPosition: Position.Left,
     },
diff --git a/examples/EdgeWithButton/ButtonEdge.vue b/examples/EdgeWithButton/ButtonEdge.vue
index 879092ea..ef213a4a 100644
--- a/examples/EdgeWithButton/ButtonEdge.vue
+++ b/examples/EdgeWithButton/ButtonEdge.vue
@@ -17,7 +17,7 @@ interface CustomEdgeProps<T = any> extends EdgeProps<T> {
 const props = defineProps<CustomEdgeProps>()
 const store = useVueFlow()
 const onEdgeClick = (evt: Event, id: string) => {
-  const edge = store.getEdges.find((edge) => edge.id === id)
+  const edge = store.getEdge(id)
   if (edge) {
     store.hooks.elementsRemove.trigger([edge])
   }
diff --git a/examples/Empty/EmptyExample.vue b/examples/Empty/EmptyExample.vue
index 5d5ce58a..5bae2491 100644
--- a/examples/Empty/EmptyExample.vue
+++ b/examples/Empty/EmptyExample.vue
@@ -29,10 +29,10 @@ const addRandomNode = () => {
   const nodeId = (elements.value.length + 1).toString()
   const newNode: Node = {
     id: nodeId,
-    data: { label: `Node: ${nodeId}` },
+    label: `Node: ${nodeId}`,
     position: { x: Math.random() * window.innerWidth, y: Math.random() * window.innerHeight },
   } as Node
-  elements.value = [...elements.value, newNode]
+  elements.value.push(newNode)
 }
 </script>
 <template>
@@ -41,7 +41,7 @@ const addRandomNode = () => {
     @load="onLoad"
     @element-click="onElementClick"
     @elements-remove="onElementsRemove"
-    @connect="(p) => onConnect(p)"
+    @connect="onConnect"
     @node-drag-stop="onNodeDragStop"
   >
     <MiniMap />
diff --git a/examples/Stress/StressExample.vue b/examples/Stress/StressExample.vue
index 063ed496..2af47b33 100644
--- a/examples/Stress/StressExample.vue
+++ b/examples/Stress/StressExample.vue
@@ -1,21 +1,6 @@
 <script lang="ts" setup>
-import { CSSProperties } from 'vue'
 import { getElements } from './utils'
-import {
-  VueFlow,
-  removeElements,
-  addEdge,
-  MiniMap,
-  isNode,
-  Controls,
-  Background,
-  FlowInstance,
-  Elements,
-  Connection,
-  Edge,
-} from '~/index'
-
-const buttonWrapperStyles: CSSProperties = { position: 'absolute', right: 10, top: 10, zIndex: 4 }
+import { VueFlow, FlowInstance } from '~/index'
 
 const instance = ref<FlowInstance>()
 const onLoad = (flowInstance: FlowInstance) => {
@@ -24,50 +9,10 @@ const onLoad = (flowInstance: FlowInstance) => {
   console.log(flowInstance.getNodes())
 }
 
-const initialElements: Elements = getElements(50, 20)
-const elements = ref(initialElements)
-
-const onConnect = (params: Connection | Edge) => (elements.value = addEdge(params, elements.value))
-const onElementsRemove = (elementsToRemove: Elements) => (elements.value = removeElements(elementsToRemove, elements.value))
-const updatePos = () => {
-  elements.value = elements.value.map((el) => {
-    if (isNode(el)) {
-      return {
-        ...el,
-        position: {
-          x: Math.random() * window.innerWidth,
-          y: Math.random() * window.innerHeight,
-        },
-      }
-    }
-
-    return el
-  })
-}
-
-const updateElements = () => {
-  const grid = Math.ceil(Math.random() * 10)
-  elements.value = getElements(grid, grid)
-  setTimeout(() => instance.value.fitView({ padding: 0.5 }))
-}
+const { nodes, edges } = getElements(5, 5)
 </script>
 <template>
-  <VueFlow
-    v-model="elements"
-    loading="One moment please..."
-    @load="onLoad"
-    @elementsRemove="onElementsRemove"
-    @connect="onConnect"
-  >
-    <MiniMap />
-    <Controls />
-    <Background />
-
-    <div :style="buttonWrapperStyles">
-      <button style="margin-right: 5px" @click="updatePos">change pos</button>
-      <button @click="updateElements">update elements</button>
-    </div>
-  </VueFlow>
+  <VueFlow :nodes="nodes" :edges="edges" @load="onLoad"> </VueFlow>
 </template>
 <style>
 .fade-enter-active,
diff --git a/examples/Stress/utils.ts b/examples/Stress/utils.ts
index 29965620..3be9447c 100644
--- a/examples/Stress/utils.ts
+++ b/examples/Stress/utils.ts
@@ -1,24 +1,24 @@
-import { Elements } from '~/index'
+import { Edge, Node } from '~/index'
 
-export function getElements(xElements = 10, yElements = 10): Elements {
-  const initialElements = []
+export function getElements(xElements = 10, yElements = 10) {
+  const initialNodes: Node[] = []
+  const initialEdges: Edge[] = []
   let nodeId = 1
   let recentNodeId = null
 
   for (let y = 0; y < yElements; y++) {
     for (let x = 0; x < xElements; x++) {
       const position = { x: x * 100, y: y * 50 }
-      const data = { label: `Node ${nodeId}` }
       const node = {
         id: nodeId.toString(),
         style: { width: 50, fontSize: 11 },
-        data,
+        label: `Node ${nodeId}`,
         position,
       }
-      initialElements.push(node)
+      initialNodes.push(node)
 
       if (recentNodeId && nodeId <= xElements * yElements) {
-        initialElements.push({ id: `${x}-${y}`, source: recentNodeId.toString(), target: nodeId.toString() })
+        initialEdges.push({ id: `${x}-${y}`, source: recentNodeId.toString(), target: nodeId.toString() })
       }
 
       recentNodeId = nodeId
@@ -26,5 +26,8 @@ export function getElements(xElements = 10, yElements = 10): Elements {
     }
   }
 
-  return initialElements
+  return {
+    nodes: initialNodes,
+    edges: initialEdges,
+  }
 }
diff --git a/src/composables/useHandle.ts b/src/composables/useHandle.ts
index 9b89c7db..dbdcc112 100644
--- a/src/composables/useHandle.ts
+++ b/src/composables/useHandle.ts
@@ -85,7 +85,7 @@ export default (store: FlowStore = useStore()) =>
     if (!doc) return
     let validConnectFunc: ValidConnectionFunc = isValidConnection ?? (() => true)
     if (!isValidConnection) {
-      const node = store.getNodes.find((n) => n.id === nodeId)
+      const node = store.getNode(nodeId)
       if (node) validConnectFunc = (!isTarget ? node.isValidTargetPos : node.isValidSourcePos) ?? (() => true)
     }
     const elementBelow = doc.elementFromPoint(event.clientX, event.clientY)
diff --git a/src/container/Renderer/Renderer.vue b/src/container/Renderer/Renderer.vue
index a3d4f17f..154d42e7 100644
--- a/src/container/Renderer/Renderer.vue
+++ b/src/container/Renderer/Renderer.vue
@@ -2,6 +2,7 @@
 import { useStore, useWindow, useZoomPanHelper } from '../../composables'
 import { FlowInstance } from '../../types'
 import { onLoadGetEdges, onLoadGetElements, onLoadGetNodes, onLoadProject, onLoadToObject } from '../../utils'
+import ZoomPane from '../ZoomPane/ZoomPane.vue'
 
 const store = useStore()
 
@@ -36,6 +37,24 @@ export default {
 </script>
 <template>
   <div class="vue-flow__renderer">
-    <slot />
+    <ZoomPane :key="`zoom-pane-${store.id}`">
+      <template
+        v-for="nodeName of Object.keys(store.getNodeTypes)"
+        #[`node-${nodeName}`]="nodeProps"
+        :key="`node-${nodeName}-${store.id}`"
+      >
+        <slot :name="`node-${nodeName}`" v-bind="nodeProps" />
+      </template>
+      <template
+        v-for="edgeName of Object.keys(store.getEdgeTypes)"
+        #[`edge-${edgeName}`]="edgeProps"
+        :key="`edge-${edgeName}-${store.id}`"
+      >
+        <slot :name="`edge-${edgeName}`" v-bind="edgeProps" />
+      </template>
+      <template #custom-connection-line="customConnectionLineProps">
+        <slot name="custom-connection-line" v-bind="customConnectionLineProps" />
+      </template>
+    </ZoomPane>
   </div>
 </template>
diff --git a/src/container/SelectionPane/SelectionPane.vue b/src/container/SelectionPane/SelectionPane.vue
index f5c2e62b..ec6d8d75 100644
--- a/src/container/SelectionPane/SelectionPane.vue
+++ b/src/container/SelectionPane/SelectionPane.vue
@@ -4,6 +4,8 @@ import { useStore, useKeyPress } from '../../composables'
 import { getConnectedEdges } from '../../utils'
 import NodesSelection from '../../components/NodesSelection/NodesSelection.vue'
 import UserSelection from '../../components/UserSelection/UserSelection.vue'
+import NodeRenderer from '../NodeRenderer/NodeRenderer.vue'
+import EdgeRenderer from '../EdgeRenderer/EdgeRenderer.vue'
 
 const store = useStore()
 const userSelection = ref(false)
@@ -49,7 +51,27 @@ export default {
 }
 </script>
 <template>
-  <slot></slot>
+  <NodeRenderer :key="`node-renderer-${store.id}`">
+    <template
+      v-for="nodeName of Object.keys(store.getNodeTypes)"
+      #[`node-${nodeName}`]="nodeProps"
+      :key="`node-${nodeName}-${store.id}`"
+    >
+      <slot :name="`node-${nodeName}`" v-bind="nodeProps" />
+    </template>
+  </NodeRenderer>
+  <EdgeRenderer :key="`edge-renderer-${store.id}`">
+    <template
+      v-for="edgeName of Object.keys(store.getEdgeTypes)"
+      #[`edge-${edgeName}`]="edgeProps"
+      :key="`edge-${edgeName}-${store.id}`"
+    >
+      <slot :name="`edge-${edgeName}`" v-bind="edgeProps" />
+    </template>
+    <template #custom-connection-line="customConnectionLineProps">
+      <slot name="custom-connection-line" v-bind="customConnectionLineProps" />
+    </template>
+  </EdgeRenderer>
   <UserSelection v-if="userSelection" :key="`user-selection-${store.id}`" />
   <NodesSelection v-if="store.nodesSelectionActive" :key="`nodes-selction-${store.id}`" />
   <div :key="`flow-pane-${store.id}`" class="vue-flow__pane" @click="onClick" @contextmenu="onContextMenu" @wheel="onWheel" />
diff --git a/src/container/VueFlow/VueFlow.vue b/src/container/VueFlow/VueFlow.vue
index 9960b7cd..09c074e7 100644
--- a/src/container/VueFlow/VueFlow.vue
+++ b/src/container/VueFlow/VueFlow.vue
@@ -1,10 +1,5 @@
 <script lang="ts" setup>
 import Renderer from '../Renderer/Renderer.vue'
-import ZoomPane from '../ZoomPane/ZoomPane.vue'
-import SelectionPane from '../SelectionPane/SelectionPane.vue'
-import NodeRenderer from '../NodeRenderer/NodeRenderer.vue'
-import EdgeRenderer from '../EdgeRenderer/EdgeRenderer.vue'
-import LoadingIndicator from '../../components/Loading/LoadingIndicator.vue'
 import { createHooks, initFlow } from '../../composables'
 import type { FlowProps } from '../../types/flow'
 
@@ -23,14 +18,13 @@ const props = withDefaults(defineProps<FlowProps>(), {
   panOnScroll: false,
   paneMoveable: true,
 })
-const emit = defineEmits([...Object.keys(createHooks()), 'update:nodes', 'update:edges'])
+const emit = defineEmits([...Object.keys(createHooks()), 'update:nodes', 'update:edges', 'update:elements', 'update:modelValue'])
 const store = initFlow(emit, props.id)
-const { nodes, edges } = useVModels(props, emit)
-store.setState(props)
+nextTick(() => store.setState(props))
 watch(
   () => props,
-  () => store.setState(props),
-  { flush: 'post', deep: true },
+  (v) => nextTick(() => store.setState(v)),
+  { flush: 'sync', deep: true },
 )
 </script>
 <script lang="ts">
@@ -40,47 +34,25 @@ export default {
 </script>
 <template>
   <div class="vue-flow">
-    <Suspense timeout="0">
-      <template #default>
-        <Renderer :key="`renderer-${store.id}`">
-          <ZoomPane :key="`zoom-pane-${store.id}`">
-            <template #default="zoomPaneProps">
-              <SelectionPane :key="`selection-pane-${store.id}`">
-                <NodeRenderer :key="`node-renderer-${store.id}`">
-                  <template
-                    v-for="nodeName of Object.keys(store.getNodeTypes)"
-                    #[`node-${nodeName}`]="nodeProps"
-                    :key="`node-${nodeName}-${store.id}`"
-                  >
-                    <slot :name="`node-${nodeName}`" v-bind="nodeProps" />
-                  </template>
-                </NodeRenderer>
-                <EdgeRenderer :key="`edge-renderer-${store.id}`">
-                  <template
-                    v-for="edgeName of Object.keys(store.getEdgeTypes)"
-                    #[`edge-${edgeName}`]="edgeProps"
-                    :key="`edge-${edgeName}-${store.id}`"
-                  >
-                    <slot :name="`edge-${edgeName}`" v-bind="edgeProps" />
-                  </template>
-                  <template #custom-connection-line="customConnectionLineProps">
-                    <slot name="custom-connection-line" v-bind="customConnectionLineProps" />
-                  </template>
-                </EdgeRenderer>
-              </SelectionPane>
-              <slot name="zoom-pane" v-bind="zoomPaneProps"></slot>
-            </template>
-          </ZoomPane>
-        </Renderer>
+    <Renderer :key="`renderer-${store.id}`">
+      <template
+        v-for="nodeName of Object.keys(store.getNodeTypes)"
+        #[`node-${nodeName}`]="nodeProps"
+        :key="`node-${nodeName}-${store.id}`"
+      >
+        <slot :name="`node-${nodeName}`" v-bind="nodeProps" />
       </template>
-      <template #fallback>
-        <slot name="loading-indicator">
-          <LoadingIndicator v-if="store.loading && store.loading !== '' && !store.isReady" :label="store.loading">
-            <slot name="loading-label" />
-          </LoadingIndicator>
-        </slot>
+      <template
+        v-for="edgeName of Object.keys(store.getEdgeTypes)"
+        #[`edge-${edgeName}`]="edgeProps"
+        :key="`edge-${edgeName}-${store.id}`"
+      >
+        <slot :name="`edge-${edgeName}`" v-bind="edgeProps" />
       </template>
-    </Suspense>
+      <template #custom-connection-line="customConnectionLineProps">
+        <slot name="custom-connection-line" v-bind="customConnectionLineProps" />
+      </template>
+    </Renderer>
     <slot v-bind="store"></slot>
   </div>
 </template>
diff --git a/src/container/ZoomPane/ZoomPane.vue b/src/container/ZoomPane/ZoomPane.vue
index 350c5512..541b9789 100644
--- a/src/container/ZoomPane/ZoomPane.vue
+++ b/src/container/ZoomPane/ZoomPane.vue
@@ -2,8 +2,9 @@
 import { D3ZoomEvent, zoom, zoomIdentity, ZoomTransform } from 'd3-zoom'
 import { pointer, select } from 'd3-selection'
 import { FlowTransform, PanOnScrollMode } from '../../types'
-import { useKeyPress, useStore, useWindow } from '../../composables'
+import { useKeyPress, useStore } from '../../composables'
 import { clamp, clampPosition } from '../../utils'
+import SelectionPane from '../SelectionPane/SelectionPane.vue'
 
 const store = useStore()
 const zoomPaneEl = templateRef<HTMLDivElement>('zoomPane', null)
@@ -30,9 +31,9 @@ const d3Zoom = ref(zoom<HTMLDivElement, any>().scaleExtent([store.minZoom, store
 const d3Selection = ref()
 
 store.transform = [transform.value.x, transform.value.y, transform.value.zoom]
+const { width, height } = useElementBounding(zoomPaneEl)
 
-nextTick(async () => {
-  await until(zoomPaneEl).toBeTruthy()
+onMounted(() => {
   const d3z = d3Zoom.value!
   d3Selection.value = select(zoomPaneEl.value).call(d3z)
   const d3s = d3Selection.value!
@@ -154,20 +155,14 @@ nextTick(async () => {
     // default filter for d3-zoom
     return (!event.ctrlKey || event.type === 'wheel') && !event.button
   })
-})
 
-const { width, height } = useElementBounding(zoomPaneEl)
-
-// skip waiting for ssr
-const window = useWindow()
-if ('screen' in window) await until(() => store.isReady).toBe(true)
-
-nextTick(() => {
   watch(
     [width, height],
     ([newWidth, newHeight]) => {
-      store.dimensions.width = newWidth
-      store.dimensions.height = newHeight
+      nextTick(() => {
+        store.dimensions.width = newWidth
+        store.dimensions.height = newHeight
+      })
     },
     { flush: 'sync', immediate: true },
   )
@@ -175,7 +170,7 @@ nextTick(() => {
     transform,
     (val) => {
       const { x, y } = clampPosition(val, store.translateExtent)
-      store.transform = [x, y, clamp(val.zoom, store.minZoom, store.maxZoom)]
+      nextTick(() => (store.transform = [x, y, clamp(val.zoom, store.minZoom, store.maxZoom)]))
     },
     { flush: 'sync', immediate: true },
   )
@@ -188,6 +183,24 @@ export default {
 </script>
 <template>
   <div ref="zoomPane" class="vue-flow__zoompane">
-    <slot />
+    <SelectionPane :key="`selection-pane-${store.id}`">
+      <template
+        v-for="nodeName of Object.keys(store.getNodeTypes)"
+        #[`node-${nodeName}`]="nodeProps"
+        :key="`node-${nodeName}-${store.id}`"
+      >
+        <slot :name="`node-${nodeName}`" v-bind="nodeProps" />
+      </template>
+      <template
+        v-for="edgeName of Object.keys(store.getEdgeTypes)"
+        #[`edge-${edgeName}`]="edgeProps"
+        :key="`edge-${edgeName}-${store.id}`"
+      >
+        <slot :name="`edge-${edgeName}`" v-bind="edgeProps" />
+      </template>
+      <template #custom-connection-line="customConnectionLineProps">
+        <slot name="custom-connection-line" v-bind="customConnectionLineProps" />
+      </template>
+    </SelectionPane>
   </div>
 </template>
diff --git a/src/types/flow.ts b/src/types/flow.ts
index dbf37501..c78ce945 100644
--- a/src/types/flow.ts
+++ b/src/types/flow.ts
@@ -113,7 +113,7 @@ export type FlowInstance<DataNode = any, DataEdge = DataNode> = {
 }
 
 export interface FlowProps<DataNode = any, DataEdge = DataNode> {
-  modelValue?: any
+  modelValue?: any[]
   nodes?: Node<DataNode>[]
   edges?: Edge<DataEdge>[]
   elements?: Elements