From 943479e2c78e4a76824f98693c2c132fb6c4f47d Mon Sep 17 00:00:00 2001
From: Braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Sat, 11 Dec 2021 23:58:14 +0100
Subject: [PATCH] refactor(zoom): Remove renderer and move logic to zoom pane

Signed-off-by: Braks <78412429+bcakmakoglu@users.noreply.github.com>
---
 src/container/Renderer/Renderer.vue | 60 -----------------------------
 src/container/VueFlow/VueFlow.vue   |  6 +--
 src/container/ZoomPane/ZoomPane.vue | 51 ++++++++++++++++++++----
 3 files changed, 46 insertions(+), 71 deletions(-)
 delete mode 100644 src/container/Renderer/Renderer.vue

diff --git a/src/container/Renderer/Renderer.vue b/src/container/Renderer/Renderer.vue
deleted file mode 100644
index 154d42e7..00000000
--- a/src/container/Renderer/Renderer.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<script lang="ts" setup>
-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()
-
-nextTick(async () => {
-  store.isReady = true
-  // if ssr we can't wait for dimensions, they'll never really exist
-  const window = useWindow()
-  if ('screen' in window)
-    await until(store.dimensions).toMatch(({ height, width }) => !isNaN(width) && width > 0 && !isNaN(height) && height > 0)
-
-  const { zoomIn, zoomOut, zoomTo, transform: setTransform, fitView } = useZoomPanHelper(store)
-  const instance: FlowInstance = {
-    fitView: (params = { padding: 0.1 }) => fitView(params),
-    zoomIn,
-    zoomOut,
-    zoomTo,
-    setTransform,
-    project: onLoadProject(store),
-    getElements: onLoadGetElements(store),
-    getNodes: onLoadGetNodes(store),
-    getEdges: onLoadGetEdges(store),
-    toObject: onLoadToObject(store),
-  }
-  store.hooks.load.trigger(instance)
-  store.instance = instance
-})
-</script>
-<script lang="ts">
-export default {
-  name: 'Renderer',
-}
-</script>
-<template>
-  <div class="vue-flow__renderer">
-    <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/VueFlow/VueFlow.vue b/src/container/VueFlow/VueFlow.vue
index 09c074e7..a894656b 100644
--- a/src/container/VueFlow/VueFlow.vue
+++ b/src/container/VueFlow/VueFlow.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import Renderer from '../Renderer/Renderer.vue'
 import { createHooks, initFlow } from '../../composables'
 import type { FlowProps } from '../../types/flow'
+import ZoomPane from '../ZoomPane/ZoomPane.vue'
 
 const props = withDefaults(defineProps<FlowProps>(), {
   snapToGrid: false,
@@ -34,7 +34,7 @@ export default {
 </script>
 <template>
   <div class="vue-flow">
-    <Renderer :key="`renderer-${store.id}`">
+    <ZoomPane :key="`renderer-${store.id}`">
       <template
         v-for="nodeName of Object.keys(store.getNodeTypes)"
         #[`node-${nodeName}`]="nodeProps"
@@ -52,7 +52,7 @@ export default {
       <template #custom-connection-line="customConnectionLineProps">
         <slot name="custom-connection-line" v-bind="customConnectionLineProps" />
       </template>
-    </Renderer>
+    </ZoomPane>
     <slot v-bind="store"></slot>
   </div>
 </template>
diff --git a/src/container/ZoomPane/ZoomPane.vue b/src/container/ZoomPane/ZoomPane.vue
index 541b9789..fb92c494 100644
--- a/src/container/ZoomPane/ZoomPane.vue
+++ b/src/container/ZoomPane/ZoomPane.vue
@@ -1,10 +1,19 @@
 <script lang="ts" setup>
 import { D3ZoomEvent, zoom, zoomIdentity, ZoomTransform } from 'd3-zoom'
 import { pointer, select } from 'd3-selection'
-import { FlowTransform, PanOnScrollMode } from '../../types'
-import { useKeyPress, useStore } from '../../composables'
-import { clamp, clampPosition } from '../../utils'
+import { FlowInstance, FlowTransform, PanOnScrollMode } from '../../types'
+import { useKeyPress, useStore, useWindow, useZoomPanHelper } from '../../composables'
+import {
+  clamp,
+  clampPosition,
+  onLoadGetEdges,
+  onLoadGetElements,
+  onLoadGetNodes,
+  onLoadProject,
+  onLoadToObject,
+} from '../../utils'
 import SelectionPane from '../SelectionPane/SelectionPane.vue'
+import TransformationPane from '~/container/TransformationPane/TransformationPane.vue'
 
 const store = useStore()
 const zoomPaneEl = templateRef<HTMLDivElement>('zoomPane', null)
@@ -41,7 +50,9 @@ onMounted(() => {
 
   const updatedTransform = zoomIdentity.translate(transform.value.x, transform.value.y).scale(transform.value.zoom)
   d3z.transform(d3s, updatedTransform)
-  store.initD3Zoom({ d3Zoom: d3z, d3Selection: d3s, d3ZoomHandler })
+  store.d3Zoom = d3z
+  store.d3Selection = d3s
+  store.d3ZoomHandler = d3ZoomHandler
   store.transform = [updatedTransform.x, updatedTransform.y, updatedTransform.k]
 
   d3z.on('start', (event: D3ZoomEvent<HTMLDivElement, any>) => {
@@ -172,9 +183,32 @@ onMounted(() => {
       const { x, y } = clampPosition(val, store.translateExtent)
       nextTick(() => (store.transform = [x, y, clamp(val.zoom, store.minZoom, store.maxZoom)]))
     },
-    { flush: 'sync', immediate: true },
+    { flush: 'pre', immediate: true },
   )
 })
+nextTick(async () => {
+  store.isReady = true
+  // if ssr we can't wait for dimensions, they'll never really exist
+  const window = useWindow()
+  if ('screen' in window)
+    await until(store.dimensions).toMatch(({ height, width }) => !isNaN(width) && width > 0 && !isNaN(height) && height > 0)
+
+  const { zoomIn, zoomOut, zoomTo, transform: setTransform, fitView } = useZoomPanHelper(store)
+  const instance: FlowInstance = {
+    fitView: (params = { padding: 0.1 }) => fitView(params),
+    zoomIn,
+    zoomOut,
+    zoomTo,
+    setTransform,
+    project: onLoadProject(store),
+    getElements: onLoadGetElements(store),
+    getNodes: onLoadGetNodes(store),
+    getEdges: onLoadGetEdges(store),
+    toObject: onLoadToObject(store),
+  }
+  store.hooks.load.trigger(instance)
+  store.instance = instance
+})
 </script>
 <script lang="ts">
 export default {
@@ -182,8 +216,8 @@ export default {
 }
 </script>
 <template>
-  <div ref="zoomPane" class="vue-flow__zoompane">
-    <SelectionPane :key="`selection-pane-${store.id}`">
+  <div ref="zoomPane" class="vue-flow__renderer vue-flow__container">
+    <TransformationPane>
       <template
         v-for="nodeName of Object.keys(store.getNodeTypes)"
         #[`node-${nodeName}`]="nodeProps"
@@ -201,6 +235,7 @@ export default {
       <template #custom-connection-line="customConnectionLineProps">
         <slot name="custom-connection-line" v-bind="customConnectionLineProps" />
       </template>
-    </SelectionPane>
+    </TransformationPane>
+    <SelectionPane :key="`selection-pane-${store.id}`" />
   </div>
 </template>