Skip to content
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

Jump to bottom

fix: calendar auto scroll while dragging event at top/bottom edge #2230

Merged
merged 2 commits into from
Feb 14, 2023
Merged

fix: calendar auto scroll while dragging event at top/bottom edge #2230

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
206b7d2
feat: calendar auto scroll while draging event at top/bottom edge
AmitRDesai Jul 25, 2022
c4e78d8
feat: drag auto scroll as default behaviour
AmitRDesai Jul 25, 2022
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
37 changes: 35 additions & 2 deletions src/addons/dragAndDrop/EventContainerWrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import PropTypes from 'prop-types'
import React from 'react'
import { DnDContext } from './DnDContext'
import { scrollParent, scrollTop } from 'dom-helpers'
import qsa from 'dom-helpers/cjs/querySelectorAll'

import Selection, {
getBoundsForNode,
Expand Down Expand Up @@ -124,13 +126,38 @@ class EventContainerWrapper extends React.Component {
})
}

updateParentScroll = (parent, node) => {
setTimeout(() => {
const draggedEl = qsa(node, '.rbc-addons-dnd-drag-preview')[0]
if (draggedEl) {
if (draggedEl.offsetTop < parent.scrollTop) {
scrollTop(parent, Math.max(draggedEl.offsetTop, 0))
} else if (
draggedEl.offsetTop + draggedEl.offsetHeight >
parent.scrollTop + parent.clientHeight
) {
scrollTop(
parent,
Math.min(
draggedEl.offsetTop -
parent.offsetHeight +
draggedEl.offsetHeight,
parent.scrollHeight
)
)
}
}
})
}

_selectable = () => {
let wrapper = this.ref.current
let node = wrapper.children[0]
let isBeingDragged = false
let selector = (this._selector = new Selection(() =>
wrapper.closest('.rbc-time-view')
))
let parent = scrollParent(wrapper)

selector.on('beforeSelect', (point) => {
const { dragAndDropAction } = this.context.draggable
Expand All @@ -156,8 +183,14 @@ class EventContainerWrapper extends React.Component {
const bounds = getBoundsForNode(node)
const { dragAndDropAction } = this.context.draggable

if (dragAndDropAction.action === 'move') this.handleMove(box, bounds)
if (dragAndDropAction.action === 'resize') this.handleResize(box, bounds)
if (dragAndDropAction.action === 'move') {
this.updateParentScroll(parent, node)
this.handleMove(box, bounds)
}
if (dragAndDropAction.action === 'resize') {
this.updateParentScroll(parent, node)
this.handleResize(box, bounds)
}
})

selector.on('dropFromOutside', (point) => {
Expand Down