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 elements position on TimeGrid if max prop is set #1057

Merged
merged 2 commits into from
Nov 7, 2018
Merged

Fix elements position on TimeGrid if max prop is set #1057

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
459052c
Fix elements position on TimeGrid if max prop is set
Oct 22, 2018
085ea6c
Merge branch 'master' into master
jquense Nov 7, 2018
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
6 changes: 3 additions & 3 deletions src/utils/TimeSlots.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export function getSlotMetrics({ min: start, max: end, step, timeslots }) {
if (dates.lt(date, start, 'minutes')) return slots[0]

const diffMins = dates.diff(start, date, 'minutes')
return slots[(diffMins - diffMins % step) / step + offset]
return slots[(diffMins - (diffMins % step)) / step + offset]
},

startsBeforeDay(date) {
Expand All @@ -130,11 +130,11 @@ export function getSlotMetrics({ min: start, max: end, step, timeslots }) {

const rangeStartMin = positionFromDate(rangeStart)
const rangeEndMin = positionFromDate(rangeEnd)
const top = rangeStartMin / totalMin * 100
const top = (rangeStartMin / (step * numSlots)) * 100

return {
top,
height: rangeEndMin / totalMin * 100 - top,
height: (rangeEndMin / (step * numSlots)) * 100 - top,
start: positionFromDate(rangeStart),
startDate: rangeStart,
end: positionFromDate(rangeEnd),
Expand Down