Skip to content

fixed timeline onScroll handler min and max value #834

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fixed timeline onScroll handler min and max value #834

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
225064c
fixed timeline onScroll handler min and max value
StoikovOleh Sep 30, 2021
caceb57
Merge branch 'master' into bugfix/timeline-min_max-value
StoikovOleh Apr 19, 2022
5ea782f
added defaultTimeStart and defaultTimeEnd restriction
StoikovOleh Apr 28, 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: 30 additions & 7 deletions src/lib/Timeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,20 +512,43 @@ export default class ReactCalendarTimeline extends Component {

onScroll = scrollX => {
const width = this.state.width

const zoom = this.state.visibleTimeEnd - this.state.visibleTimeStart
const canvasTimeStart = this.state.canvasTimeStart
const newVsibleTimeStart = canvasTimeStart + zoom * scrollX / width

const zoom = this.state.visibleTimeEnd - this.state.visibleTimeStart
let newScrollX = scrollX

// prevent touchpad scroll to the value less then visibleTimeStart and more then visibleTimeEnd including zoom value

const visibleTimeStart = canvasTimeStart + zoom * scrollX / width
let defaultVisibleTimeStart = this.props.defaultTimeStart.valueOf();
let defaultVisibleTimeEnd = this.props.defaultTimeEnd.valueOf();

if (this.props.visibleTimeStart && this.props.visibleTimeEnd) {
if (newVsibleTimeStart < this.props.visibleTimeStart) {
newScrollX = this.scrollHeaderRef.scrollLeft
} else if (newVsibleTimeStart + zoom > this.props.visibleTimeEnd) {
newScrollX = this.scrollHeaderRef.scrollLeft
}
} else if (defaultVisibleTimeStart && defaultVisibleTimeEnd) {
if (newVsibleTimeStart < defaultVisibleTimeStart) {
newScrollX = this.scrollHeaderRef.scrollLeft
} else if (newVsibleTimeStart + zoom > defaultVisibleTimeEnd) {
newScrollX = this.scrollHeaderRef.scrollLeft
}
}

if (newScrollX !== scrollX) {
this.scrollHeaderRef.scrollLeft = newScrollX
this.scrollComponent.scrollLeft = newScrollX
}

if (
this.state.visibleTimeStart !== visibleTimeStart ||
this.state.visibleTimeEnd !== visibleTimeStart + zoom
this.state.visibleTimeStart !== newVsibleTimeStart ||
this.state.visibleTimeEnd !== newVsibleTimeStart + zoom
) {
this.props.onTimeChange(
visibleTimeStart,
visibleTimeStart + zoom,
newVsibleTimeStart,
newVsibleTimeStart + zoom,
this.updateScrollCanvas,
this.getTimelineUnit()
)
Expand Down