@fullcalendar/core 6.1.15 → 6.1.17

package/index.cjs

@@ -462,6 +462,25 @@ function reduceViewType(viewType, action) {
     return viewType;
 }
 
+function reduceCurrentDate(currentDate, action) {
+    switch (action.type) {
+        case 'CHANGE_DATE':
+            return action.dateMarker;
+        default:
+            return currentDate;
+    }
+}
+// should be initialized once and stay constant
+// this will change too
+function getInitialDate(options, dateEnv, nowManager) {
+    let initialDateInput = options.initialDate;
+    // compute the initial ambig-timezone date
+    if (initialDateInput != null) {
+        return dateEnv.createMarker(initialDateInput);
+    }
+    return nowManager.getDateMarker();
+}
+
 function reduceDynamicOptionOverrides(dynamicOptionOverrides, action) {
     switch (action.type) {
         case 'SET_OPTION':
@@ -971,6 +990,7 @@ let recurring = {
                 endTime: refined.endTime || null,
                 startRecur: refined.startRecur ? dateEnv.createMarker(refined.startRecur) : null,
                 endRecur: refined.endRecur ? dateEnv.createMarker(refined.endRecur) : null,
+                dateEnv,
             };
             let duration;
             if (refined.duration) {
@@ -990,7 +1010,7 @@ let recurring = {
     expand(typeData, framingRange, dateEnv) {
         let clippedFramingRange = internalCommon.intersectRanges(framingRange, { start: typeData.startRecur, end: typeData.endRecur });
         if (clippedFramingRange) {
-            return expandRanges(typeData.daysOfWeek, typeData.startTime, clippedFramingRange, dateEnv);
+            return expandRanges(typeData.daysOfWeek, typeData.startTime, typeData.dateEnv, dateEnv, clippedFramingRange);
         }
         return [];
     },
@@ -1000,7 +1020,7 @@ const simpleRecurringEventsPlugin = createPlugin({
     recurringTypes: [recurring],
     eventRefiners: SIMPLE_RECURRING_REFINERS,
 });
-function expandRanges(daysOfWeek, startTime, framingRange, dateEnv) {
+function expandRanges(daysOfWeek, startTime, eventDateEnv, calendarDateEnv, framingRange) {
     let dowHash = daysOfWeek ? internalCommon.arrayToHash(daysOfWeek) : null;
     let dayMarker = internalCommon.startOfDay(framingRange.start);
     let endMarker = framingRange.end;
@@ -1010,12 +1030,12 @@ function expandRanges(daysOfWeek, startTime, framingRange, dateEnv) {
         // if everyday, or this particular day-of-week
         if (!dowHash || dowHash[dayMarker.getUTCDay()]) {
             if (startTime) {
-                instanceStart = dateEnv.add(dayMarker, startTime);
+                instanceStart = calendarDateEnv.add(dayMarker, startTime);
             }
             else {
                 instanceStart = dayMarker;
             }
-            instanceStarts.push(instanceStart);
+            instanceStarts.push(calendarDateEnv.createMarker(eventDateEnv.toDate(instanceStart)));
         }
         dayMarker = internalCommon.addDays(dayMarker, 1);
     }
@@ -1180,6 +1200,49 @@ function buildTitleFormat(dateProfile) {
     return { year: 'numeric', month: 'long', day: 'numeric' };
 }
 
+/*
+TODO: test switching timezones when NO timezone plugin
+*/
+class CalendarNowManager {
+    constructor() {
+        this.resetListeners = new Set();
+    }
+    handleInput(dateEnv, // will change if timezone setup changed
+    nowInput) {
+        const oldDateEnv = this.dateEnv;
+        if (dateEnv !== oldDateEnv) {
+            if (typeof nowInput === 'function') {
+                this.nowFn = nowInput;
+            }
+            else if (!oldDateEnv) { // first time?
+                this.nowAnchorDate = dateEnv.toDate(nowInput
+                    ? dateEnv.createMarker(nowInput)
+                    : dateEnv.createNowMarker());
+                this.nowAnchorQueried = Date.now();
+            }
+            this.dateEnv = dateEnv;
+            // not first time? fire reset handlers
+            if (oldDateEnv) {
+                for (const resetListener of this.resetListeners.values()) {
+                    resetListener();
+                }
+            }
+        }
+    }
+    getDateMarker() {
+        return this.nowAnchorDate
+            ? this.dateEnv.timestampToMarker(this.nowAnchorDate.valueOf() +
+                (Date.now() - this.nowAnchorQueried))
+            : this.dateEnv.createMarker(this.nowFn());
+    }
+    addResetListener(handler) {
+        this.resetListeners.add(handler);
+    }
+    removeResetListener(handler) {
+        this.resetListeners.delete(handler);
+    }
+}
+
 // in future refactor, do the redux-style function(state=initial) for initial-state
 // also, whatever is happening in constructor, have it happen in action queue too
 class CalendarDataManager {
@@ -1199,6 +1262,7 @@ class CalendarDataManager {
         this.buildEventUiBases = internalCommon.memoize(buildEventUiBases);
         this.parseContextBusinessHours = internalCommon.memoizeObjArg(parseContextBusinessHours);
         this.buildTitle = internalCommon.memoize(buildTitle);
+        this.nowManager = new CalendarNowManager();
         this.emitter = new internalCommon.Emitter();
         this.actionRunner = new TaskRunner(this._handleAction.bind(this), this.updateData.bind(this));
         this.currentCalendarOptionsInput = {};
@@ -1214,6 +1278,7 @@ class CalendarDataManager {
         };
         this.props = props;
         this.actionRunner.pause();
+        this.nowManager = new CalendarNowManager();
         let dynamicOptionOverrides = {};
         let optionsData = this.computeOptionsData(props.optionOverrides, dynamicOptionOverrides, props.calendarApi);
         let currentViewType = optionsData.calendarOptions.initialView || optionsData.pluginHooks.initialView;
@@ -1223,12 +1288,8 @@ class CalendarDataManager {
         props.calendarApi.currentDataManager = this;
         this.emitter.setThisContext(props.calendarApi);
         this.emitter.setOptions(currentViewData.options);
-        let currentDate = internalCommon.getInitialDate(optionsData.calendarOptions, optionsData.dateEnv);
-        let dateProfile = currentViewData.dateProfileGenerator.build(currentDate);
-        if (!internalCommon.rangeContainsMarker(dateProfile.activeRange, currentDate)) {
-            currentDate = dateProfile.currentRange.start;
-        }
         let calendarContext = {
+            nowManager: this.nowManager,
             dateEnv: optionsData.dateEnv,
             options: optionsData.calendarOptions,
             pluginHooks: optionsData.pluginHooks,
@@ -1237,6 +1298,11 @@ class CalendarDataManager {
             emitter: this.emitter,
             getCurrentData: this.getCurrentData,
         };
+        let currentDate = getInitialDate(optionsData.calendarOptions, optionsData.dateEnv, this.nowManager);
+        let dateProfile = currentViewData.dateProfileGenerator.build(currentDate);
+        if (!internalCommon.rangeContainsMarker(dateProfile.activeRange, currentDate)) {
+            currentDate = dateProfile.currentRange.start;
+        }
         // needs to be after setThisContext
         for (let callback of optionsData.pluginHooks.contextInit) {
             callback(calendarContext);
@@ -1297,6 +1363,7 @@ class CalendarDataManager {
         emitter.setThisContext(props.calendarApi);
         emitter.setOptions(currentViewData.options);
         let calendarContext = {
+            nowManager: this.nowManager,
             dateEnv: optionsData.dateEnv,
             options: optionsData.calendarOptions,
             pluginHooks: optionsData.pluginHooks,
@@ -1309,7 +1376,7 @@ class CalendarDataManager {
         if (this.data && this.data.dateProfileGenerator !== currentViewData.dateProfileGenerator) { // hack
             dateProfile = currentViewData.dateProfileGenerator.build(currentDate);
         }
-        currentDate = internalCommon.reduceCurrentDate(currentDate, action);
+        currentDate = reduceCurrentDate(currentDate, action);
         dateProfile = reduceDateProfile(dateProfile, action, currentDate, currentViewData.dateProfileGenerator);
         if (action.type === 'PREV' || // TODO: move this logic into DateProfileGenerator
             action.type === 'NEXT' || // "
@@ -1364,7 +1431,7 @@ class CalendarDataManager {
         let oldData = this.data;
         let optionsData = this.computeOptionsData(props.optionOverrides, state.dynamicOptionOverrides, props.calendarApi);
         let currentViewData = this.computeCurrentViewData(state.currentViewType, optionsData, props.optionOverrides, state.dynamicOptionOverrides);
-        let data = this.data = Object.assign(Object.assign(Object.assign({ viewTitle: this.buildTitle(state.dateProfile, currentViewData.options, optionsData.dateEnv), calendarApi: props.calendarApi, dispatch: this.dispatch, emitter: this.emitter, getCurrentData: this.getCurrentData }, optionsData), currentViewData), state);
+        let data = this.data = Object.assign(Object.assign(Object.assign({ nowManager: this.nowManager, viewTitle: this.buildTitle(state.dateProfile, currentViewData.options, optionsData.dateEnv), calendarApi: props.calendarApi, dispatch: this.dispatch, emitter: this.emitter, getCurrentData: this.getCurrentData }, optionsData), currentViewData), state);
         let changeHandlers = optionsData.pluginHooks.optionChangeHandlers;
         let oldCalendarOptions = oldData && oldData.calendarOptions;
         let newCalendarOptions = optionsData.calendarOptions;
@@ -1472,8 +1539,10 @@ class CalendarDataManager {
         }
         let { refinedOptions, extra } = this.processRawViewOptions(viewSpec, optionsData.pluginHooks, optionsData.localeDefaults, optionOverrides, dynamicOptionOverrides);
         warnUnknownOptions(extra);
+        this.nowManager.handleInput(optionsData.dateEnv, refinedOptions.now);
         let dateProfileGenerator = this.buildDateProfileGenerator({
             dateProfileGeneratorClass: viewSpec.optionDefaults.dateProfileGeneratorClass,
+            nowManager: this.nowManager,
             duration: viewSpec.duration,
             durationUnit: viewSpec.durationUnit,
             usesMinMaxTime: viewSpec.optionDefaults.usesMinMaxTime,
@@ -1487,7 +1556,6 @@ class CalendarDataManager {
             dateIncrement: refinedOptions.dateIncrement,
             hiddenDays: refinedOptions.hiddenDays,
             weekends: refinedOptions.weekends,
-            nowInput: refinedOptions.now,
             validRangeInput: refinedOptions.validRange,
             visibleRangeInput: refinedOptions.visibleRange,
             fixedWeekCount: refinedOptions.fixedWeekCount,
@@ -1891,8 +1959,6 @@ class CalendarContent extends internalCommon.PureComponent {
     render() {
         let { props } = this;
         let { toolbarConfig, options } = props;
-        let toolbarProps = this.buildToolbarProps(props.viewSpec, props.dateProfile, props.dateProfileGenerator, props.currentDate, internalCommon.getNow(props.options.now, props.dateEnv), // TODO: use NowTimer????
-        props.viewTitle);
         let viewVGrow = false;
         let viewHeight = '';
         let viewAspectRatio;
@@ -1908,16 +1974,20 @@ class CalendarContent extends internalCommon.PureComponent {
         else {
             viewAspectRatio = Math.max(options.aspectRatio, 0.5); // prevent from getting too tall
         }
-        let viewContext = this.buildViewContext(props.viewSpec, props.viewApi, props.options, props.dateProfileGenerator, props.dateEnv, props.theme, props.pluginHooks, props.dispatch, props.getCurrentData, props.emitter, props.calendarApi, this.registerInteractiveComponent, this.unregisterInteractiveComponent);
+        let viewContext = this.buildViewContext(props.viewSpec, props.viewApi, props.options, props.dateProfileGenerator, props.dateEnv, props.nowManager, props.theme, props.pluginHooks, props.dispatch, props.getCurrentData, props.emitter, props.calendarApi, this.registerInteractiveComponent, this.unregisterInteractiveComponent);
         let viewLabelId = (toolbarConfig.header && toolbarConfig.header.hasTitle)
             ? this.state.viewLabelId
             : undefined;
         return (preact.createElement(internalCommon.ViewContextType.Provider, { value: viewContext },
-            toolbarConfig.header && (preact.createElement(Toolbar, Object.assign({ ref: this.headerRef, extraClassName: "fc-header-toolbar", model: toolbarConfig.header, titleId: viewLabelId }, toolbarProps))),
-            preact.createElement(ViewHarness, { liquid: viewVGrow, height: viewHeight, aspectRatio: viewAspectRatio, labeledById: viewLabelId },
-                this.renderView(props),
-                this.buildAppendContent()),
-            toolbarConfig.footer && (preact.createElement(Toolbar, Object.assign({ ref: this.footerRef, extraClassName: "fc-footer-toolbar", model: toolbarConfig.footer, titleId: "" }, toolbarProps)))));
+            preact.createElement(internalCommon.NowTimer, { unit: "day" }, (nowDate) => {
+                let toolbarProps = this.buildToolbarProps(props.viewSpec, props.dateProfile, props.dateProfileGenerator, props.currentDate, nowDate, props.viewTitle);
+                return (preact.createElement(preact.Fragment, null,
+                    toolbarConfig.header && (preact.createElement(Toolbar, Object.assign({ ref: this.headerRef, extraClassName: "fc-header-toolbar", model: toolbarConfig.header, titleId: viewLabelId }, toolbarProps))),
+                    preact.createElement(ViewHarness, { liquid: viewVGrow, height: viewHeight, aspectRatio: viewAspectRatio, labeledById: viewLabelId },
+                        this.renderView(props),
+                        this.buildAppendContent()),
+                    toolbarConfig.footer && (preact.createElement(Toolbar, Object.assign({ ref: this.footerRef, extraClassName: "fc-footer-toolbar", model: toolbarConfig.footer, titleId: "" }, toolbarProps)))));
+            })));
     }
     componentDidMount() {
         let { props } = this;
@@ -2139,7 +2209,7 @@ function sliceEvents(props, allDay) {
     return internalCommon.sliceEventStore(props.eventStore, props.eventUiBases, props.dateProfile.activeRange, allDay ? props.nextDayThreshold : null).fg;
 }
 
-const version = '6.1.15';
+const version = '6.1.17';
 
 exports.JsonRequestError = internalCommon.JsonRequestError;
 exports.Calendar = Calendar;