fix: add new method to get correct time indicator top position | fixes …

…jquense#1396 (jquense#1447) * fix: add new method to get correct time indicator top position * fix(current time indicator): remove unnecessary fields * fix(current time indicator): rename function * fix(current time indicator): remove unnecessary code and arguments
gencay · Jul 13, 2020 · 0822663 · 0822663
1 parent 377fd19
commit 0822663
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/DayColumn.js b/src/DayColumn.js
@@ -97,7 +97,7 @@ class DayColumn extends React.Component {
     const current = getNow()
 
     if (current >= min && current <= max) {
-      const { top } = this.slotMetrics.getRange(current, current)
+      const top = this.slotMetrics.getCurrentTimePosition(current)
       this.setState({ timeIndicatorPosition: top })
     } else {
       this.clearTimeIndicatorInterval()

diff --git a/src/utils/TimeSlots.js b/src/utils/TimeSlots.js
@@ -124,9 +124,9 @@ export function getSlotMetrics({ min: start, max: end, step, timeslots }) {
       return dates.gt(dates.merge(end, date), end, 'minutes')
     },
 
-    getRange(rangeStart, rangeEnd) {
-      rangeStart = dates.min(end, dates.max(start, rangeStart))
-      rangeEnd = dates.min(end, dates.max(start, rangeEnd))
+    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))
 
       const rangeStartMin = positionFromDate(rangeStart)
       const rangeEndMin = positionFromDate(rangeEnd)
@@ -141,5 +141,12 @@ export function getSlotMetrics({ min: start, max: end, step, timeslots }) {
         endDate: rangeEnd,
       }
     },
+
+    getCurrentTimePosition(rangeStart) {
+      const rangeStartMin = positionFromDate(rangeStart)
+      const top = (rangeStartMin / (step * numSlots)) * 100
+
+      return top
+    },
   }
 }