From 88bc46414ae8c5f382a50a38a03f1835a1c5223f Mon Sep 17 00:00:00 2001
From: jf908 <josh@thefindons.com>
Date: Fri, 11 Apr 2025 01:07:48 +0100
Subject: [PATCH] Utilize Vue's utilities and improve typings

---
 src/vue/index.ts | 14 ++++++--------
 src/vue/types.ts |  4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/vue/index.ts b/src/vue/index.ts
index 025fb2d9..79c2d2c3 100644
--- a/src/vue/index.ts
+++ b/src/vue/index.ts
@@ -1,15 +1,14 @@
-import type { Ref } from "vue";
+import type { MaybeRef, Ref } from "vue";
 import type { VueDragAndDropData, VueParentConfig } from "./types";
 import { dragAndDrop as initParent, isBrowser, tearDown } from "../index";
-import { onUnmounted, ref } from "vue";
+import { isRef, onUnmounted, ref, unref } from "vue";
 import { handleVueElements } from "./utils";
 export * from "./types";
 
 /**
  * Global store for parent els to values.
  */
-const parentValues: WeakMap<HTMLElement, Ref<Array<any>> | Array<any>> =
-  new WeakMap();
+const parentValues: WeakMap<HTMLElement, MaybeRef<Array<any>>> = new WeakMap();
 
 /**
  * Returns the values of the parent element.
@@ -27,7 +26,7 @@ function getValues(parent: HTMLElement): Array<any> {
     return [];
   }
 
-  return "value" in values ? values.value : values;
+  return unref(values);
 }
 
 /**
@@ -43,8 +42,7 @@ function setValues(newValues: Array<any>, parent: HTMLElement): void {
   const currentValues = parentValues.get(parent);
 
   // Only update reactive values. If static, let's not update.
-  if (currentValues && "value" in currentValues)
-    currentValues.value = newValues;
+  if (currentValues && isRef(currentValues)) currentValues.value = newValues;
   //else if (currentValues) parentValues.set(parent, newValues);
 }
 /**
@@ -110,7 +108,7 @@ export function useDragAndDrop<T>(
  */
 function handleParent<T>(
   config: Partial<VueParentConfig<T>>,
-  values: Ref<Array<T>> | Array<T>
+  values: MaybeRef<Array<T>>
 ) {
   return (parent: HTMLElement) => {
     parentValues.set(parent, values);
diff --git a/src/vue/types.ts b/src/vue/types.ts
index 5303966c..d93a3882 100644
--- a/src/vue/types.ts
+++ b/src/vue/types.ts
@@ -1,11 +1,11 @@
-import type { Ref } from "vue";
+import type { MaybeRef, Ref } from "vue";
 import type { ParentConfig } from "../types";
 
 export type VueElement = HTMLElement | Ref<HTMLElement | undefined>;
 
 export interface VueDragAndDropData<T> extends VueParentConfig<T> {
   parent: HTMLElement | Ref<HTMLElement | undefined>;
-  values: Ref<Array<T>> | Array<T>;
+  values: MaybeRef<Array<T>>;
 }
 
 export type VueParentConfig<T> = Partial<ParentConfig<T>>;