@fullcalendar/core 6.1.17 → 6.1.19

package/index.cjs

@@ -1025,6 +1025,17 @@ function expandRanges(daysOfWeek, startTime, eventDateEnv, calendarDateEnv, fram
     let dayMarker = internalCommon.startOfDay(framingRange.start);
     let endMarker = framingRange.end;
     let instanceStarts = [];
+    // https://github.com/fullcalendar/fullcalendar/issues/7934
+    if (startTime) {
+        if (startTime.milliseconds < 0) {
+            // possible for next-day to have negative business hours that go into current day
+            endMarker = internalCommon.addDays(endMarker, 1);
+        }
+        else if (startTime.milliseconds >= 1000 * 60 * 60 * 24) {
+            // possible for prev-day to have >24hr business hours that go into current day
+            dayMarker = internalCommon.addDays(dayMarker, -1);
+        }
+    }
     while (dayMarker < endMarker) {
         let instanceStart;
         // if everyday, or this particular day-of-week
@@ -2209,7 +2220,7 @@ function sliceEvents(props, allDay) {
     return internalCommon.sliceEventStore(props.eventStore, props.eventUiBases, props.dateProfile.activeRange, allDay ? props.nextDayThreshold : null).fg;
 }
 
-const version = '6.1.17';
+const version = '6.1.19';
 
 exports.JsonRequestError = internalCommon.JsonRequestError;
 exports.Calendar = Calendar;

package/index.global.js

@@ -1,5 +1,5 @@
 /*!
-FullCalendar Core v6.1.17
+FullCalendar Core v6.1.19
 Docs & License: https://fullcalendar.io
 (c) 2024 Adam Shaw
 */
@@ -672,6 +672,25 @@ var FullCalendar = (function (exports) {
         if (oldProps === newProps) {
             return true;
         }
+        // if (debug) {
+        //   for (let key in newProps) {
+        //     if (key in oldProps && isObjValsEqual(oldProps[key], newProps[key], equalityFuncs[key])) {
+        //       // equal
+        //     } else {
+        //       if (debug) {
+        //         console.log('prop difference', key, oldProps[key], newProps[key])
+        //       }
+        //     }
+        //   }
+        //   // check for props that were omitted in the new
+        //   for (let key in oldProps) {
+        //     if (!(key in newProps)) {
+        //       if (debug) {
+        //         console.log('prop absent', key)
+        //       }
+        //     }
+        //   }
+        // }
         for (let key in newProps) {
             if (key in oldProps && isObjValsEqual(oldProps[key], newProps[key], equalityFuncs[key])) ;
             else {
@@ -1446,6 +1465,7 @@ var FullCalendar = (function (exports) {
         viewDidMount: identity,
         viewWillUnmount: identity,
         nowIndicator: Boolean,
+        nowIndicatorSnap: identity,
         nowIndicatorClassNames: identity,
         nowIndicatorContent: identity,
         nowIndicatorDidMount: identity,
@@ -1628,6 +1648,7 @@ var FullCalendar = (function (exports) {
         eventMinWidth: 30,
         eventShortHeight: 30,
         monthStartFormat: { month: 'long', day: 'numeric' },
+        nowIndicatorSnap: 'auto',
     };
     // calendar listeners
     // ------------------
@@ -3172,13 +3193,14 @@ var FullCalendar = (function (exports) {
 
     /* eslint max-classes-per-file: off */
     class PureComponent extends x$1 {
+        // debug: boolean
         shouldComponentUpdate(nextProps, nextState) {
-            if (this.debug) {
-                // eslint-disable-next-line no-console
-                console.log(getUnequalProps(nextProps, this.props), getUnequalProps(nextState, this.state));
-            }
-            return !compareObjs(this.props, nextProps, this.propEquality) ||
-                !compareObjs(this.state, nextState, this.stateEquality);
+            const shouldUpdate = !compareObjs(this.props, nextProps, this.propEquality /*, this.debug */) ||
+                !compareObjs(this.state, nextState, this.stateEquality /*, this.debug */);
+            // if (this.debug && shouldUpdate) {
+            //   console.log('shouldUpdate!')
+            // }
+            return shouldUpdate;
         }
         // HACK for freakin' React StrictMode
         safeSetState(newState) {
@@ -5469,14 +5491,30 @@ var FullCalendar = (function (exports) {
         computeTiming() {
             let { props, context } = this;
             let unroundedNow = context.nowManager.getDateMarker();
-            let currentUnitStart = context.dateEnv.startOf(unroundedNow, props.unit);
-            let nextUnitStart = context.dateEnv.add(currentUnitStart, createDuration(1, props.unit));
-            let waitMs = nextUnitStart.valueOf() - unroundedNow.valueOf();
+            let { nowIndicatorSnap } = context.options;
+            if (nowIndicatorSnap === 'auto') {
+                nowIndicatorSnap =
+                    // large unit?
+                    /year|month|week|day/.test(props.unit) ||
+                        // if slotDuration 30 mins for example, would NOT appear to snap (legacy behavior)
+                        (props.unitValue || 1) === 1;
+            }
+            let nowDate;
+            let waitMs;
+            if (nowIndicatorSnap) {
+                nowDate = context.dateEnv.startOf(unroundedNow, props.unit); // aka currentUnitStart
+                let nextUnitStart = context.dateEnv.add(nowDate, createDuration(1, props.unit));
+                waitMs = nextUnitStart.valueOf() - unroundedNow.valueOf();
+            }
+            else {
+                nowDate = unroundedNow;
+                waitMs = 1000 * 60; // 1 minute
+            }
             // there is a max setTimeout ms value (https://stackoverflow.com/a/3468650/96342)
             // ensure no longer than a day
             waitMs = Math.min(1000 * 60 * 60 * 24, waitMs);
             return {
-                state: { nowDate: currentUnitStart, todayRange: buildDayRange(currentUnitStart) },
+                state: { nowDate, todayRange: buildDayRange(nowDate) },
                 waitMs,
             };
         }
@@ -6622,8 +6660,11 @@ var FullCalendar = (function (exports) {
     class EventContainer extends BaseComponent {
         constructor() {
             super(...arguments);
+            // memo
+            this.buildPublicEvent = memoize((context, eventDef, eventInstance) => new EventImpl(context, eventDef, eventInstance));
             this.handleEl = (el) => {
                 this.el = el;
+                setRef(this.props.elRef, el);
                 if (el) {
                     setElSeg(el, this.props.seg);
                 }
@@ -6636,7 +6677,7 @@ var FullCalendar = (function (exports) {
             const { eventRange } = seg;
             const { ui } = eventRange;
             const renderProps = {
-                event: new EventImpl(context, eventRange.def, eventRange.instance),
+                event: this.buildPublicEvent(context, eventRange.def, eventRange.instance),
                 view: context.viewApi,
                 timeText: props.timeText,
                 textColor: ui.textColor,
@@ -6655,11 +6696,11 @@ var FullCalendar = (function (exports) {
                 isDragging: Boolean(props.isDragging),
                 isResizing: Boolean(props.isResizing),
             };
-            return (y(ContentContainer, Object.assign({}, props /* contains children */, { elRef: this.handleEl, elClasses: [
+            return (y(ContentContainer, { elRef: this.handleEl, elTag: props.elTag, elAttrs: props.elAttrs, elClasses: [
                     ...getEventClassNames(renderProps),
                     ...seg.eventRange.ui.classNames,
                     ...(props.elClasses || []),
-                ], renderProps: renderProps, generatorName: "eventContent", customGenerator: options.eventContent, defaultGenerator: props.defaultGenerator, classNameGenerator: options.eventClassNames, didMount: options.eventDidMount, willUnmount: options.eventWillUnmount })));
+                ], elStyle: props.elStyle, renderProps: renderProps, generatorName: "eventContent", customGenerator: options.eventContent, defaultGenerator: props.defaultGenerator, classNameGenerator: options.eventClassNames, didMount: options.eventDidMount, willUnmount: options.eventWillUnmount }, props.children));
         }
         componentDidUpdate(prevProps) {
             if (this.el && this.props.seg !== prevProps.seg) {
@@ -6686,6 +6727,9 @@ var FullCalendar = (function (exports) {
                 Boolean(eventContentArg.isEndResizable) && (y("div", { className: "fc-event-resizer fc-event-resizer-end" }))))));
         }
     }
+    StandardEvent.addPropsEquality({
+        seg: isPropsEqual,
+    });
     function renderInnerContent$1(innerProps) {
         return (y("div", { className: "fc-event-main-frame" },
             innerProps.timeText && (y("div", { className: "fc-event-time" }, innerProps.timeText)),
@@ -6700,7 +6744,7 @@ var FullCalendar = (function (exports) {
             date: context.dateEnv.toDate(props.date),
             view: context.viewApi,
         };
-        return (y(ContentContainer, Object.assign({}, props /* includes children */, { elTag: props.elTag || 'div', renderProps: renderProps, generatorName: "nowIndicatorContent", customGenerator: options.nowIndicatorContent, classNameGenerator: options.nowIndicatorClassNames, didMount: options.nowIndicatorDidMount, willUnmount: options.nowIndicatorWillUnmount })));
+        return (y(ContentContainer, { elRef: props.elRef, elTag: props.elTag || 'div', elAttrs: props.elAttrs, elClasses: props.elClasses, elStyle: props.elStyle, renderProps: renderProps, generatorName: "nowIndicatorContent", customGenerator: options.nowIndicatorContent, classNameGenerator: options.nowIndicatorClassNames, didMount: options.nowIndicatorDidMount, willUnmount: options.nowIndicatorWillUnmount }, props.children));
     }));
 
     const DAY_NUM_FORMAT = createFormatter({ day: 'numeric' });
@@ -6723,12 +6767,12 @@ var FullCalendar = (function (exports) {
                 dateEnv: context.dateEnv,
                 monthStartFormat: options.monthStartFormat,
             });
-            return (y(ContentContainer, Object.assign({}, props /* includes children */, { elClasses: [
+            return (y(ContentContainer, { elRef: props.elRef, elTag: props.elTag, elAttrs: Object.assign(Object.assign({}, props.elAttrs), (renderProps.isDisabled ? {} : { 'data-date': formatDayString(props.date) })), elClasses: [
                     ...getDayClassNames(renderProps, context.theme),
                     ...(props.elClasses || []),
-                ], elAttrs: Object.assign(Object.assign({}, props.elAttrs), (renderProps.isDisabled ? {} : { 'data-date': formatDayString(props.date) })), renderProps: renderProps, generatorName: "dayCellContent", customGenerator: options.dayCellContent, defaultGenerator: props.defaultGenerator, classNameGenerator: 
+                ], elStyle: props.elStyle, renderProps: renderProps, generatorName: "dayCellContent", customGenerator: options.dayCellContent, defaultGenerator: props.defaultGenerator, classNameGenerator: 
                 // don't use custom classNames if disabled
-                renderProps.isDisabled ? undefined : options.dayCellClassNames, didMount: options.dayCellDidMount, willUnmount: options.dayCellWillUnmount })));
+                renderProps.isDisabled ? undefined : options.dayCellClassNames, didMount: options.dayCellDidMount, willUnmount: options.dayCellWillUnmount }, props.children));
         }
     }
     function hasCustomDayCellContent(options) {
@@ -6765,7 +6809,7 @@ var FullCalendar = (function (exports) {
         let text = dateEnv.format(date, format);
         let renderProps = { num, text, date };
         return (y(ContentContainer // why isn't WeekNumberContentArg being auto-detected?
-        , Object.assign({}, props /* includes children */, { renderProps: renderProps, generatorName: "weekNumberContent", customGenerator: options.weekNumberContent, defaultGenerator: renderInner, classNameGenerator: options.weekNumberClassNames, didMount: options.weekNumberDidMount, willUnmount: options.weekNumberWillUnmount })));
+        , { elRef: props.elRef, elTag: props.elTag, elAttrs: props.elAttrs, elClasses: props.elClasses, elStyle: props.elStyle, renderProps: renderProps, generatorName: "weekNumberContent", customGenerator: options.weekNumberContent, defaultGenerator: renderInner, classNameGenerator: options.weekNumberClassNames, didMount: options.weekNumberDidMount, willUnmount: options.weekNumberWillUnmount }, props.children));
     }));
     function renderInner(innerProps) {
         return innerProps.text;
@@ -7021,10 +7065,10 @@ var FullCalendar = (function (exports) {
             let { props, context } = this;
             let { options } = context;
             let renderProps = { view: context.viewApi };
-            return (y(ContentContainer, Object.assign({}, props, { elTag: props.elTag || 'div', elClasses: [
+            return (y(ContentContainer, { elRef: props.elRef, elTag: props.elTag || 'div', elAttrs: props.elAttrs, elClasses: [
                     ...buildViewClassNames(props.viewSpec),
                     ...(props.elClasses || []),
-                ], renderProps: renderProps, classNameGenerator: options.viewClassNames, generatorName: undefined, didMount: options.viewDidMount, willUnmount: options.viewWillUnmount }), () => props.children));
+                ], elStyle: props.elStyle, renderProps: renderProps, classNameGenerator: options.viewClassNames, generatorName: undefined, didMount: options.viewDidMount, willUnmount: options.viewWillUnmount }, () => props.children));
         }
     }
     function buildViewClassNames(viewSpec) {
@@ -8724,6 +8768,17 @@ var FullCalendar = (function (exports) {
         let dayMarker = startOfDay(framingRange.start);
         let endMarker = framingRange.end;
         let instanceStarts = [];
+        // https://github.com/fullcalendar/fullcalendar/issues/7934
+        if (startTime) {
+            if (startTime.milliseconds < 0) {
+                // possible for next-day to have negative business hours that go into current day
+                endMarker = addDays(endMarker, 1);
+            }
+            else if (startTime.milliseconds >= 1000 * 60 * 60 * 24) {
+                // possible for prev-day to have >24hr business hours that go into current day
+                dayMarker = addDays(dayMarker, -1);
+            }
+        }
         while (dayMarker < endMarker) {
             let instanceStart;
             // if everyday, or this particular day-of-week
@@ -9908,7 +9963,7 @@ var FullCalendar = (function (exports) {
         return sliceEventStore(props.eventStore, props.eventUiBases, props.dateProfile.activeRange, allDay ? props.nextDayThreshold : null).fg;
     }
 
-    const version = '6.1.17';
+    const version = '6.1.19';
 
     exports.Calendar = Calendar;
     exports.Internal = internal;