Skip to content

Fix an issue where dnd freezes an event intermittently #1631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 9, 2020
Merged

Fix an issue where dnd freezes an event intermittently #1631

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b426cae
Fixed an issue where dnd freezes an event intermittently
zheyujie Apr 8, 2020
ee4c5da
Make sure OnEnd is called no matter if it's being dragged
zheyujie Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/addons/dragAndDrop/EventContainerWrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ class EventContainerWrapper extends React.Component {

_selectable = () => {
let node = findDOMNode(this)
let isBeingDragged = false
let selector = (this._selector = new Selection(() =>
node.closest('.rbc-time-view')
))
Expand Down Expand Up @@ -177,16 +178,22 @@ class EventContainerWrapper extends React.Component {
this.handleDropFromOutside(point, bounds)
})

selector.on('selectStart', () => this.context.draggable.onStart())
selector.on('selectStart', () => {
isBeingDragged = true
this.context.draggable.onStart()
})

selector.on('select', point => {
const bounds = getBoundsForNode(node)

isBeingDragged = false
if (!this.state.event || !pointInColumn(bounds, point)) return
this.handleInteractionEnd()
})

selector.on('click', () => this.context.draggable.onEnd(null))
selector.on('click', () => {
if (isBeingDragged) this.reset()
this.context.draggable.onEnd(null)
})

selector.on('reset', () => {
this.reset()
Expand Down