From 17a4a76f9aca948f6bc111e211516dec29417510 Mon Sep 17 00:00:00 2001
From: Matthias <office@matthiaseigner.at>
Date: Sat, 14 Sep 2024 01:52:05 +0200
Subject: [PATCH] added check for null dragFromOutsideItem, updated example

---
 .../dragAndDrop/EventContainerWrapper.js      | 20 ++++++++++++++++---
 src/addons/dragAndDrop/WeekWrapper.js         |  5 +++--
 stories/demos/exampleCode/dndOutsideSource.js |  6 +++---
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/addons/dragAndDrop/EventContainerWrapper.js b/src/addons/dragAndDrop/EventContainerWrapper.js
index 1b1b03d63..583da4077 100644
--- a/src/addons/dragAndDrop/EventContainerWrapper.js
+++ b/src/addons/dragAndDrop/EventContainerWrapper.js
@@ -126,6 +126,18 @@ class EventContainerWrapper extends React.Component {
     })
   }
 
+  handleDragOverFromOutside = (point, bounds) => {
+    const { slotMetrics } = this.props
+
+    const start = slotMetrics.closestSlotFromPoint(
+      { y: point.y, x: point.x },
+      bounds
+    )
+    const end = slotMetrics.nextSlot(start)
+    const event = this.context.draggable.dragFromOutsideItem()
+    this.update(event, slotMetrics.getRange(start, end, false, true))
+  }
+
   updateParentScroll = (parent, node) => {
     setTimeout(() => {
       const draggedEl = qsa(node, '.rbc-addons-dnd-drag-preview')[0]
@@ -200,10 +212,12 @@ class EventContainerWrapper extends React.Component {
       this.handleDropFromOutside(point, bounds)
     })
 
-    selector.on('dragOver', (point) => {
-      if (!this.context.draggable.dragFromOutsideItem) return
+    selector.on('dragOverFromOutside', (point) => {
+      const item = this.context.draggable.dragFromOutsideItem ? this.context.draggable.dragFromOutsideItem() : null
+      if (!item) return
       const bounds = getBoundsForNode(node)
-      this.handleDropFromOutside(point, bounds)
+      if (!pointInColumn(bounds, point)) return this.reset()
+      this.handleDragOverFromOutside(point, bounds)
     })
 
     selector.on('selectStart', () => {
diff --git a/src/addons/dragAndDrop/WeekWrapper.js b/src/addons/dragAndDrop/WeekWrapper.js
index 355f946e4..be9eaf085 100644
--- a/src/addons/dragAndDrop/WeekWrapper.js
+++ b/src/addons/dragAndDrop/WeekWrapper.js
@@ -91,8 +91,9 @@ class WeekWrapper extends React.Component {
   }
 
   handleDragOverFromOutside = (point, node) => {
-    if (!this.context.draggable.dragFromOutsideItem) return
-    this.handleMove(point, node, this.context.draggable.dragFromOutsideItem())
+    const item = this.context.draggable.dragFromOutsideItem ? this.context.draggable.dragFromOutsideItem() : null
+    if (!item) return
+    this.handleMove(point, node, item)
   }
 
   handleResize(point, bounds) {
diff --git a/stories/demos/exampleCode/dndOutsideSource.js b/stories/demos/exampleCode/dndOutsideSource.js
index bbdd51d3d..2e4800ae6 100644
--- a/stories/demos/exampleCode/dndOutsideSource.js
+++ b/stories/demos/exampleCode/dndOutsideSource.js
@@ -35,9 +35,9 @@ export default function DnDOutsideResource({ localizer }) {
   //,
   const handleDragStart = useCallback((event) => setDraggedEvent(event), [])
 
-  const dragFromOutsideItem = useCallback(() => draggedEvent, [draggedEvent])
+  const dragFromOutsideItem = useCallback(() => draggedEvent === 'undroppable' ? null : draggedEvent, [draggedEvent])
 
-  const customOnDragOver = useCallback(
+  const customOnDragOverFromOutside = useCallback(
     (dragEvent) => {
       // check for undroppable is specific to this example
       // and not part of API. This just demonstrates that
@@ -177,7 +177,7 @@ export default function DnDOutsideResource({ localizer }) {
           events={myEvents}
           localizer={localizer}
           onDropFromOutside={onDropFromOutside}
-          onDragOver={customOnDragOver}
+          onDragOverFromOutside={customOnDragOverFromOutside}
           onEventDrop={moveEvent}
           onEventResize={resizeEvent}
           onSelectSlot={newEvent}