scrollToTime method honors a whole duration, not just a time. closes #…

…4935
fullcalendar · Aug 7, 2019 · 0f11db3 · 0f11db3
1 parent 973f28f
commit 0f11db3
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 next
 ----
 
+- scrollToTime method honors a whole duration, not just a time (#4935)
 - some background events wouldn't recieve eventClick or hovering (#3148, #4750)
 - fix infinite recursion when custom view type is itself (#4198)
 - respect firstDay setting when weekNumberCalculation set to ISO (#4734)

diff --git a/packages-premium b/packages-premium
diff --git a/packages/core/src/Calendar.ts b/packages/core/src/Calendar.ts
@@ -1280,10 +1280,10 @@ export default class Calendar {
   // -----------------------------------------------------------------------------------------------------------------
 
   scrollToTime(timeInput: DurationInput) {
-    let time = createDuration(timeInput)
+    let duration = createDuration(timeInput)
 
-    if (time) {
-      this.component.view.scrollToTime(time)
+    if (duration) {
+      this.component.view.scrollToDuration(duration)
     }
   }
 

diff --git a/packages/core/src/View.ts b/packages/core/src/View.ts
@@ -155,7 +155,7 @@ export default abstract class View extends DateComponent<ViewProps> {
   renderDatesWrap(dateProfile: DateProfile) {
     this.renderDates(dateProfile)
     this.addScroll({
-      timeMs: createDuration(this.opt('scrollTime')).milliseconds
+      duration: createDuration(this.opt('scrollTime'))
     })
     this.startNowIndicator(dateProfile) // shouldn't render yet because updateSize will be called soon
   }
@@ -405,13 +405,13 @@ export default abstract class View extends DateComponent<ViewProps> {
 
 
   applyScroll(scroll, isResize: boolean) {
-    let { timeMs } = scroll
+    let { duration } = scroll
 
-    if (timeMs != null) {
-      delete scroll.timeMs
+    if (duration != null) {
+      delete scroll.duration
 
       if (this.props.dateProfile) { // dates rendered yet?
-        __assign(scroll, this.computeDateScroll(timeMs))
+        __assign(scroll, this.computeDateScroll(duration))
       }
     }
 
@@ -421,7 +421,7 @@ export default abstract class View extends DateComponent<ViewProps> {
   }
 
 
-  computeDateScroll(timeMs: number) {
+  computeDateScroll(duration: Duration) {
     return {} // subclasses must implement
   }
 
@@ -437,10 +437,8 @@ export default abstract class View extends DateComponent<ViewProps> {
 
 
   // for API
-  scrollToTime(time: Duration) {
-    this.applyScroll({
-      timeMs: time.milliseconds
-    }, false)
+  scrollToDuration(duration: Duration) {
+    this.applyScroll({ duration }, false)
   }
 
 }

diff --git a/packages/daygrid/src/AbstractDayGridView.ts b/packages/daygrid/src/AbstractDayGridView.ts
@@ -12,7 +12,8 @@ import {
   buildGotoAnchorHtml,
   ComponentContext,
   ViewSpec,
-  DateProfileGenerator
+  DateProfileGenerator,
+  Duration
 } from '@fullcalendar/core'
 import DayGridDateProfileGenerator from './DayGridDateProfileGenerator'
 import DayGrid from './DayGrid'
@@ -243,7 +244,7 @@ export default abstract class DayGridView extends View {
   ------------------------------------------------------------------------------------------------------------------*/
 
 
-  computeDateScroll(timeMs: number) {
+  computeDateScroll(duration: Duration) {
     return { top: 0 }
   }
 

diff --git a/packages/timegrid/src/AbstractTimeGridView.ts b/packages/timegrid/src/AbstractTimeGridView.ts
@@ -5,7 +5,7 @@ import {
   View, ViewSpec, DateProfileGenerator,
   ComponentContext,
   createFormatter, diffDays,
-  buildGotoAnchorHtml, getAllDayHtml
+  buildGotoAnchorHtml, getAllDayHtml, Duration
 } from '@fullcalendar/core'
 import { DayGrid } from '@fullcalendar/daygrid'
 import TimeGrid from './TimeGrid'
@@ -248,8 +248,8 @@ export default abstract class TimeGridView extends View {
 
 
   // Computes the initial pre-configured scroll state prior to allowing the user to change it
-  computeDateScroll(timeMs: number) {
-    let top = this.timeGrid.computeTimeTop(timeMs)
+  computeDateScroll(duration: Duration) {
+    let top = this.timeGrid.computeTimeTop(duration)
 
     // zoom can give weird floating-point values. rather scroll a little bit further
     top = Math.ceil(top)

diff --git a/packages/timegrid/src/TimeGrid.ts b/packages/timegrid/src/TimeGrid.ts
@@ -573,15 +573,15 @@ export default class TimeGrid extends DateComponent<TimeGridProps> {
     if (!startOfDayDate) {
       startOfDayDate = startOfDay(when)
     }
-    return this.computeTimeTop(when.valueOf() - startOfDayDate.valueOf())
+    return this.computeTimeTop(createDuration(when.valueOf() - startOfDayDate.valueOf()))
   }
 
 
   // Computes the top coordinate, relative to the bounds of the grid, of the given time (a Duration).
-  computeTimeTop(timeMs: number) {
+  computeTimeTop(duration: Duration) {
     let len = this.slatEls.length
     let dateProfile = this.props.dateProfile
-    let slatCoverage = (timeMs - asRoughMs(dateProfile.minTime)) / asRoughMs(this.slotDuration) // floating-point value of # of slots covered
+    let slatCoverage = (duration.milliseconds - asRoughMs(dateProfile.minTime)) / asRoughMs(this.slotDuration) // floating-point value of # of slots covered
     let slatIndex
     let slatRemainder