From 6162389cc20be48175bf362345a490b08766e0ef Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Wed, 8 Nov 2023 16:00:09 +0100
Subject: [PATCH] revert(core): cleanup imports from vueuse/core that exist in
 vue

This reverts commit 7cc798ad
---
 packages/core/src/components/Edges/EdgeLabelRenderer.vue | 2 +-
 packages/core/src/components/Handle/Handle.vue           | 4 ++--
 packages/core/src/composables/useDrag.ts                 | 3 ++-
 packages/core/src/composables/useHandle.ts               | 2 +-
 packages/core/src/composables/useKeyPress.ts             | 3 +--
 packages/core/src/composables/useWatchProps.ts           | 4 ++--
 packages/core/src/container/Pane/Pane.vue                | 3 ++-
 packages/core/src/container/Viewport/Viewport.vue        | 4 ++--
 8 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/components/Edges/EdgeLabelRenderer.vue b/packages/core/src/components/Edges/EdgeLabelRenderer.vue
index 8fccc149..d69a0b61 100644
--- a/packages/core/src/components/Edges/EdgeLabelRenderer.vue
+++ b/packages/core/src/components/Edges/EdgeLabelRenderer.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { toRef } from 'vue'
+import { toRef } from '@vueuse/core'
 import { useVueFlow } from '../../composables'
 
 const { viewportRef } = useVueFlow()
diff --git a/packages/core/src/components/Handle/Handle.vue b/packages/core/src/components/Handle/Handle.vue
index d634ffa1..5f59fbad 100644
--- a/packages/core/src/components/Handle/Handle.vue
+++ b/packages/core/src/components/Handle/Handle.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import { until } from '@vueuse/core'
-import { computed, onUnmounted, ref, toRef } from 'vue'
+import { toRef, until } from '@vueuse/core'
+import { computed, onUnmounted, ref } from 'vue'
 import type { HandleProps } from '../../types/handle'
 import { Position } from '../../types'
 import { useHandle, useNode, useVueFlow } from '../../composables'
diff --git a/packages/core/src/composables/useDrag.ts b/packages/core/src/composables/useDrag.ts
index 5a1466f5..c0e094ae 100644
--- a/packages/core/src/composables/useDrag.ts
+++ b/packages/core/src/composables/useDrag.ts
@@ -1,8 +1,9 @@
 import type { D3DragEvent, DragBehavior, SubjectPosition } from 'd3-drag'
 import { drag } from 'd3-drag'
 import { select } from 'd3-selection'
-import type { MaybeRefOrGetter, Ref } from 'vue'
+import type { Ref } from 'vue'
 import { ref, watch } from 'vue'
+import type { MaybeRefOrGetter } from '@vueuse/core'
 import { toValue } from '@vueuse/core'
 import { useGetPointerPosition, useVueFlow } from '.'
 import {
diff --git a/packages/core/src/composables/useHandle.ts b/packages/core/src/composables/useHandle.ts
index 1630f750..7b91060d 100644
--- a/packages/core/src/composables/useHandle.ts
+++ b/packages/core/src/composables/useHandle.ts
@@ -1,4 +1,4 @@
-import type { MaybeRefOrGetter } from 'vue'
+import type { MaybeRefOrGetter } from '@vueuse/core'
 import { toValue } from '@vueuse/core'
 import { useVueFlow } from './useVueFlow'
 import type { Connection, ConnectionHandle, HandleType, MouseTouchEvent, ValidConnectionFunc } from '~/types'
diff --git a/packages/core/src/composables/useKeyPress.ts b/packages/core/src/composables/useKeyPress.ts
index 48c19c54..d527cbdb 100644
--- a/packages/core/src/composables/useKeyPress.ts
+++ b/packages/core/src/composables/useKeyPress.ts
@@ -1,6 +1,5 @@
-import type { MaybeRefOrGetter } from 'vue'
 import { ref, watch } from 'vue'
-import type { KeyFilter, KeyPredicate } from '@vueuse/core'
+import type { KeyFilter, KeyPredicate, MaybeRefOrGetter } from '@vueuse/core'
 import { onKeyStroke, toValue, useEventListener } from '@vueuse/core'
 import { useWindow } from './useWindow'
 
diff --git a/packages/core/src/composables/useWatchProps.ts b/packages/core/src/composables/useWatchProps.ts
index 4c39edb7..c0d5f240 100644
--- a/packages/core/src/composables/useWatchProps.ts
+++ b/packages/core/src/composables/useWatchProps.ts
@@ -1,7 +1,7 @@
 import type { Ref, ToRefs } from 'vue'
-import { effectScope, nextTick, onScopeDispose, toRef, watch } from 'vue'
+import { effectScope, nextTick, onScopeDispose, watch } from 'vue'
 import type { WatchPausableReturn } from '@vueuse/core'
-import { watchPausable } from '@vueuse/core'
+import { toRef, watchPausable } from '@vueuse/core'
 import type { Connection, FlowProps, VueFlowStore } from '~/types'
 import { isDef } from '~/utils'
 
diff --git a/packages/core/src/container/Pane/Pane.vue b/packages/core/src/container/Pane/Pane.vue
index e188f7b1..26d2406a 100644
--- a/packages/core/src/container/Pane/Pane.vue
+++ b/packages/core/src/container/Pane/Pane.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
-import { ref, toRef } from 'vue'
+import { ref } from 'vue'
+import { toRef } from '@vueuse/core'
 import UserSelection from '../../components/UserSelection/UserSelection.vue'
 import NodesSelection from '../../components/NodesSelection/NodesSelection.vue'
 import type { GraphNode } from '../../types'
diff --git a/packages/core/src/container/Viewport/Viewport.vue b/packages/core/src/container/Viewport/Viewport.vue
index 93493ea1..6af5ba00 100644
--- a/packages/core/src/container/Viewport/Viewport.vue
+++ b/packages/core/src/container/Viewport/Viewport.vue
@@ -2,8 +2,8 @@
 import type { D3ZoomEvent, ZoomTransform } from 'd3-zoom'
 import { zoom, zoomIdentity } from 'd3-zoom'
 import { pointer, select } from 'd3-selection'
-import { onMounted, ref, toRef, watchEffect } from 'vue'
-import { useEventListener, useResizeObserver } from '@vueuse/core'
+import { onMounted, ref, watchEffect } from 'vue'
+import { toRef, useEventListener, useResizeObserver } from '@vueuse/core'
 import type { CoordinateExtent, D3ZoomHandler, FlowOptions, ViewportTransform } from '../../types'
 import { PanOnScrollMode } from '../../types'
 import { useKeyPress, useVueFlow, useWindow } from '../../composables'