From c3429bdbbda719d913bad87bcf4289115c015cf3 Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Tue, 19 Dec 2023 10:35:19 -0500
Subject: [PATCH] chore: Drag and drop refactor

---
 app/components/Sidebar/components/useDragAndDrop.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/components/Sidebar/components/useDragAndDrop.ts b/app/components/Sidebar/components/useDragAndDrop.ts
index 0b3385cdd..b95104fc2 100644
--- a/app/components/Sidebar/components/useDragAndDrop.ts
+++ b/app/components/Sidebar/components/useDragAndDrop.ts
@@ -15,10 +15,11 @@ import { useStarLabelAndIcon } from "./useStarLabelAndIcon";
 export function useDragStar(
   star: Star
 ): [{ isDragging: boolean }, ConnectDragSource] {
+  const id = star.id;
   const { label: title, icon } = useStarLabelAndIcon(star);
   const [{ isDragging }, draggableRef, preview] = useDrag({
     type: "star",
-    item: () => ({ icon, title, star }),
+    item: () => ({ id, title, icon }),
     collect: (monitor) => ({
       isDragging: !!monitor.isDragging(),
     }),
@@ -67,8 +68,9 @@ export function useDropToReorderStar(getIndex?: () => string) {
 
   return useDrop({
     accept: "star",
-    drop: async (item: { star: Star }) => {
-      void item.star.save({
+    drop: async (item: DragObject) => {
+      const star = stars.get(item.id);
+      void star?.save({
         index:
           getIndex?.() ?? fractionalIndex(null, stars.orderedData[0].index),
       });