Update undefined ref guards

clauderic · Sep 23, 2024 · cf80a52 · cf80a52
1 parent d26fafe
commit cf80a52
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/packages/react/src/core/droppable/useDroppable.ts b/packages/react/src/core/droppable/useDroppable.ts
@@ -44,6 +44,14 @@ export function useDroppable<T extends Data = Data>(
     },
     ref: useCallback(
       (element: Element | null) => {
+        if (
+          !element &&
+          droppable.element?.isConnected &&
+          !droppable.manager?.dragOperation.status.idle
+        ) {
+          return;
+        }
+
         droppable.element = element ?? undefined;
       },
       [droppable]

diff --git a/packages/react/src/sortable/useSortable.ts b/packages/react/src/sortable/useSortable.ts
@@ -115,6 +115,14 @@ export function useSortable<T extends Data = Data>(input: UseSortableInput<T>) {
     ),
     ref: useCallback(
       (element: Element | null) => {
+        if (
+          !element &&
+          sortable.element?.isConnected &&
+          !manager?.dragOperation.status.idle
+        ) {
+          return;
+        }
+
         sortable.element = element ?? undefined;
       },
       [sortable]