From c3fb3cd10a25575eee2db813fb683ba880cee7fe Mon Sep 17 00:00:00 2001
From: Braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Tue, 19 Oct 2021 20:09:43 +0200
Subject: [PATCH] fix: zoom pan helper

---
 examples/Basic/Basic.vue                      |  8 +-
 .../CustomConnectionLine.vue                  |  2 +-
 examples/CustomNode/CustomNode.vue            | 10 +--
 examples/EdgeWithButton/ButtonEdge.vue        | 16 +---
 examples/Superflow/Superflow.vue              | 20 -----
 examples/router.ts                            |  4 -
 .../Background/Background.vue                 | 35 ++++++--
 .../Controls/Controls.vue                     | 19 ++--
 src/additional-components/MiniMap/MiniMap.vue |  5 +-
 .../MiniMap/MiniMapNode.vue                   |  8 +-
 .../ConnectionLine/ConnectionLine.vue         |  2 +-
 src/components/Edges/Edge.vue                 |  2 +-
 src/components/Handle/Handle.vue              |  2 +-
 src/components/Handle/utils.ts                | 15 ++--
 src/components/Nodes/Node.vue                 |  2 +-
 .../NodesSelection/NodesSelection.vue         |  2 +-
 .../UserSelection/UserSelection.vue           |  2 +-
 src/composables/index.ts                      |  7 ++
 .../useGlobalKeyHandler.ts                    |  2 +-
 .../useHooks.ts}                              |  2 +-
 src/{hooks => composables}/useKeyPress.ts     |  0
 .../useResizeHandler.ts                       |  0
 .../useUpdateNodeInternals.ts                 |  0
 src/composables/useZoom.ts                    | 46 +++-------
 src/composables/useZoomPanHelper.ts           | 62 +++++++++++++
 src/container/EdgeRenderer/EdgeRenderer.vue   |  2 +-
 src/container/Flow/Flow.vue                   |  4 +-
 src/container/NodeRenderer/NodeRenderer.vue   |  2 +-
 src/container/SelectionPane/SelectionPane.vue |  6 +-
 src/container/ZoomPane/ZoomPane.vue           | 35 ++++----
 src/context/{symbols.ts => index.ts}          |  1 +
 src/hooks/useZoomPanHelper.ts                 | 90 -------------------
 src/index.ts                                  |  5 +-
 src/store/index.ts                            |  4 +-
 src/types/panel.ts                            |  2 +-
 src/utils/graph.ts                            | 35 ++++++--
 src/utils/index.ts                            | 25 +-----
 src/utils/symbols.ts                          |  7 --
 38 files changed, 214 insertions(+), 277 deletions(-)
 delete mode 100644 examples/Superflow/Superflow.vue
 create mode 100644 src/composables/index.ts
 rename src/{hooks => composables}/useGlobalKeyHandler.ts (96%)
 rename src/{hooks/RevueFlowHooks.ts => composables/useHooks.ts} (96%)
 rename src/{hooks => composables}/useKeyPress.ts (100%)
 rename src/{hooks => composables}/useResizeHandler.ts (100%)
 rename src/{hooks => composables}/useUpdateNodeInternals.ts (100%)
 create mode 100644 src/composables/useZoomPanHelper.ts
 rename src/context/{symbols.ts => index.ts} (72%)
 delete mode 100644 src/hooks/useZoomPanHelper.ts
 delete mode 100644 src/utils/symbols.ts

diff --git a/examples/Basic/Basic.vue b/examples/Basic/Basic.vue
index 6be7e039..1bd1bfb7 100644
--- a/examples/Basic/Basic.vue
+++ b/examples/Basic/Basic.vue
@@ -60,13 +60,13 @@ const toggleClassnames = () => {
   <Flow
     class="revue-flow-basic-example"
     :elements="elements"
-    :on-elements-remove="onElementsRemove"
-    :on-connect="onConnect"
-    :on-node-drag-stop="onNodeDragStop"
-    :on-node-click="onElementClick"
     :default-zoom="1.5"
     :min-zoom="0.2"
     :max-zoom="4"
+    @elements-remove="onElementsRemove"
+    @connect="onConnect"
+    @node-drag-stop="onNodeDragStop"
+    @node-click="onElementClick"
     @elementClick="onElementClick"
     @load="onLoad"
   >
diff --git a/examples/CustomConnectionLine/CustomConnectionLine.vue b/examples/CustomConnectionLine/CustomConnectionLine.vue
index 064d4ead..f604c060 100644
--- a/examples/CustomConnectionLine/CustomConnectionLine.vue
+++ b/examples/CustomConnectionLine/CustomConnectionLine.vue
@@ -15,7 +15,7 @@ const onElementsRemove = (elementsToRemove: Elements) =>
 const onConnect = (params: Connection | Edge) => (elements.value = addEdge(params, elements.value as Elements))
 </script>
 <template>
-  <Flow :elements="elements" :custom-connection-line="ConnectionLine" @elementsRemove="onElementsRemove" @connect="onConnect">
+  <Flow :elements="elements" :custom-connection-line="ConnectionLine" @elements-remove="onElementsRemove" @connect="onConnect">
     <Background :variant="BackgroundVariant.Lines" />
   </Flow>
 </template>
diff --git a/examples/CustomNode/CustomNode.vue b/examples/CustomNode/CustomNode.vue
index beb69089..9f21d969 100644
--- a/examples/CustomNode/CustomNode.vue
+++ b/examples/CustomNode/CustomNode.vue
@@ -114,17 +114,17 @@ const onConnect = (params: Connection | Edge) =>
 <template>
   <Flow
     :elements="elements"
-    :on-element-click="onElementClick"
-    :on-elements-remove="onElementsRemove"
-    :on-connect="onConnect"
-    :on-node-drag-stop="onNodeDragStop"
     :style="`background: ${bgColor}`"
-    :on-load="onLoad"
     :node-types="nodeTypes"
     :connection-line-style="connectionLineStyle"
     :snap-to-grid="true"
     :snap-grid="snapGrid"
     :default-zoom="1.5"
+    @element-click="onElementClick"
+    @elements-remove="onElementsRemove"
+    @connect="onConnect"
+    @node-drag-stop="onNodeDragStop"
+    @load="onLoad"
   >
     <MiniMap :node-stroke-color="nodeStroke" :node-color="nodeColor" />
     <Controls />
diff --git a/examples/EdgeWithButton/ButtonEdge.vue b/examples/EdgeWithButton/ButtonEdge.vue
index c119bfd7..04e2b8df 100644
--- a/examples/EdgeWithButton/ButtonEdge.vue
+++ b/examples/EdgeWithButton/ButtonEdge.vue
@@ -1,15 +1,5 @@
 <script lang="ts" setup>
-import { RevueFlowHooks } from '~/hooks/RevueFlowHooks'
-import {
-  getEdgeCenter,
-  getBezierPath,
-  getMarkerEnd,
-  ArrowHeadType,
-  EdgeProps,
-  ElementId,
-  Position,
-  RevueFlowStore,
-} from '~/index'
+import { getEdgeCenter, getBezierPath, getMarkerEnd, ArrowHeadType, EdgeProps, ElementId, Position, Hooks, Store } from '~/index'
 
 interface CustomEdgeProps<T = any> extends EdgeProps<T> {
   id: ElementId
@@ -25,8 +15,8 @@ interface CustomEdgeProps<T = any> extends EdgeProps<T> {
 }
 
 const props = defineProps<CustomEdgeProps>()
-const store = inject<RevueFlowStore>('store')!
-const hooks = inject<RevueFlowHooks>('hooks')!
+const store = inject(Store)!
+const hooks = inject(Hooks)!
 const onEdgeClick = (evt: Event, id: string) => {
   const edge = store.edges.find((edge) => edge.id === id)
   if (edge) {
diff --git a/examples/Superflow/Superflow.vue b/examples/Superflow/Superflow.vue
deleted file mode 100644
index 40579be7..00000000
--- a/examples/Superflow/Superflow.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<script lang="ts" setup>
-import { ref } from 'vue'
-import Flowy from '~/container/Flow/Flow.vue'
-import { Elements } from '~/types'
-
-const elements = ref<Elements>([
-  { id: '1', type: 'input', data: { label: 'Node 1' }, position: { x: 250, y: 5 } },
-  { id: '2', data: { label: 'Node 2' }, position: { x: 100, y: 100 } },
-  { id: '3', data: { label: 'Node 3' }, position: { x: 400, y: 100 } },
-  { id: '4', data: { label: 'Node 4' }, position: { x: 400, y: 200 } },
-  { id: 'e1-2', source: '1', target: '2', animated: true },
-  { id: 'e1-3', source: '1', target: '3' },
-] as Elements)
-</script>
-
-<template>
-  <Flowy :elements="elements">
-    <div>Foobar!</div>
-  </Flowy>
-</template>
diff --git a/examples/router.ts b/examples/router.ts
index 45f1215c..966b7646 100644
--- a/examples/router.ts
+++ b/examples/router.ts
@@ -45,10 +45,6 @@ export const routes: RouterOptions['routes'] = [
     path: '/interaction',
     component: () => import('./Interaction/InteractionExample.vue'),
   },
-  {
-    path: '/super-flow',
-    component: () => import('./Superflow/Superflow.vue'),
-  },
 ]
 
 export const router = createRouter({
diff --git a/src/additional-components/Background/Background.vue b/src/additional-components/Background/Background.vue
index e422c8cf..aa1b7bf3 100644
--- a/src/additional-components/Background/Background.vue
+++ b/src/additional-components/Background/Background.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { HTMLAttributes } from 'vue'
-import { BackgroundVariant, RevueFlowStore } from '~/types'
+import { BackgroundVariant } from '~/types'
+import { Store } from '~/context'
 
 export interface BackgroundProps extends HTMLAttributes {
   variant?: BackgroundVariant
@@ -20,14 +21,23 @@ const defaultColors: Record<BackgroundVariant, string> = {
   [BackgroundVariant.Lines]: '#eee',
 }
 
-const store = inject<RevueFlowStore>('store')!
+const store = inject(Store)!
 // when there are multiple flows on a page we need to make sure that every background gets its own pattern.
 
 const bgClasses = ['revue-flow__background']
-const scaledGap = computed(() => props.gap && props.gap * store.transform[2])
-const xOffset = computed(() => scaledGap.value && store.transform[0] % scaledGap.value)
-const yOffset = computed(() => scaledGap.value && store.transform[1] % scaledGap.value)
-const size = computed(() => props.size || 0.4 * store.transform[2])
+const background = computed(() => {
+  const scaledGap = props.gap && props.gap * store.transform[2]
+  const xOffset = scaledGap && store.transform[0] % scaledGap
+  const yOffset = scaledGap && store.transform[1] % scaledGap
+  const size = props.size || 0.4 * store.transform[2]
+
+  return {
+    scaledGap,
+    xOffset,
+    yOffset,
+    size,
+  }
+})
 
 const isLines = props.variant === BackgroundVariant.Lines
 const bgColor = props.color ? props.color : defaultColors[props.variant || BackgroundVariant.Dots]
@@ -41,16 +51,23 @@ const patternId = `pattern-${Math.floor(Math.random() * 100000)}`
       height: '100%',
     }"
   >
-    <pattern :id="patternId" :x="xOffset" :y="yOffset" :width="scaledGap" :height="scaledGap" patternUnits="userSpaceOnUse">
+    <pattern
+      :id="patternId"
+      :x="background.xOffset"
+      :y="background.yOffset"
+      :width="background.scaledGap"
+      :height="background.scaledGap"
+      patternUnits="userSpaceOnUse"
+    >
       <template v-if="isLines">
         <path
           :stroke="bgColor"
           :stroke-width="props.size"
-          :d="`M${scaledGap / 2} 0 V${scaledGap} M0 ${scaledGap / 2} H${scaledGap}`"
+          :d="`M${background.scaledGap / 2} 0 V${background.scaledGap} M0 ${background.scaledGap / 2} H${background.scaledGap}`"
         />
       </template>
       <template v-else>
-        <circle :cx="size" :cy="size" :r="size" :fill="bgColor" />
+        <circle :cx="background.size" :cy="background.size" :r="background.size" :fill="bgColor" />
       </template>
     </pattern>
     <rect x="0" y="0" width="100%" height="100%" :fill="`url(#${patternId})`" />
diff --git a/src/additional-components/Controls/Controls.vue b/src/additional-components/Controls/Controls.vue
index e5591d25..199af9ec 100644
--- a/src/additional-components/Controls/Controls.vue
+++ b/src/additional-components/Controls/Controls.vue
@@ -6,8 +6,9 @@ import MinusIcon from '@/assets/icons/minus.svg'
 import Fitview from '@/assets/icons/fitview.svg'
 import Lock from '@/assets/icons/lock.svg'
 import Unlock from '@/assets/icons/unlock.svg'
-import { FitViewParams, RevueFlowStore, ZoomPanHelperFunctions } from '~/types'
-import useZoomPanHelper from '~/hooks/useZoomPanHelper'
+import { FitViewParams } from '~/types'
+import useZoomPanHelper from '~/composables/useZoomPanHelper'
+import { Store } from '~/context'
 
 export interface ControlProps extends HTMLAttributes {
   showZoom?: boolean
@@ -26,25 +27,24 @@ const props = withDefaults(defineProps<ControlProps>(), {
   showInteractive: true,
 })
 
-const store = inject<RevueFlowStore>('store')!
-// const { onReady } = useZoomPanHelper()
+const store = inject(Store)!
+const { zoomIn, zoomOut, fitView } = useZoomPanHelper()
 
 const isInteractive = store.nodesDraggable && store.nodesConnectable && store.elementsSelectable
 const mapClasses = ['revue-flow__controls']
 
-/*
-* const onZoomInHandler = () => {
-  zoomHelper.value?.zoomIn?.()
+const onZoomInHandler = () => {
+  zoomIn?.()
   props.onZoomIn?.()
 }
 
 const onZoomOutHandler = () => {
-  zoomHelper.value?.zoomOut?.()
+  zoomOut?.()
   props.onZoomOut?.()
 }
 
 const onFitViewHandler = () => {
-  zoomHelper.value?.fitView?.(props.fitViewParams)
+  fitView?.(props.fitViewParams)
   props.onFitView?.()
 }
 
@@ -52,7 +52,6 @@ const onInteractiveChangeHandler = () => {
   store.setInteractive?.(!isInteractive)
   props.onInteractiveChange?.(!isInteractive)
 }
-*/
 </script>
 <template>
   <div :class="mapClasses">
diff --git a/src/additional-components/MiniMap/MiniMap.vue b/src/additional-components/MiniMap/MiniMap.vue
index 7703f19a..d71ac215 100644
--- a/src/additional-components/MiniMap/MiniMap.vue
+++ b/src/additional-components/MiniMap/MiniMap.vue
@@ -2,7 +2,8 @@
 import { HTMLAttributes } from 'vue'
 import MiniMapNode from './MiniMapNode.vue'
 import { getBoundsofRects, getRectOfNodes } from '~/utils/graph'
-import { Node, RevueFlowStore } from '~/types'
+import { Node } from '~/types'
+import { Store } from '~/context'
 
 type StringFunc = (node: Node) => string
 
@@ -30,7 +31,7 @@ declare const window: any
 const defaultWidth = 200
 const defaultHeight = 150
 
-const store = inject<RevueFlowStore>('store')!
+const store = inject(Store)!
 
 const elementWidth = attrs.style?.width ?? defaultWidth
 const elementHeight = attrs.style?.height ?? defaultHeight
diff --git a/src/additional-components/MiniMap/MiniMapNode.vue b/src/additional-components/MiniMap/MiniMapNode.vue
index 94648a56..716d844f 100644
--- a/src/additional-components/MiniMap/MiniMapNode.vue
+++ b/src/additional-components/MiniMap/MiniMapNode.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, CSSProperties } from 'vue'
+import { CSSProperties } from 'vue'
 
 interface MiniMapNodeProps {
   x?: number
@@ -8,11 +8,13 @@ interface MiniMapNodeProps {
   height?: number
   borderRadius?: number
   color?: string
-  shapeRendering?: string
+  shapeRendering?: 'auto' | 'optimizeSpeed' | 'crispEdges' | 'geometricPrecision' | 'inherit'
   strokeColor?: string
   strokeWidth?: number
 }
-const props = defineProps<MiniMapNodeProps>()
+const props = withDefaults(defineProps<MiniMapNodeProps>(), {
+  shapeRendering: 'geometricPrecision',
+})
 const attrs = useAttrs()
 
 const styles = (attrs.style ?? {}) as CSSProperties
diff --git a/src/components/ConnectionLine/ConnectionLine.vue b/src/components/ConnectionLine/ConnectionLine.vue
index fe3819a8..43ffda67 100644
--- a/src/components/ConnectionLine/ConnectionLine.vue
+++ b/src/components/ConnectionLine/ConnectionLine.vue
@@ -2,7 +2,7 @@
 import { CSSProperties } from 'vue'
 import { ConnectionLineType, CustomConnectionLine, HandleElement, Node, Position } from '~/types'
 import { getBezierPath, getSmoothStepPath } from '~/components/Edges/utils'
-import { Hooks, Store } from '~/context/symbols'
+import { Hooks, Store } from '~/context'
 
 interface ConnectionLineProps {
   sourceNode: Node
diff --git a/src/components/Edges/Edge.vue b/src/components/Edges/Edge.vue
index 8a5aae8b..5e7e61bc 100644
--- a/src/components/Edges/Edge.vue
+++ b/src/components/Edges/Edge.vue
@@ -4,7 +4,7 @@ import { getEdgePositions, getHandle, getSourceTargetNodes, isEdgeVisible } from
 import { isEdge } from '~/utils/graph'
 import { ConnectionMode, Dimensions, Edge, EdgeType, Elements, Position, Transform } from '~/types'
 import { onMouseDown } from '~/components/Handle/utils'
-import { Hooks, Store } from '~/context/symbols'
+import { Hooks, Store } from '~/context'
 
 interface EdgeProps {
   type: EdgeType
diff --git a/src/components/Handle/Handle.vue b/src/components/Handle/Handle.vue
index d58aaf2d..548fffe2 100644
--- a/src/components/Handle/Handle.vue
+++ b/src/components/Handle/Handle.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { ElementId, Position } from '~/types'
 import { onMouseDown, ValidConnectionFunc } from '~/components/Handle/utils'
-import { Hooks, Store } from '~/context/symbols'
+import { Hooks, Store } from '~/context'
 
 interface HandleProps {
   id?: string
diff --git a/src/components/Handle/utils.ts b/src/components/Handle/utils.ts
index ad66243e..e70726f1 100644
--- a/src/components/Handle/utils.ts
+++ b/src/components/Handle/utils.ts
@@ -1,6 +1,5 @@
 import { getHostForElement } from '~/utils'
-import { ElementId, ConnectionMode, Connection, HandleType, RevueFlowStore } from '~/types'
-import { RevueFlowHooks } from '~/hooks/RevueFlowHooks'
+import { ElementId, ConnectionMode, Connection, HandleType, FlowStore, FlowHooks } from '~/types'
 
 export type ValidConnectionFunc = (connection: Connection) => boolean
 
@@ -71,13 +70,13 @@ function resetRecentHandle(hoveredHandle: Element): void {
 
 export function onMouseDown(
   event: MouseEvent,
-  store: RevueFlowStore,
+  store: FlowStore,
   hooks: {
-    connectStart: RevueFlowHooks['connectStart']
-    connectStop: RevueFlowHooks['connectStop']
-    connectEnd: RevueFlowHooks['connectEnd']
-    connect: RevueFlowHooks['connect']
-    edgeUpdateEnd: RevueFlowHooks['edgeUpdateEnd']
+    connectStart: FlowHooks['connectStart']
+    connectStop: FlowHooks['connectStop']
+    connectEnd: FlowHooks['connectEnd']
+    connect: FlowHooks['connect']
+    edgeUpdateEnd: FlowHooks['edgeUpdateEnd']
   },
   handleId: ElementId,
   nodeId: ElementId,
diff --git a/src/components/Nodes/Node.vue b/src/components/Nodes/Node.vue
index 7364a86d..0a5ed24f 100644
--- a/src/components/Nodes/Node.vue
+++ b/src/components/Nodes/Node.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { DraggableEventListener } from '@braks/revue-draggable'
 import { Node, NodeDimensionUpdate, NodeType } from '~/types'
-import { Hooks, Store } from '~/context/symbols'
+import { Hooks, Store } from '~/context'
 
 interface NodeProps {
   node: Node
diff --git a/src/components/NodesSelection/NodesSelection.vue b/src/components/NodesSelection/NodesSelection.vue
index c43225cb..757573bf 100644
--- a/src/components/NodesSelection/NodesSelection.vue
+++ b/src/components/NodesSelection/NodesSelection.vue
@@ -2,7 +2,7 @@
 import { DraggableEventListener } from '@braks/revue-draggable'
 import { Node } from '~/types'
 import { isNode } from '~/utils/graph'
-import { Hooks, Store } from '~/context/symbols'
+import { Hooks, Store } from '~/context'
 
 interface NodesSelectionProps {
   onSelectionDragStart?: (event: MouseEvent, nodes: Node[]) => void
diff --git a/src/components/UserSelection/UserSelection.vue b/src/components/UserSelection/UserSelection.vue
index 55611799..412a64ca 100644
--- a/src/components/UserSelection/UserSelection.vue
+++ b/src/components/UserSelection/UserSelection.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import SelectionRect from './SelectionRect.vue'
 import { getMousePosition } from '~/components/UserSelection/utils'
-import { Store } from '~/context/symbols'
+import { Store } from '~/context'
 
 const store = inject(Store)!
 const el = templateRef('user-selection', null)
diff --git a/src/composables/index.ts b/src/composables/index.ts
new file mode 100644
index 00000000..03170c98
--- /dev/null
+++ b/src/composables/index.ts
@@ -0,0 +1,7 @@
+export { default as useGlobalKeyHandler } from './useGlobalKeyHandler'
+export { default as useHooks } from './useHooks'
+export { default as useKeyPress } from './useKeyPress'
+export { default as useResizeHandler } from './useResizeHandler'
+export { default as useUpdateNodeInternals } from './useUpdateNodeInternals'
+export { default as useZoom } from './useZoom'
+export { default as useZoomPanHelper } from './useZoomPanHelper'
diff --git a/src/hooks/useGlobalKeyHandler.ts b/src/composables/useGlobalKeyHandler.ts
similarity index 96%
rename from src/hooks/useGlobalKeyHandler.ts
rename to src/composables/useGlobalKeyHandler.ts
index d5fe9901..ebd23dc1 100644
--- a/src/hooks/useGlobalKeyHandler.ts
+++ b/src/composables/useGlobalKeyHandler.ts
@@ -1,7 +1,7 @@
 import useKeyPress from './useKeyPress'
 import { isNode, getConnectedEdges } from '~/utils/graph'
 import { Elements, KeyCode, ElementId, FlowElement } from '~/types'
-import { Store } from '~/context/symbols'
+import { Store } from '~/context'
 
 interface HookParams {
   deleteKeyCode: KeyCode
diff --git a/src/hooks/RevueFlowHooks.ts b/src/composables/useHooks.ts
similarity index 96%
rename from src/hooks/RevueFlowHooks.ts
rename to src/composables/useHooks.ts
index de45b273..b58d238f 100644
--- a/src/hooks/RevueFlowHooks.ts
+++ b/src/composables/useHooks.ts
@@ -1,7 +1,7 @@
 // global hooks
 import { Connection, Edge, Elements, FlowHooks, FlowTransform, Node, OnConnectStartParams, OnLoadParams } from '~/types'
 
-export const useHooks = (): FlowHooks & { bind: (emit: (event: string, ...args: any[]) => void) => FlowHooks } => {
+export default (): FlowHooks & { bind: (emit: (event: string, ...args: any[]) => void) => FlowHooks } => {
   const eventHooks: FlowHooks = {
     elementClick: createEventHook<{ event: MouseEvent; element: Node | Edge }>(),
     elementsRemove: createEventHook<Elements>(),
diff --git a/src/hooks/useKeyPress.ts b/src/composables/useKeyPress.ts
similarity index 100%
rename from src/hooks/useKeyPress.ts
rename to src/composables/useKeyPress.ts
diff --git a/src/hooks/useResizeHandler.ts b/src/composables/useResizeHandler.ts
similarity index 100%
rename from src/hooks/useResizeHandler.ts
rename to src/composables/useResizeHandler.ts
diff --git a/src/hooks/useUpdateNodeInternals.ts b/src/composables/useUpdateNodeInternals.ts
similarity index 100%
rename from src/hooks/useUpdateNodeInternals.ts
rename to src/composables/useUpdateNodeInternals.ts
diff --git a/src/composables/useZoom.ts b/src/composables/useZoom.ts
index 187bdd14..40e507d0 100644
--- a/src/composables/useZoom.ts
+++ b/src/composables/useZoom.ts
@@ -2,20 +2,10 @@ import { D3ZoomEvent, zoom, zoomIdentity, ZoomTransform } from 'd3-zoom'
 import { pointer, select } from 'd3-selection'
 import { Ref } from 'vue'
 import { get } from '@vueuse/core'
-import {
-  D3Selection,
-  D3Zoom,
-  FlowTransform,
-  InitD3ZoomPayload,
-  KeyCode,
-  PanOnScrollMode,
-  Transform,
-  TranslateExtent,
-} from '~/types'
+import { D3Selection, D3Zoom, FlowTransform, KeyCode, PanOnScrollMode, Transform } from '~/types'
 import { clamp } from '~/utils'
-import useKeyPress from '~/hooks/useKeyPress'
-import { Hooks } from '~/context/symbols'
-import { onLoadGetElements, onLoadProject, onLoadToObject } from '~/utils/graph'
+import useKeyPress from '~/composables/useKeyPress'
+import { Hooks, Store } from '~/context'
 
 const viewChanged = (prevTransform: FlowTransform, eventTransform: ZoomTransform): boolean =>
   prevTransform.x !== eventTransform.x || prevTransform.y !== eventTransform.y || prevTransform.zoom !== eventTransform.k
@@ -30,11 +20,8 @@ interface UseZoomOptions {
   selectionKeyCode?: KeyCode
   zoomActivationKeyCode?: KeyCode
   paneMoveable?: boolean
-  minZoom?: number
-  maxZoom?: number
   defaultZoom?: number
   defaultPosition?: [number, number]
-  translateExtent?: TranslateExtent
   zoomOnScroll?: boolean
   zoomOnPinch?: boolean
   panOnScroll?: boolean
@@ -49,22 +36,12 @@ interface UseZoom {
   d3Selection: Ref<D3Selection>
 }
 
-export default function (
-  el: Ref<HTMLDivElement>,
-  options: UseZoomOptions,
-  init: (initD3ZoomPayload: InitD3ZoomPayload) => void = () => {},
-): UseZoom {
+export default function (el: Ref<HTMLDivElement>, options: UseZoomOptions): UseZoom {
   const {
     selectionKeyCode = 'Shift',
     zoomActivationKeyCode = 'Meta',
-    minZoom = 0.5,
-    maxZoom = 2,
     defaultZoom = 1,
     defaultPosition = [0, 0],
-    translateExtent = [
-      [Number.NEGATIVE_INFINITY, Number.NEGATIVE_INFINITY],
-      [Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY],
-    ],
     zoomOnScroll = true,
     zoomOnPinch = true,
     zoomOnDoubleClick = true,
@@ -74,13 +51,17 @@ export default function (
     paneMoveable = true,
   } = options
   const hooks = inject(Hooks)!
+  const store = inject(Store)!
   const prevTransform = ref<FlowTransform>({ x: 0, y: 0, zoom: 0 })
 
-  const clampedX = clamp(defaultPosition[0], translateExtent[0][0], translateExtent[1][0])
-  const clampedY = clamp(defaultPosition[1], translateExtent[0][1], translateExtent[1][1])
-  const clampedZoom = clamp(defaultZoom, minZoom, maxZoom)
+  const clampedX = clamp(defaultPosition[0], store.translateExtent[0][0], store.translateExtent[1][0])
+  const clampedY = clamp(defaultPosition[1], store.translateExtent[0][1], store.translateExtent[1][1])
+  const clampedZoom = clamp(defaultZoom, store.minZoom, store.maxZoom)
   const transform = ref<Transform>([clampedX, clampedY, clampedZoom])
-  const d3Zoom = ref(zoom<HTMLDivElement, any>().scaleExtent([minZoom, maxZoom]).translateExtent(translateExtent))
+  store.transform = transform.value
+  const d3Zoom = ref(
+    zoom<HTMLDivElement, any>().scaleExtent([store.minZoom, store.maxZoom]).translateExtent(store.translateExtent),
+  )
   const d3Selection = ref()
 
   until(el)
@@ -93,8 +74,7 @@ export default function (
 
       const updatedTransform = zoomIdentity.translate(clampedX, clampedY).scale(clampedZoom)
       d3z.transform(d3s, updatedTransform)
-      init({ d3Zoom: d3z, d3ZoomHandler, d3Selection: d3s })
-
+      store.initD3Zoom({ d3Zoom: d3z, d3Selection: d3s, d3ZoomHandler })
       const applyZoomHandlers = () => {
         d3z.on('start', (event: D3ZoomEvent<HTMLDivElement, any>) => {
           if (viewChanged(prevTransform.value, event.transform)) {
diff --git a/src/composables/useZoomPanHelper.ts b/src/composables/useZoomPanHelper.ts
new file mode 100644
index 00000000..4d87506b
--- /dev/null
+++ b/src/composables/useZoomPanHelper.ts
@@ -0,0 +1,62 @@
+import { zoomIdentity } from 'd3-zoom'
+import { getRectOfNodes, pointToRendererPoint, getTransformForBounds } from '~/utils/graph'
+import { FitViewParams, FlowTransform, Rect, UseZoomPanHelper, XYPosition } from '~/types'
+import { Store } from '~/context'
+
+const DEFAULT_PADDING = 0.1
+
+export default function (): UseZoomPanHelper {
+  const store = inject(Store)!
+  return {
+    zoomIn: () => store.d3Selection && store.d3Zoom?.scaleBy(store.d3Selection, 1.2),
+    zoomOut: () => store.d3Selection && store.d3Zoom?.scaleBy(store.d3Selection, 1 / 1.2),
+    zoomTo: (zoomLevel: number) => store.d3Selection && store.d3Zoom?.scaleTo(store.d3Selection, zoomLevel),
+    transform: (transform: FlowTransform) => {
+      const nextTransform = zoomIdentity.translate(transform.x, transform.y).scale(transform.zoom)
+
+      store.d3Selection && store.d3Zoom?.transform(store.d3Selection, nextTransform)
+    },
+    fitView: (options: FitViewParams = { padding: DEFAULT_PADDING, includeHiddenNodes: false }) => {
+      if (!store.nodes.length) {
+        return
+      }
+
+      const bounds = getRectOfNodes(options.includeHiddenNodes ? store.nodes : store.nodes.filter((node) => !node.isHidden))
+      const [x, y, zoom] = getTransformForBounds(
+        bounds,
+        store.dimensions.width,
+        store.dimensions.height,
+        options.minZoom || store.minZoom,
+        options.maxZoom || store.maxZoom,
+        options.padding || DEFAULT_PADDING,
+      )
+      const transform = zoomIdentity.translate(x, y).scale(zoom)
+
+      store.d3Selection && store.d3Zoom?.transform(store.d3Selection, transform)
+    },
+    setCenter: (x: number, y: number, zoom?: number) => {
+      const nextZoom = typeof zoom !== 'undefined' ? zoom : store.maxZoom
+      const centerX = store.dimensions.width / 2 - x * nextZoom
+      const centerY = store.dimensions.height / 2 - y * nextZoom
+      const transform = zoomIdentity.translate(centerX, centerY).scale(nextZoom)
+
+      store.d3Selection && store.d3Zoom?.transform(store.d3Selection, transform)
+    },
+    fitBounds: (bounds: Rect, padding = DEFAULT_PADDING) => {
+      const [x, y, zoom] = getTransformForBounds(
+        bounds,
+        store.dimensions.width,
+        store.dimensions.height,
+        store.minZoom,
+        store.maxZoom,
+        padding,
+      )
+      const transform = zoomIdentity.translate(x, y).scale(zoom)
+
+      store.d3Selection && store.d3Zoom?.transform(store.d3Selection, transform)
+    },
+    project: (position: XYPosition) => {
+      return pointToRendererPoint(position, store.transform, store.snapToGrid, store.snapGrid)
+    },
+  }
+}
diff --git a/src/container/EdgeRenderer/EdgeRenderer.vue b/src/container/EdgeRenderer/EdgeRenderer.vue
index 8c1b5590..a8ff72d7 100644
--- a/src/container/EdgeRenderer/EdgeRenderer.vue
+++ b/src/container/EdgeRenderer/EdgeRenderer.vue
@@ -5,7 +5,7 @@ import MarkerDefinitions from './MarkerDefinitions.vue'
 import Edge from '~/components/Edges/Edge.vue'
 import ConnectionLine from '~/components/ConnectionLine/ConnectionLine.vue'
 import { ConnectionLineType, ConnectionMode, CustomConnectionLine, Dimensions, EdgeType, Transform } from '~/types'
-import { Store } from '~/context/symbols'
+import { Store } from '~/context'
 
 interface EdgeRendererProps {
   edgeTypes: Record<string, EdgeType>
diff --git a/src/container/Flow/Flow.vue b/src/container/Flow/Flow.vue
index 5dca8fc6..81915959 100644
--- a/src/container/Flow/Flow.vue
+++ b/src/container/Flow/Flow.vue
@@ -24,8 +24,8 @@ import { DefaultNode, InputNode, OutputNode } from '~/components/Nodes'
 import { BezierEdge, SmoothStepEdge, StepEdge, StraightEdge } from '~/components/Edges'
 import { createEdgeTypes } from '~/container/EdgeRenderer/utils'
 import { createNodeTypes } from '~/container/NodeRenderer/utils'
-import { useHooks } from '~/hooks/RevueFlowHooks'
-import { Hooks, Store } from '~/context/symbols'
+import { useHooks } from '~/composables'
+import { Hooks, Store } from '~/context'
 
 export interface FlowProps {
   elements: Elements
diff --git a/src/container/NodeRenderer/NodeRenderer.vue b/src/container/NodeRenderer/NodeRenderer.vue
index a5a5cb68..02f1d842 100644
--- a/src/container/NodeRenderer/NodeRenderer.vue
+++ b/src/container/NodeRenderer/NodeRenderer.vue
@@ -2,7 +2,7 @@
 import Node from '~/components/Nodes/Node.vue'
 import { NodeType, Node as TNode, Transform, Dimensions } from '~/types'
 import { getNodesInside } from '~/utils/graph'
-import { Store } from '~/context/symbols'
+import { Store } from '~/context'
 
 interface NodeRendererProps {
   nodeTypes: Record<string, NodeType>
diff --git a/src/container/SelectionPane/SelectionPane.vue b/src/container/SelectionPane/SelectionPane.vue
index d19e8a80..cefd5092 100644
--- a/src/container/SelectionPane/SelectionPane.vue
+++ b/src/container/SelectionPane/SelectionPane.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
-import useKeyPress from '~/hooks/useKeyPress'
+import useKeyPress from '~/composables/useKeyPress'
 import { KeyCode } from '~/types'
-import useGlobalKeyHandler from '~/hooks/useGlobalKeyHandler'
+import useGlobalKeyHandler from '~/composables/useGlobalKeyHandler'
 import NodesSelection from '~/components/NodesSelection/NodesSelection.vue'
 import UserSelection from '~/components/UserSelection/UserSelection.vue'
-import { Hooks, Store } from '~/context/symbols'
+import { Hooks, Store } from '~/context'
 
 interface SelectionPaneProps {
   selectionKeyCode?: KeyCode
diff --git a/src/container/ZoomPane/ZoomPane.vue b/src/container/ZoomPane/ZoomPane.vue
index 176039cd..99562b7c 100644
--- a/src/container/ZoomPane/ZoomPane.vue
+++ b/src/container/ZoomPane/ZoomPane.vue
@@ -1,9 +1,8 @@
 <script lang="ts" setup>
 import { KeyCode, PanOnScrollMode } from '~/types'
-import useZoom from '~/composables/useZoom'
-import useResizeHandler from '~/hooks/useResizeHandler'
-import useZoomPanHelper from '~/hooks/useZoomPanHelper'
-import { Store } from '~/context/symbols'
+import { useZoom, useResizeHandler, useZoomPanHelper } from '~/composables'
+import { Hooks, Store } from '~/context'
+import { onLoadGetElements, onLoadProject, onLoadToObject } from '~/utils/graph'
 
 interface ZoomPaneProps {
   selectionKeyCode?: KeyCode
@@ -33,25 +32,25 @@ const props = withDefaults(defineProps<ZoomPaneProps>(), {
   paneMoveable: true,
 })
 const store = inject(Store)!
-const zoomPaneEl = templateRef<HTMLDivElement>('zoom-pane', null)
-const { transform, d3Selection, d3Zoom } = useZoom(zoomPaneEl, props, (initD3ZoomPayload) => store.initD3Zoom(initD3ZoomPayload))
+const hooks = inject(Hooks)!
 
+const zoomPaneEl = templateRef<HTMLDivElement>('zoom-pane', null)
+const { transform } = useZoom(zoomPaneEl, props)
 watch(transform, (val) => (store.transform = val), { flush: 'post' })
 const dimensions = useResizeHandler(zoomPaneEl)
 watch(dimensions, (val) => (store.dimensions = val), { flush: 'post' })
 
-const getZoomPanHelper = reactify(useZoomPanHelper)
-const zoomPanHelper = getZoomPanHelper(
-  d3Zoom,
-  d3Selection,
-  store.nodes,
-  transform,
-  dimensions,
-  store.minZoom,
-  store.maxZoom,
-  store.snapToGrid,
-  store.snapGrid,
-)
+const { zoomIn, zoomOut, zoomTo, transform: setTransform, fitView } = useZoomPanHelper()
+hooks.load.trigger({
+  fitView: (params = { padding: 0.1 }) => fitView(params),
+  zoomIn,
+  zoomOut,
+  zoomTo,
+  setTransform,
+  project: onLoadProject(store),
+  getElements: onLoadGetElements(store),
+  toObject: onLoadToObject(store),
+})
 </script>
 <template>
   <div ref="zoom-pane" class="revue-flow__renderer revue-flow__zoompane">
diff --git a/src/context/symbols.ts b/src/context/index.ts
similarity index 72%
rename from src/context/symbols.ts
rename to src/context/index.ts
index bdcb3aa8..b29c0d30 100644
--- a/src/context/symbols.ts
+++ b/src/context/index.ts
@@ -3,3 +3,4 @@ import { FlowHooks, FlowStore } from '~/types'
 
 export const Store: InjectionKey<FlowStore> = Symbol('store')
 export const Hooks: InjectionKey<FlowHooks> = Symbol('hooks')
+export const NodeIdContextKey: InjectionKey<string> = Symbol('NodeIdContext')
diff --git a/src/hooks/useZoomPanHelper.ts b/src/hooks/useZoomPanHelper.ts
deleted file mode 100644
index df3692ae..00000000
--- a/src/hooks/useZoomPanHelper.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { zoomIdentity } from 'd3-zoom'
-import { getRectOfNodes, pointToRendererPoint, getTransformForBounds } from '~/utils/graph'
-import {
-  FitViewParams,
-  FlowTransform,
-  ZoomPanHelperFunctions,
-  Rect,
-  XYPosition,
-  Node,
-  Transform,
-  SnapGrid,
-  Dimensions,
-  D3Zoom,
-  D3Selection,
-} from '~/types'
-
-const DEFAULT_PADDING = 0.1
-
-type UseZoomPanHelper = (
-  d3Zoom: D3Zoom,
-  d3Selection: D3Selection,
-  nodes: Node[],
-  transform: Transform,
-  dimensions: Dimensions,
-  minZoom: number,
-  maxZoom: number,
-  snapToGrid: boolean,
-  snapGrid: SnapGrid,
-) => ZoomPanHelperFunctions
-
-export default (function (
-  d3Zoom,
-  d3Selection,
-  nodes = [],
-  transform = [0, 0, 0],
-  dimensions = {
-    width: 0,
-    height: 0,
-  },
-  minZoom = 0.5,
-  maxZoom = 2,
-  snapToGrid = false,
-  snapGrid = [15, 15],
-): ZoomPanHelperFunctions {
-  return {
-    zoomIn: () => d3Zoom?.scaleBy(d3Selection, 1.2),
-    zoomOut: () => d3Zoom?.scaleBy(d3Selection, 1 / 1.2),
-    zoomTo: (zoomLevel: number) => d3Zoom.scaleTo(d3Selection, zoomLevel),
-    transform: (transform: FlowTransform) => {
-      const nextTransform = zoomIdentity.translate(transform.x, transform.y).scale(transform.zoom)
-
-      d3Zoom.transform(d3Selection, nextTransform)
-    },
-    fitView: (options: FitViewParams = { padding: DEFAULT_PADDING, includeHiddenNodes: false }) => {
-      if (!nodes.length) {
-        return
-      }
-
-      const bounds = getRectOfNodes(options.includeHiddenNodes ? nodes : nodes.filter((node) => !node.isHidden))
-      const [x, y, zoom] = getTransformForBounds(
-        bounds,
-        dimensions.width,
-        dimensions.height,
-        options.minZoom || minZoom,
-        options.maxZoom || maxZoom,
-        options.padding || DEFAULT_PADDING,
-      )
-      const transform = zoomIdentity.translate(x, y).scale(zoom)
-
-      d3Zoom?.transform(d3Selection, transform)
-    },
-    setCenter: (x: number, y: number, zoom?: number) => {
-      const nextZoom = typeof zoom !== 'undefined' ? zoom : maxZoom
-      const centerX = dimensions.width / 2 - x * nextZoom
-      const centerY = dimensions.height / 2 - y * nextZoom
-      const transform = zoomIdentity.translate(centerX, centerY).scale(nextZoom)
-
-      d3Zoom.transform(d3Selection, transform)
-    },
-    fitBounds: (bounds: Rect, padding = DEFAULT_PADDING) => {
-      const [x, y, zoom] = getTransformForBounds(bounds, dimensions.width, dimensions.height, minZoom, maxZoom, padding)
-      const transform = zoomIdentity.translate(x, y).scale(zoom)
-
-      d3Zoom.transform(d3Selection, transform)
-    },
-    project: (position: XYPosition) => {
-      return pointToRendererPoint(position, transform, snapToGrid, snapGrid)
-    },
-  }
-} as UseZoomPanHelper)
diff --git a/src/index.ts b/src/index.ts
index 051ceb00..cb0aca97 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -15,8 +15,9 @@ export {
   getTransformForBounds,
   getRectOfNodes,
 } from './utils/graph'
-export { default as useZoomPanHelper } from './hooks/useZoomPanHelper'
-export { default as useUpdateNodeInternals } from './hooks/useUpdateNodeInternals'
+export { default as useZoomPanHelper } from './composables/useZoomPanHelper'
+export { default as useUpdateNodeInternals } from './composables/useUpdateNodeInternals'
 
 export * from './additional-components'
 export * from './types'
+export * from './context'
diff --git a/src/store/index.ts b/src/store/index.ts
index 4ac81921..5224a7fe 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,6 +1,6 @@
-import { RevueFlowState, ConnectionMode } from '../types'
+import { ConnectionMode, FlowState } from '~/types'
 
-export const initialState: RevueFlowState = {
+export const initialState: FlowState = {
   dimensions: {
     width: 0,
     height: 0,
diff --git a/src/types/panel.ts b/src/types/panel.ts
index 9e839a5d..621359d3 100644
--- a/src/types/panel.ts
+++ b/src/types/panel.ts
@@ -13,7 +13,7 @@ export enum PanOnScrollMode {
   Horizontal = 'horizontal',
 }
 
-export interface ZoomPanHelperFunctions {
+export interface UseZoomPanHelper {
   zoomIn: () => void
   zoomOut: () => void
   zoomTo: (zoomLevel: number) => void
diff --git a/src/utils/graph.ts b/src/utils/graph.ts
index 5a600516..e5231d96 100644
--- a/src/utils/graph.ts
+++ b/src/utils/graph.ts
@@ -10,9 +10,32 @@ import {
   Connection,
   FlowExportObject,
   NodeExtent,
-  RevueFlowStore,
-} from '../types'
-import { clampPosition, clamp } from './index'
+  Dimensions,
+  FlowStore,
+} from '~/types'
+
+export const isInputDOMNode = (e: KeyboardEvent | MouseEvent): boolean => {
+  const target = e.target as HTMLElement
+  return ['INPUT', 'SELECT', 'TEXTAREA', 'BUTTON'].includes(target.nodeName) || target.hasAttribute('contentEditable')
+}
+
+export const getDimensions = (node: HTMLElement): Dimensions => ({
+  width: node.offsetWidth,
+  height: node.offsetHeight,
+})
+
+export const clamp = (val: number, min = 0, max = 1): number => Math.min(Math.max(val, min), max)
+
+export const clampPosition = (position: XYPosition, extent: NodeExtent): XYPosition => ({
+  x: clamp(position.x, extent[0][0], extent[1][0]),
+  y: clamp(position.y, extent[0][1], extent[1][1]),
+})
+
+export const getHostForElement = (element: HTMLElement): Document => {
+  const doc = element.getRootNode() as Document
+  if ('getElementFromPoint' in doc) return doc
+  else return window.document
+}
 
 export const isEdge = (element: Node | Connection | Edge): element is Edge =>
   'id' in element && 'source' in element && 'target' in element
@@ -136,7 +159,7 @@ export const pointToRendererPoint = (
 }
 
 export const onLoadProject =
-  (currentStore: RevueFlowStore) =>
+  (currentStore: FlowStore) =>
   (position: XYPosition): XYPosition =>
     pointToRendererPoint(position, currentStore.transform, currentStore.snapToGrid, currentStore.snapGrid)
 
@@ -256,10 +279,10 @@ const parseElements = (nodes: Node[], edges: Edge[]): Elements => [
   ...edges.map((e) => ({ ...e })),
 ]
 
-export const onLoadGetElements = (currentStore: RevueFlowStore) => (): Elements =>
+export const onLoadGetElements = (currentStore: FlowStore) => (): Elements =>
   parseElements(currentStore.nodes || [], currentStore.edges || [])
 
-export const onLoadToObject = (currentStore: RevueFlowStore) => (): FlowExportObject => ({
+export const onLoadToObject = (currentStore: FlowStore) => (): FlowExportObject => ({
   elements: parseElements(currentStore.nodes || [], currentStore.edges || []),
   position: [currentStore.transform[0], currentStore.transform[1]],
   zoom: currentStore.transform[2],
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 81608401..b8ade72c 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,24 +1 @@
-import { Dimensions, XYPosition, NodeExtent } from '../types'
-
-export const isInputDOMNode = (e: KeyboardEvent | MouseEvent): boolean => {
-  const target = e.target as HTMLElement
-  return ['INPUT', 'SELECT', 'TEXTAREA', 'BUTTON'].includes(target.nodeName) || target.hasAttribute('contentEditable')
-}
-
-export const getDimensions = (node: HTMLElement): Dimensions => ({
-  width: node.offsetWidth,
-  height: node.offsetHeight,
-})
-
-export const clamp = (val: number, min = 0, max = 1): number => Math.min(Math.max(val, min), max)
-
-export const clampPosition = (position: XYPosition, extent: NodeExtent): XYPosition => ({
-  x: clamp(position.x, extent[0][0], extent[1][0]),
-  y: clamp(position.y, extent[0][1], extent[1][1]),
-})
-
-export const getHostForElement = (element: HTMLElement): Document => {
-  const doc = element.getRootNode() as Document
-  if ('getElementFromPoint' in doc) return doc
-  else return window.document
-}
+export * from './graph'
diff --git a/src/utils/symbols.ts b/src/utils/symbols.ts
deleted file mode 100644
index 948d3b86..00000000
--- a/src/utils/symbols.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { InjectionKey } from 'vue'
-import { RevueFlowStore } from '../types'
-import { RevueFlowHooks } from '../hooks/RevueFlowHooks'
-
-export const StoreKey: InjectionKey<RevueFlowStore> = Symbol('store')
-export const HooksKey: InjectionKey<RevueFlowHooks> = Symbol('hooks')
-export const NodeIdContextKey: InjectionKey<string> = Symbol('NodeIdContext')