From 19294de0de5c3aaf4280bfb9c28f37d88254d51d Mon Sep 17 00:00:00 2001 From: Dhruv Goel Date: Thu, 10 Feb 2022 08:17:39 +0530 Subject: [PATCH] =?UTF-8?q?fix:=20Correct=20variable=20name=20that=20gets?= =?UTF-8?q?=20passed=20on=20to=20EventWrapper=20so=20dragndrop=20ha?= =?UTF-8?q?=E2=80=A6=20(#2121)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix variable name that gets passed on to EventWrapper so dragndrop has access to continuesPrior and continuesAfter flags. Based on these flags, drag n drop determine whether to show north-south anchors for multi day events. --- examples/demos/dnd.js | 1 + examples/events.js | 4 ++-- src/DayColumn.js | 8 ++++---- src/TimeGridEvent.js | 8 ++++---- src/addons/dragAndDrop/EventContainerWrapper.js | 4 ++-- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/examples/demos/dnd.js b/examples/demos/dnd.js index 96da8cb6a..a3a4573e0 100644 --- a/examples/demos/dnd.js +++ b/examples/demos/dnd.js @@ -106,6 +106,7 @@ class Dnd extends React.Component { onEventDrop={this.moveEvent} resizable onEventResize={this.resizeEvent} + showMultiDayTimes={true} onSelectSlot={this.newEvent} onDragStart={console.log} defaultView={Views.MONTH} diff --git a/examples/events.js b/examples/events.js index 90aaa4b4c..30f09ef8d 100644 --- a/examples/events.js +++ b/examples/events.js @@ -83,9 +83,9 @@ export default [ }, { id: 11.1, - title: 'Inconvenient Conference Call', + title: 'Inconvenient multi-day Conference Call', start: new Date(2015, 3, 13, 9, 30, 0), - end: new Date(2015, 3, 13, 12, 0, 0), + end: new Date(2015, 3, 14, 1, 0, 0), }, { id: 11.2, diff --git a/src/DayColumn.js b/src/DayColumn.js index c6cd68b89..16752a8c6 100644 --- a/src/DayColumn.js +++ b/src/DayColumn.js @@ -221,8 +221,8 @@ class DayColumn extends React.Component { if (startsBeforeDay && startsAfterDay) label = messages.allDay else label = localizer.format({ start, end }, format) - let continuesEarlier = startsBeforeDay || slotMetrics.startsBefore(start) - let continuesLater = startsAfterDay || slotMetrics.startsAfter(end) + let continuesPrior = startsBeforeDay || slotMetrics.startsBefore(start) + let continuesAfter = startsAfterDay || slotMetrics.startsAfter(end) return ( this._select(event, e)} diff --git a/src/TimeGridEvent.js b/src/TimeGridEvent.js index eaf7f9adf..7c7868d3d 100644 --- a/src/TimeGridEvent.js +++ b/src/TimeGridEvent.js @@ -15,8 +15,8 @@ function TimeGridEvent(props) { rtl, selected, label, - continuesEarlier, - continuesLater, + continuesPrior, + continuesAfter, getters, onClick, onDoubleClick, @@ -76,8 +76,8 @@ function TimeGridEvent(props) { userProps.className, { 'rbc-selected': selected, - 'rbc-event-continues-earlier': continuesEarlier, - 'rbc-event-continues-later': continuesLater, + 'rbc-event-continues-earlier': continuesPrior, + 'rbc-event-continues-later': continuesAfter, } )} > diff --git a/src/addons/dragAndDrop/EventContainerWrapper.js b/src/addons/dragAndDrop/EventContainerWrapper.js index d6fa56176..98ec7d61c 100644 --- a/src/addons/dragAndDrop/EventContainerWrapper.js +++ b/src/addons/dragAndDrop/EventContainerWrapper.js @@ -237,8 +237,8 @@ class EventContainerWrapper extends React.Component { getters={getters} components={{ ...components, eventWrapper: NoopWrapper }} accessors={{ ...accessors, ...dragAccessors }} - continuesEarlier={startsBeforeDay} - continuesLater={startsAfterDay} + continuesPrior={startsBeforeDay} + continuesAfter={startsAfterDay} /> )}