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: add new method to get correct time indicator top position | fixes #1396 #1447

Merged
merged 4 commits into from
Sep 10, 2019
Merged

fix: add new method to get correct time indicator top position | fixes #1396 #1447

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
096db5b
fix: add new method to get correct time indicator top position
Sep 9, 2019
c1f893b
fix(current time indicator): remove unnecessary fields
Sep 9, 2019
ea27e5b
fix(current time indicator): rename function
Sep 10, 2019
786c8dd
fix(current time indicator): remove unnecessary code and arguments
Sep 10, 2019
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
5 changes: 4 additions & 1 deletion src/DayColumn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,10 @@ class DayColumn extends React.Component {
const current = getNow()

if (current >= min && current <= max) {
const { top } = this.slotMetrics.getRange(current, current)
const { top } = this.slotMetrics.getCurrentTimeIndicatorRange(
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since this is only using top maybe change this to "getCurrentTimePosition" instead and only return top

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense

current,
current
)
this.setState({ timeIndicatorPosition: top })
} else {
this.clearTimeIndicatorInterval()
Expand Down
24 changes: 20 additions & 4 deletions src/utils/TimeSlots.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,8 @@ export function getSlotMetrics({ min: start, max: end, step, timeslots }) {
},

getRange(rangeStart, rangeEnd, ignoreMin, ignoreMax) {
if (!ignoreMin)
rangeStart = dates.min(end, dates.max(start, rangeStart))
if (!ignoreMax)
rangeEnd = dates.min(end, dates.max(start, rangeEnd))
if (!ignoreMin) rangeStart = dates.min(end, dates.max(start, rangeStart))
if (!ignoreMax) rangeEnd = dates.min(end, dates.max(start, rangeEnd))

const rangeStartMin = positionFromDate(rangeStart)
const rangeEndMin = positionFromDate(rangeEnd)
Expand All @@ -146,5 +144,23 @@ export function getSlotMetrics({ min: start, max: end, step, timeslots }) {
endDate: rangeEnd,
}
},

getCurrentTimeIndicatorRange(rangeStart, rangeEnd, ignoreMin, ignoreMax) {
if (!ignoreMin) rangeStart = dates.min(end, dates.max(start, rangeStart))
if (!ignoreMax) rangeEnd = dates.min(end, dates.max(start, rangeEnd))

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

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