fix safeComputeTop, wont include nowindicator when offscreen

fullcalendar · Apr 8, 2020 · 933eeff · 933eeff
1 parent d044bcd
commit 933eeff
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/packages/core/src/DateProfileGenerator.ts b/packages/core/src/DateProfileGenerator.ts
@@ -8,7 +8,7 @@ import { computeVisibleDayRange } from './util/misc'
 
 
 export interface DateProfile {
-  currentRange: DateRange
+  currentRange: DateRange // TODO: does this include slotMinTime/slotMaxTime?
   currentRangeUnit: string
   isRangeAllDay: boolean
   validRange: OpenDateRange

diff --git a/packages/timegrid/src/TimeColsSlatsCoords.ts b/packages/timegrid/src/TimeColsSlatsCoords.ts
@@ -12,9 +12,19 @@ export default class TimeColsSlatsCoords {
   }
 
 
-  safeComputeTop(date: DateMarker) {
-    if (rangeContainsMarker(this.dateProfile.currentRange, date)) {
-      return this.computeDateTop(date)
+  safeComputeTop(date: DateMarker) { // TODO: DRY with computeDateTop
+    let { dateProfile } = this
+
+    if (rangeContainsMarker(dateProfile.currentRange, date)) {
+      let startOfDayDate = startOfDay(date)
+      let timeMs = date.valueOf() - startOfDayDate.valueOf()
+
+      if (
+        timeMs >= asRoughMs(dateProfile.slotMinTime) &&
+        timeMs < asRoughMs(dateProfile.slotMaxTime)
+      ) {
+        return this.computeTimeTop(createDuration(timeMs))
+      }
     }
   }