From ac23388394e722ee9234ba1edf0ad07808b4dd9a Mon Sep 17 00:00:00 2001 From: braks <78412429+bcakmakoglu@users.noreply.github.com> Date: Tue, 11 Apr 2023 19:28:44 +0200 Subject: [PATCH] chore(core): remove `MaybeRefOrGetter` util type and use `MaybeComputedRef` Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com> --- packages/core/src/composables/useDrag.ts | 6 +++--- packages/core/src/composables/useHandle.ts | 10 +++++----- packages/core/src/types/utils.ts | 3 --- 3 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 packages/core/src/types/utils.ts diff --git a/packages/core/src/composables/useDrag.ts b/packages/core/src/composables/useDrag.ts index 5b1419ae..fe9177e3 100644 --- a/packages/core/src/composables/useDrag.ts +++ b/packages/core/src/composables/useDrag.ts @@ -2,8 +2,8 @@ import type { D3DragEvent, DragBehavior, SubjectPosition } from 'd3-drag' import { drag } from 'd3-drag' import { select } from 'd3-selection' import type { Ref } from 'vue' +import type { MaybeComputedRef } from '@vueuse/core' import type { NodeDragEvent, NodeDragItem, XYPosition } from '~/types' -import type { MaybeRefOrGetter } from '~/types/utils' export type UseDragEvent = D3DragEvent @@ -12,8 +12,8 @@ interface UseDragParams { onDrag: (event: Omit) => void onStop: (event: Omit) => void el: Ref - disabled?: MaybeRefOrGetter - selectable?: MaybeRefOrGetter + disabled?: MaybeComputedRef + selectable?: MaybeComputedRef id?: string } diff --git a/packages/core/src/composables/useHandle.ts b/packages/core/src/composables/useHandle.ts index bc395b79..4a1c61a7 100644 --- a/packages/core/src/composables/useHandle.ts +++ b/packages/core/src/composables/useHandle.ts @@ -1,12 +1,12 @@ +import type { MaybeComputedRef } from '@vueuse/core' import type { Connection, ConnectionHandle, HandleType, MouseTouchEvent, ValidConnectionFunc } from '~/types' -import type { MaybeRefOrGetter } from '~/types/utils' interface UseHandleProps { - handleId: MaybeRefOrGetter - nodeId: MaybeRefOrGetter - type: MaybeRefOrGetter + handleId: MaybeComputedRef + nodeId: MaybeComputedRef + type: MaybeComputedRef isValidConnection?: ValidConnectionFunc | null - edgeUpdaterType?: MaybeRefOrGetter + edgeUpdaterType?: MaybeComputedRef onEdgeUpdate?: (event: MouseTouchEvent, connection: Connection) => void onEdgeUpdateEnd?: (event: MouseTouchEvent) => void } diff --git a/packages/core/src/types/utils.ts b/packages/core/src/types/utils.ts deleted file mode 100644 index 1cda4074..00000000 --- a/packages/core/src/types/utils.ts +++ /dev/null @@ -1,3 +0,0 @@ -import type { MaybeRef } from '@vueuse/core' - -export type MaybeRefOrGetter = MaybeRef | (() => T)