@fullcalendar/daygrid 5.7.2 → 5.10.1

package/main.cjs.js

@@ -1,5 +1,5 @@
 /*!
-FullCalendar v5.7.2
+FullCalendar v5.10.1
 Docs & License: https://fullcalendar.io/
 (c) 2021 Adam Shaw
 */
@@ -147,11 +147,9 @@ var TableCellTop = /** @class */ (function (_super) {
     }
     TableCellTop.prototype.render = function () {
         var props = this.props;
-        var navLinkAttrs = this.context.options.navLinks
-            ? { 'data-navlink': common.buildNavLinkData(props.date), tabIndex: 0 }
-            : {};
+        var navLinkAttrs = common.buildNavLinkAttrs(this.context, props.date);
         return (common.createElement(common.DayCellContent, { date: props.date, dateProfile: props.dateProfile, todayRange: props.todayRange, showDayNumber: props.showDayNumber, extraHookProps: props.extraHookProps, defaultContent: renderTopInner }, function (innerElRef, innerContent) { return ((innerContent || props.forceDayTop) && (common.createElement("div", { className: "fc-daygrid-day-top", ref: innerElRef },
-            common.createElement("a", tslib.__assign({ className: "fc-daygrid-day-number" }, navLinkAttrs), innerContent || common.createElement(common.Fragment, null, "\u00A0"))))); }));
+            common.createElement("a", tslib.__assign({ id: props.dayNumberId, className: "fc-daygrid-day-number" }, navLinkAttrs), innerContent || common.createElement(common.Fragment, null, "\u00A0"))))); }));
     };
     return TableCellTop;
 }(common.BaseComponent));
@@ -197,7 +195,7 @@ var TableListItemEvent = /** @class */ (function (_super) {
         var timeFormat = context.options.eventTimeFormat || DEFAULT_TABLE_EVENT_TIME_FORMAT;
         var timeText = common.buildSegTimeText(props.seg, timeFormat, context, true, props.defaultDisplayEventEnd);
         return (common.createElement(common.EventRoot, { seg: props.seg, timeText: timeText, defaultContent: renderInnerContent, isDragging: props.isDragging, isResizing: false, isDateSelecting: false, isSelected: props.isSelected, isPast: props.isPast, isFuture: props.isFuture, isToday: props.isToday }, function (rootElRef, classNames, innerElRef, innerContent) { return ( // we don't use styles!
-        common.createElement("a", tslib.__assign({ className: ['fc-daygrid-event', 'fc-daygrid-dot-event'].concat(classNames).join(' '), ref: rootElRef }, getSegAnchorAttrs(props.seg)), innerContent)); }));
+        common.createElement("a", tslib.__assign({ className: ['fc-daygrid-event', 'fc-daygrid-dot-event'].concat(classNames).join(' '), ref: rootElRef }, common.getSegAnchorAttrs(props.seg, context)), innerContent)); }));
     };
     return TableListItemEvent;
 }(common.BaseComponent));
@@ -207,10 +205,6 @@ function renderInnerContent(innerProps) {
         innerProps.timeText && (common.createElement("div", { className: "fc-event-time" }, innerProps.timeText)),
         common.createElement("div", { className: "fc-event-title" }, innerProps.event.title || common.createElement(common.Fragment, null, "\u00A0"))));
 }
-function getSegAnchorAttrs(seg) {
-    var url = seg.eventRange.def.url;
-    return url ? { href: url } : {};
-}
 
 var TableCellMoreLink = /** @class */ (function (_super) {
     tslib.__extends(TableCellMoreLink, _super);
@@ -232,7 +226,7 @@ var TableCellMoreLink = /** @class */ (function (_super) {
                             visibility: isForcedInvisible[instanceId] ? 'hidden' : '',
                         } }, hasListItemDisplay(seg) ? (common.createElement(TableListItemEvent, tslib.__assign({ seg: seg, isDragging: false, isSelected: instanceId === props.eventSelection, defaultDisplayEventEnd: false }, common.getSegMeta(seg, props.todayRange)))) : (common.createElement(TableBlockEvent, tslib.__assign({ seg: seg, isDragging: false, isResizing: false, isDateSelecting: false, isSelected: instanceId === props.eventSelection, defaultDisplayEventEnd: false }, common.getSegMeta(seg, props.todayRange))))));
                 })));
-            } }, function (rootElRef, classNames, innerElRef, innerContent, handleClick) { return (common.createElement("a", { ref: rootElRef, className: ['fc-daygrid-more-link'].concat(classNames).join(' '), onClick: handleClick }, innerContent)); }));
+            } }, function (rootElRef, classNames, innerElRef, innerContent, handleClick, title, isExpanded, popoverId) { return (common.createElement("a", tslib.__assign({ ref: rootElRef, className: ['fc-daygrid-more-link'].concat(classNames).join(' '), title: title, "aria-expanded": isExpanded, "aria-controls": popoverId }, common.createAriaClickAttrs(handleClick)), innerContent)); }));
     };
     return TableCellMoreLink;
 }(common.BaseComponent));
@@ -255,6 +249,9 @@ var TableCell = /** @class */ (function (_super) {
     function TableCell() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.rootElRef = common.createRef();
+        _this.state = {
+            dayNumberId: common.getUniqueDomId(),
+        };
         _this.handleRootEl = function (el) {
             common.setRef(_this.rootElRef, el);
             common.setRef(_this.props.elRef, el);
@@ -262,16 +259,13 @@ var TableCell = /** @class */ (function (_super) {
         return _this;
     }
     TableCell.prototype.render = function () {
-        var _a = this, props = _a.props, context = _a.context, rootElRef = _a.rootElRef;
-        var options = context.options;
+        var _a = this, context = _a.context, props = _a.props, state = _a.state, rootElRef = _a.rootElRef;
         var date = props.date, dateProfile = props.dateProfile;
-        var navLinkAttrs = options.navLinks
-            ? { 'data-navlink': common.buildNavLinkData(date, 'week'), tabIndex: 0 }
-            : {};
-        return (common.createElement(common.DayCellRoot, { date: date, dateProfile: dateProfile, todayRange: props.todayRange, showDayNumber: props.showDayNumber, extraHookProps: props.extraHookProps, elRef: this.handleRootEl }, function (dayElRef, dayClassNames, rootDataAttrs, isDisabled) { return (common.createElement("td", tslib.__assign({ ref: dayElRef, className: ['fc-daygrid-day'].concat(dayClassNames, props.extraClassNames || []).join(' ') }, rootDataAttrs, props.extraDataAttrs),
+        var navLinkAttrs = common.buildNavLinkAttrs(context, date, 'week');
+        return (common.createElement(common.DayCellRoot, { date: date, dateProfile: dateProfile, todayRange: props.todayRange, showDayNumber: props.showDayNumber, extraHookProps: props.extraHookProps, elRef: this.handleRootEl }, function (dayElRef, dayClassNames, rootDataAttrs, isDisabled) { return (common.createElement("td", tslib.__assign({ ref: dayElRef, role: "gridcell", className: ['fc-daygrid-day'].concat(dayClassNames, props.extraClassNames || []).join(' ') }, rootDataAttrs, props.extraDataAttrs, (props.showDayNumber ? { 'aria-labelledby': state.dayNumberId } : {})),
             common.createElement("div", { className: "fc-daygrid-day-frame fc-scrollgrid-sync-inner", ref: props.innerElRef /* different from hook system! RENAME */ },
                 props.showWeekNumber && (common.createElement(common.WeekNumberRoot, { date: date, defaultFormat: DEFAULT_WEEK_NUM_FORMAT }, function (weekElRef, weekClassNames, innerElRef, innerContent) { return (common.createElement("a", tslib.__assign({ ref: weekElRef, className: ['fc-daygrid-week-number'].concat(weekClassNames).join(' ') }, navLinkAttrs), innerContent)); })),
-                !isDisabled && (common.createElement(TableCellTop, { date: date, dateProfile: dateProfile, showDayNumber: props.showDayNumber, forceDayTop: props.forceDayTop, todayRange: props.todayRange, extraHookProps: props.extraHookProps })),
+                !isDisabled && (common.createElement(TableCellTop, { date: date, dateProfile: dateProfile, showDayNumber: props.showDayNumber, dayNumberId: state.dayNumberId, forceDayTop: props.forceDayTop, todayRange: props.todayRange, extraHookProps: props.extraHookProps })),
                 common.createElement("div", { className: "fc-daygrid-day-events", ref: props.fgContentElRef },
                     props.fgContent,
                     common.createElement("div", { className: "fc-daygrid-day-bottom", style: { marginTop: props.moreMarginTop } },
@@ -307,9 +301,11 @@ dayMaxEvents, dayMaxEventRows, strictOrder, eventInstanceHeights, maxContentHeig
         if (eventHeight != null) {
             segInputs.push({
                 index: i,
-                spanStart: seg.firstCol,
-                spanEnd: seg.lastCol + 1,
                 thickness: eventHeight,
+                span: {
+                    start: seg.firstCol,
+                    end: seg.lastCol + 1,
+                },
             });
         }
         else {
@@ -347,15 +343,16 @@ dayMaxEvents, dayMaxEventRows, strictOrder, eventInstanceHeights, maxContentHeig
     }
     for (var _b = 0, hiddenEntries_1 = hiddenEntries; _b < hiddenEntries_1.length; _b++) {
         var hiddenEntry = hiddenEntries_1[_b];
-        var seg = segs[hiddenEntry.segInput.index];
-        multiColPlacements[hiddenEntry.spanStart].push({
-            seg: seg,
+        var seg = segs[hiddenEntry.index];
+        var hiddenSpan = hiddenEntry.span;
+        multiColPlacements[hiddenSpan.start].push({
+            seg: resliceSeg(seg, hiddenSpan.start, hiddenSpan.end, cells),
             isVisible: false,
             isAbsolute: true,
             absoluteTop: 0,
             marginTop: 0,
         });
-        for (var col = hiddenEntry.spanStart; col < hiddenEntry.spanEnd; col += 1) {
+        for (var col = hiddenSpan.start; col < hiddenSpan.end; col += 1) {
             moreCnts[col] += 1;
             singleColPlacements[col].push({
                 seg: resliceSeg(seg, col, col + 1, cells),
@@ -386,12 +383,12 @@ function placeRects(allRects, segs, cells) {
         var currentMarginTop = 0;
         for (var _i = 0, rects_1 = rects; _i < rects_1.length; _i++) {
             var rect = rects_1[_i];
-            var seg = segs[rect.segInput.index];
+            var seg = segs[rect.index];
             singlePlacements.push({
                 seg: resliceSeg(seg, col, col + 1, cells),
                 isVisible: true,
                 isAbsolute: false,
-                absoluteTop: 0,
+                absoluteTop: rect.levelCoord,
                 marginTop: rect.levelCoord - currentHeight,
             });
             currentHeight = rect.levelCoord + rect.thickness;
@@ -402,16 +399,16 @@ function placeRects(allRects, segs, cells) {
         currentMarginTop = 0;
         for (var _a = 0, rects_2 = rects; _a < rects_2.length; _a++) {
             var rect = rects_2[_a];
-            var seg = segs[rect.segInput.index];
-            var isAbsolute = rect.spanEnd - rect.spanStart > 1; // multi-column?
-            var isFirstCol = rect.spanStart === col;
+            var seg = segs[rect.index];
+            var isAbsolute = rect.span.end - rect.span.start > 1; // multi-column?
+            var isFirstCol = rect.span.start === col;
             currentMarginTop += rect.levelCoord - currentHeight; // amount of space since bottom of previous seg
             currentHeight = rect.levelCoord + rect.thickness; // height will now be bottom of current seg
             if (isAbsolute) {
                 currentMarginTop += rect.thickness;
                 if (isFirstCol) {
                     multiPlacements.push({
-                        seg: resliceSeg(seg, rect.spanStart, rect.spanEnd, cells),
+                        seg: resliceSeg(seg, rect.span.start, rect.span.end, cells),
                         isVisible: true,
                         isAbsolute: true,
                         absoluteTop: rect.levelCoord,
@@ -421,10 +418,10 @@ function placeRects(allRects, segs, cells) {
             }
             else if (isFirstCol) {
                 multiPlacements.push({
-                    seg: resliceSeg(seg, rect.spanStart, rect.spanEnd, cells),
+                    seg: resliceSeg(seg, rect.span.start, rect.span.end, cells),
                     isVisible: true,
                     isAbsolute: false,
-                    absoluteTop: 0,
+                    absoluteTop: rect.levelCoord,
                     marginTop: currentMarginTop, // claim the margin
                 });
                 currentMarginTop = 0;
@@ -443,7 +440,7 @@ function groupRectsByEachCol(rects, colCnt) {
     }
     for (var _i = 0, rects_3 = rects; _i < rects_3.length; _i++) {
         var rect = rects_3[_i];
-        for (var col = rect.spanStart; col < rect.spanEnd; col += 1) {
+        for (var col = rect.span.start; col < rect.span.end; col += 1) {
             rectsByEachCol[col].push(rect);
         }
     }
@@ -489,25 +486,21 @@ var DayGridSegHierarchy = /** @class */ (function (_super) {
     };
     DayGridSegHierarchy.prototype.handleInvalidInsertion = function (insertion, entry, hiddenEntries) {
         var _a = this, entriesByLevel = _a.entriesByLevel, forceHidden = _a.forceHidden;
-        var level = insertion.nextLevel - 1;
-        if (this.hiddenConsumes && level >= 0) {
-            for (var lateral = insertion.lateralStart; lateral < insertion.lateralEnd; lateral += 1) {
-                var leadingEntry = entriesByLevel[level][lateral];
+        var touchingEntry = insertion.touchingEntry, touchingLevel = insertion.touchingLevel, touchingLateral = insertion.touchingLateral;
+        if (this.hiddenConsumes && touchingEntry) {
+            var touchingEntryId = common.buildEntryKey(touchingEntry);
+            // if not already hidden
+            if (!forceHidden[touchingEntryId]) {
                 if (this.allowReslicing) {
-                    var placeholderEntry = tslib.__assign(tslib.__assign({}, leadingEntry), { spanStart: Math.max(leadingEntry.spanStart, entry.spanStart), spanEnd: Math.min(leadingEntry.spanEnd, entry.spanEnd) });
+                    var placeholderEntry = tslib.__assign(tslib.__assign({}, touchingEntry), { span: common.intersectSpans(touchingEntry.span, entry.span) });
                     var placeholderEntryId = common.buildEntryKey(placeholderEntry);
-                    if (!forceHidden[placeholderEntryId]) {
-                        forceHidden[placeholderEntryId] = true;
-                        entriesByLevel[level][lateral] = placeholderEntry;
-                        this.splitEntry(leadingEntry, entry, hiddenEntries); // split up the leadingEntry
-                    }
+                    forceHidden[placeholderEntryId] = true;
+                    entriesByLevel[touchingLevel][touchingLateral] = placeholderEntry; // replace touchingEntry with our placeholder
+                    this.splitEntry(touchingEntry, entry, hiddenEntries); // split up the touchingEntry, reinsert it
                 }
                 else {
-                    var placeholderEntryId = common.buildEntryKey(leadingEntry);
-                    if (!forceHidden[placeholderEntryId]) {
-                        forceHidden[placeholderEntryId] = true;
-                        hiddenEntries.push(leadingEntry);
-                    }
+                    forceHidden[touchingEntryId] = true;
+                    hiddenEntries.push(touchingEntry);
                 }
             }
         }
@@ -546,7 +539,7 @@ var TableRow = /** @class */ (function (_super) {
          (props.eventDrag && props.eventDrag.affectedInstances) ||
             (props.eventResize && props.eventResize.affectedInstances) ||
             {};
-        return (common.createElement("tr", { ref: this.rootElRef },
+        return (common.createElement("tr", { ref: this.rootElRef, role: "row" },
             props.renderIntro && props.renderIntro(),
             props.cells.map(function (cell, col) {
                 var normalFgNodes = _this.renderFgSegs(col, props.forPrint ? singleColPlacements[col] : multiColPlacements[col], props.todayRange, isForcedInvisible);
@@ -664,9 +657,14 @@ var TableRow = /** @class */ (function (_super) {
                     });
                 }
             }
+            var oldInstanceHeights = this.state.eventInstanceHeights;
+            var newInstanceHeights = this.queryEventInstanceHeights();
             var limitByContentHeight = props.dayMaxEvents === true || props.dayMaxEventRows === true;
             this.setState({
-                eventInstanceHeights: this.queryEventInstanceHeights(),
+                // HACK to prevent oscillations of events being shown/hidden from max-event-rows
+                // Essentially, once you compute an element's height, never null-out.
+                // TODO: always display all events, as visibility:hidden?
+                eventInstanceHeights: tslib.__assign(tslib.__assign({}, oldInstanceHeights), newInstanceHeights),
                 maxContentHeight: limitByContentHeight ? this.computeMaxContentHeight() : null,
             });
         }
@@ -719,7 +717,7 @@ function buildAbsoluteTopHash(colPlacements) {
             topsByInstanceId[placement.seg.eventRange.instance.instanceId] = placement.absoluteTop;
         }
     }
-    return colPlacements;
+    return topsByInstanceId;
 }
 
 var Table = /** @class */ (function (_super) {
@@ -778,13 +776,13 @@ var Table = /** @class */ (function (_super) {
                 minWidth: props.tableMinWidth,
             } },
             common.createElement(common.NowTimer, { unit: "day" }, function (nowDate, todayRange) { return (common.createElement(common.Fragment, null,
-                common.createElement("table", { className: "fc-scrollgrid-sync-table", style: {
+                common.createElement("table", { role: "presentation", className: "fc-scrollgrid-sync-table", style: {
                         width: props.clientWidth,
                         minWidth: props.tableMinWidth,
                         height: expandRows ? props.clientHeight : '',
                     } },
                     props.colGroupNode,
-                    common.createElement("tbody", null, props.cells.map(function (cells, row) { return (common.createElement(TableRow, { ref: _this.rowRefs.createRef(row), key: cells.length
+                    common.createElement("tbody", { role: "presentation" }, props.cells.map(function (cells, row) { return (common.createElement(TableRow, { ref: _this.rowRefs.createRef(row), key: cells.length
                             ? cells[0].date.toISOString() /* best? or put key on cell? or use diff formatter? */
                             : row // in case there are no cells (like when resource view is loading)
                         , showDayNumbers: rowCnt > 1, showWeekNumbers: props.showWeekNumbers, todayRange: todayRange, dateProfile: dateProfile, cells: cells, renderIntro: props.renderRowIntro, businessHourSegs: businessHourSegsByRow[row], eventSelection: props.eventSelection, bgEventSegs: bgEventSegsByRow[row].filter(isSegAllDay) /* hack */, fgEventSegs: fgEventSegsByRow[row], dateSelectionSegs: dateSelectionSegsByRow[row], eventDrag: eventDragByRow[row], eventResize: eventResizeByRow[row], dayMaxEvents: dayMaxEvents, dayMaxEventRows: dayMaxEventRows, clientWidth: props.clientWidth, clientHeight: props.clientHeight, forPrint: props.forPrint })); }))))); })));

package/main.global.js

@@ -1,5 +1,5 @@
 /*!
-FullCalendar v5.7.2
+FullCalendar v5.10.1
 Docs & License: https://fullcalendar.io/
 (c) 2021 Adam Shaw
 */
@@ -48,10 +48,14 @@ var FullCalendarDayGrid = (function (exports, common) {
         return __assign.apply(this, arguments);
     };
 
-    function __spreadArray(to, from) {
-        for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-            to[j] = from[i];
-        return to;
+    function __spreadArray(to, from, pack) {
+        if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+            if (ar || !(i in from)) {
+                if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+                ar[i] = from[i];
+            }
+        }
+        return to.concat(ar || from);
     }
 
     /* An abstract class for the daygrid views, as well as month view. Renders one or more rows of day cells.
@@ -190,11 +194,9 @@ var FullCalendarDayGrid = (function (exports, common) {
         }
         TableCellTop.prototype.render = function () {
             var props = this.props;
-            var navLinkAttrs = this.context.options.navLinks
-                ? { 'data-navlink': common.buildNavLinkData(props.date), tabIndex: 0 }
-                : {};
+            var navLinkAttrs = common.buildNavLinkAttrs(this.context, props.date);
             return (common.createElement(common.DayCellContent, { date: props.date, dateProfile: props.dateProfile, todayRange: props.todayRange, showDayNumber: props.showDayNumber, extraHookProps: props.extraHookProps, defaultContent: renderTopInner }, function (innerElRef, innerContent) { return ((innerContent || props.forceDayTop) && (common.createElement("div", { className: "fc-daygrid-day-top", ref: innerElRef },
-                common.createElement("a", __assign({ className: "fc-daygrid-day-number" }, navLinkAttrs), innerContent || common.createElement(common.Fragment, null, "\u00A0"))))); }));
+                common.createElement("a", __assign({ id: props.dayNumberId, className: "fc-daygrid-day-number" }, navLinkAttrs), innerContent || common.createElement(common.Fragment, null, "\u00A0"))))); }));
         };
         return TableCellTop;
     }(common.BaseComponent));
@@ -240,7 +242,7 @@ var FullCalendarDayGrid = (function (exports, common) {
             var timeFormat = context.options.eventTimeFormat || DEFAULT_TABLE_EVENT_TIME_FORMAT;
             var timeText = common.buildSegTimeText(props.seg, timeFormat, context, true, props.defaultDisplayEventEnd);
             return (common.createElement(common.EventRoot, { seg: props.seg, timeText: timeText, defaultContent: renderInnerContent, isDragging: props.isDragging, isResizing: false, isDateSelecting: false, isSelected: props.isSelected, isPast: props.isPast, isFuture: props.isFuture, isToday: props.isToday }, function (rootElRef, classNames, innerElRef, innerContent) { return ( // we don't use styles!
-            common.createElement("a", __assign({ className: ['fc-daygrid-event', 'fc-daygrid-dot-event'].concat(classNames).join(' '), ref: rootElRef }, getSegAnchorAttrs(props.seg)), innerContent)); }));
+            common.createElement("a", __assign({ className: ['fc-daygrid-event', 'fc-daygrid-dot-event'].concat(classNames).join(' '), ref: rootElRef }, common.getSegAnchorAttrs(props.seg, context)), innerContent)); }));
         };
         return TableListItemEvent;
     }(common.BaseComponent));
@@ -250,10 +252,6 @@ var FullCalendarDayGrid = (function (exports, common) {
             innerProps.timeText && (common.createElement("div", { className: "fc-event-time" }, innerProps.timeText)),
             common.createElement("div", { className: "fc-event-title" }, innerProps.event.title || common.createElement(common.Fragment, null, "\u00A0"))));
     }
-    function getSegAnchorAttrs(seg) {
-        var url = seg.eventRange.def.url;
-        return url ? { href: url } : {};
-    }
 
     var TableCellMoreLink = /** @class */ (function (_super) {
         __extends(TableCellMoreLink, _super);
@@ -275,7 +273,7 @@ var FullCalendarDayGrid = (function (exports, common) {
                                 visibility: isForcedInvisible[instanceId] ? 'hidden' : '',
                             } }, hasListItemDisplay(seg) ? (common.createElement(TableListItemEvent, __assign({ seg: seg, isDragging: false, isSelected: instanceId === props.eventSelection, defaultDisplayEventEnd: false }, common.getSegMeta(seg, props.todayRange)))) : (common.createElement(TableBlockEvent, __assign({ seg: seg, isDragging: false, isResizing: false, isDateSelecting: false, isSelected: instanceId === props.eventSelection, defaultDisplayEventEnd: false }, common.getSegMeta(seg, props.todayRange))))));
                     })));
-                } }, function (rootElRef, classNames, innerElRef, innerContent, handleClick) { return (common.createElement("a", { ref: rootElRef, className: ['fc-daygrid-more-link'].concat(classNames).join(' '), onClick: handleClick }, innerContent)); }));
+                } }, function (rootElRef, classNames, innerElRef, innerContent, handleClick, title, isExpanded, popoverId) { return (common.createElement("a", __assign({ ref: rootElRef, className: ['fc-daygrid-more-link'].concat(classNames).join(' '), title: title, "aria-expanded": isExpanded, "aria-controls": popoverId }, common.createAriaClickAttrs(handleClick)), innerContent)); }));
         };
         return TableCellMoreLink;
     }(common.BaseComponent));
@@ -298,6 +296,9 @@ var FullCalendarDayGrid = (function (exports, common) {
         function TableCell() {
             var _this = _super !== null && _super.apply(this, arguments) || this;
             _this.rootElRef = common.createRef();
+            _this.state = {
+                dayNumberId: common.getUniqueDomId(),
+            };
             _this.handleRootEl = function (el) {
                 common.setRef(_this.rootElRef, el);
                 common.setRef(_this.props.elRef, el);
@@ -305,16 +306,13 @@ var FullCalendarDayGrid = (function (exports, common) {
             return _this;
         }
         TableCell.prototype.render = function () {
-            var _a = this, props = _a.props, context = _a.context, rootElRef = _a.rootElRef;
-            var options = context.options;
+            var _a = this, context = _a.context, props = _a.props, state = _a.state, rootElRef = _a.rootElRef;
             var date = props.date, dateProfile = props.dateProfile;
-            var navLinkAttrs = options.navLinks
-                ? { 'data-navlink': common.buildNavLinkData(date, 'week'), tabIndex: 0 }
-                : {};
-            return (common.createElement(common.DayCellRoot, { date: date, dateProfile: dateProfile, todayRange: props.todayRange, showDayNumber: props.showDayNumber, extraHookProps: props.extraHookProps, elRef: this.handleRootEl }, function (dayElRef, dayClassNames, rootDataAttrs, isDisabled) { return (common.createElement("td", __assign({ ref: dayElRef, className: ['fc-daygrid-day'].concat(dayClassNames, props.extraClassNames || []).join(' ') }, rootDataAttrs, props.extraDataAttrs),
+            var navLinkAttrs = common.buildNavLinkAttrs(context, date, 'week');
+            return (common.createElement(common.DayCellRoot, { date: date, dateProfile: dateProfile, todayRange: props.todayRange, showDayNumber: props.showDayNumber, extraHookProps: props.extraHookProps, elRef: this.handleRootEl }, function (dayElRef, dayClassNames, rootDataAttrs, isDisabled) { return (common.createElement("td", __assign({ ref: dayElRef, role: "gridcell", className: ['fc-daygrid-day'].concat(dayClassNames, props.extraClassNames || []).join(' ') }, rootDataAttrs, props.extraDataAttrs, (props.showDayNumber ? { 'aria-labelledby': state.dayNumberId } : {})),
                 common.createElement("div", { className: "fc-daygrid-day-frame fc-scrollgrid-sync-inner", ref: props.innerElRef /* different from hook system! RENAME */ },
                     props.showWeekNumber && (common.createElement(common.WeekNumberRoot, { date: date, defaultFormat: DEFAULT_WEEK_NUM_FORMAT }, function (weekElRef, weekClassNames, innerElRef, innerContent) { return (common.createElement("a", __assign({ ref: weekElRef, className: ['fc-daygrid-week-number'].concat(weekClassNames).join(' ') }, navLinkAttrs), innerContent)); })),
-                    !isDisabled && (common.createElement(TableCellTop, { date: date, dateProfile: dateProfile, showDayNumber: props.showDayNumber, forceDayTop: props.forceDayTop, todayRange: props.todayRange, extraHookProps: props.extraHookProps })),
+                    !isDisabled && (common.createElement(TableCellTop, { date: date, dateProfile: dateProfile, showDayNumber: props.showDayNumber, dayNumberId: state.dayNumberId, forceDayTop: props.forceDayTop, todayRange: props.todayRange, extraHookProps: props.extraHookProps })),
                     common.createElement("div", { className: "fc-daygrid-day-events", ref: props.fgContentElRef },
                         props.fgContent,
                         common.createElement("div", { className: "fc-daygrid-day-bottom", style: { marginTop: props.moreMarginTop } },
@@ -350,9 +348,11 @@ var FullCalendarDayGrid = (function (exports, common) {
             if (eventHeight != null) {
                 segInputs.push({
                     index: i,
-                    spanStart: seg.firstCol,
-                    spanEnd: seg.lastCol + 1,
                     thickness: eventHeight,
+                    span: {
+                        start: seg.firstCol,
+                        end: seg.lastCol + 1,
+                    },
                 });
             }
             else {
@@ -390,15 +390,16 @@ var FullCalendarDayGrid = (function (exports, common) {
         }
         for (var _b = 0, hiddenEntries_1 = hiddenEntries; _b < hiddenEntries_1.length; _b++) {
             var hiddenEntry = hiddenEntries_1[_b];
-            var seg = segs[hiddenEntry.segInput.index];
-            multiColPlacements[hiddenEntry.spanStart].push({
-                seg: seg,
+            var seg = segs[hiddenEntry.index];
+            var hiddenSpan = hiddenEntry.span;
+            multiColPlacements[hiddenSpan.start].push({
+                seg: resliceSeg(seg, hiddenSpan.start, hiddenSpan.end, cells),
                 isVisible: false,
                 isAbsolute: true,
                 absoluteTop: 0,
                 marginTop: 0,
             });
-            for (var col = hiddenEntry.spanStart; col < hiddenEntry.spanEnd; col += 1) {
+            for (var col = hiddenSpan.start; col < hiddenSpan.end; col += 1) {
                 moreCnts[col] += 1;
                 singleColPlacements[col].push({
                     seg: resliceSeg(seg, col, col + 1, cells),
@@ -429,12 +430,12 @@ var FullCalendarDayGrid = (function (exports, common) {
             var currentMarginTop = 0;
             for (var _i = 0, rects_1 = rects; _i < rects_1.length; _i++) {
                 var rect = rects_1[_i];
-                var seg = segs[rect.segInput.index];
+                var seg = segs[rect.index];
                 singlePlacements.push({
                     seg: resliceSeg(seg, col, col + 1, cells),
                     isVisible: true,
                     isAbsolute: false,
-                    absoluteTop: 0,
+                    absoluteTop: rect.levelCoord,
                     marginTop: rect.levelCoord - currentHeight,
                 });
                 currentHeight = rect.levelCoord + rect.thickness;
@@ -445,16 +446,16 @@ var FullCalendarDayGrid = (function (exports, common) {
             currentMarginTop = 0;
             for (var _a = 0, rects_2 = rects; _a < rects_2.length; _a++) {
                 var rect = rects_2[_a];
-                var seg = segs[rect.segInput.index];
-                var isAbsolute = rect.spanEnd - rect.spanStart > 1; // multi-column?
-                var isFirstCol = rect.spanStart === col;
+                var seg = segs[rect.index];
+                var isAbsolute = rect.span.end - rect.span.start > 1; // multi-column?
+                var isFirstCol = rect.span.start === col;
                 currentMarginTop += rect.levelCoord - currentHeight; // amount of space since bottom of previous seg
                 currentHeight = rect.levelCoord + rect.thickness; // height will now be bottom of current seg
                 if (isAbsolute) {
                     currentMarginTop += rect.thickness;
                     if (isFirstCol) {
                         multiPlacements.push({
-                            seg: resliceSeg(seg, rect.spanStart, rect.spanEnd, cells),
+                            seg: resliceSeg(seg, rect.span.start, rect.span.end, cells),
                             isVisible: true,
                             isAbsolute: true,
                             absoluteTop: rect.levelCoord,
@@ -464,10 +465,10 @@ var FullCalendarDayGrid = (function (exports, common) {
                 }
                 else if (isFirstCol) {
                     multiPlacements.push({
-                        seg: resliceSeg(seg, rect.spanStart, rect.spanEnd, cells),
+                        seg: resliceSeg(seg, rect.span.start, rect.span.end, cells),
                         isVisible: true,
                         isAbsolute: false,
-                        absoluteTop: 0,
+                        absoluteTop: rect.levelCoord,
                         marginTop: currentMarginTop, // claim the margin
                     });
                     currentMarginTop = 0;
@@ -486,7 +487,7 @@ var FullCalendarDayGrid = (function (exports, common) {
         }
         for (var _i = 0, rects_3 = rects; _i < rects_3.length; _i++) {
             var rect = rects_3[_i];
-            for (var col = rect.spanStart; col < rect.spanEnd; col += 1) {
+            for (var col = rect.span.start; col < rect.span.end; col += 1) {
                 rectsByEachCol[col].push(rect);
             }
         }
@@ -532,25 +533,21 @@ var FullCalendarDayGrid = (function (exports, common) {
         };
         DayGridSegHierarchy.prototype.handleInvalidInsertion = function (insertion, entry, hiddenEntries) {
             var _a = this, entriesByLevel = _a.entriesByLevel, forceHidden = _a.forceHidden;
-            var level = insertion.nextLevel - 1;
-            if (this.hiddenConsumes && level >= 0) {
-                for (var lateral = insertion.lateralStart; lateral < insertion.lateralEnd; lateral += 1) {
-                    var leadingEntry = entriesByLevel[level][lateral];
+            var touchingEntry = insertion.touchingEntry, touchingLevel = insertion.touchingLevel, touchingLateral = insertion.touchingLateral;
+            if (this.hiddenConsumes && touchingEntry) {
+                var touchingEntryId = common.buildEntryKey(touchingEntry);
+                // if not already hidden
+                if (!forceHidden[touchingEntryId]) {
                     if (this.allowReslicing) {
-                        var placeholderEntry = __assign(__assign({}, leadingEntry), { spanStart: Math.max(leadingEntry.spanStart, entry.spanStart), spanEnd: Math.min(leadingEntry.spanEnd, entry.spanEnd) });
+                        var placeholderEntry = __assign(__assign({}, touchingEntry), { span: common.intersectSpans(touchingEntry.span, entry.span) });
                         var placeholderEntryId = common.buildEntryKey(placeholderEntry);
-                        if (!forceHidden[placeholderEntryId]) {
-                            forceHidden[placeholderEntryId] = true;
-                            entriesByLevel[level][lateral] = placeholderEntry;
-                            this.splitEntry(leadingEntry, entry, hiddenEntries); // split up the leadingEntry
-                        }
+                        forceHidden[placeholderEntryId] = true;
+                        entriesByLevel[touchingLevel][touchingLateral] = placeholderEntry; // replace touchingEntry with our placeholder
+                        this.splitEntry(touchingEntry, entry, hiddenEntries); // split up the touchingEntry, reinsert it
                     }
                     else {
-                        var placeholderEntryId = common.buildEntryKey(leadingEntry);
-                        if (!forceHidden[placeholderEntryId]) {
-                            forceHidden[placeholderEntryId] = true;
-                            hiddenEntries.push(leadingEntry);
-                        }
+                        forceHidden[touchingEntryId] = true;
+                        hiddenEntries.push(touchingEntry);
                     }
                 }
             }
@@ -589,7 +586,7 @@ var FullCalendarDayGrid = (function (exports, common) {
              (props.eventDrag && props.eventDrag.affectedInstances) ||
                 (props.eventResize && props.eventResize.affectedInstances) ||
                 {};
-            return (common.createElement("tr", { ref: this.rootElRef },
+            return (common.createElement("tr", { ref: this.rootElRef, role: "row" },
                 props.renderIntro && props.renderIntro(),
                 props.cells.map(function (cell, col) {
                     var normalFgNodes = _this.renderFgSegs(col, props.forPrint ? singleColPlacements[col] : multiColPlacements[col], props.todayRange, isForcedInvisible);
@@ -707,9 +704,14 @@ var FullCalendarDayGrid = (function (exports, common) {
                         });
                     }
                 }
+                var oldInstanceHeights = this.state.eventInstanceHeights;
+                var newInstanceHeights = this.queryEventInstanceHeights();
                 var limitByContentHeight = props.dayMaxEvents === true || props.dayMaxEventRows === true;
                 this.setState({
-                    eventInstanceHeights: this.queryEventInstanceHeights(),
+                    // HACK to prevent oscillations of events being shown/hidden from max-event-rows
+                    // Essentially, once you compute an element's height, never null-out.
+                    // TODO: always display all events, as visibility:hidden?
+                    eventInstanceHeights: __assign(__assign({}, oldInstanceHeights), newInstanceHeights),
                     maxContentHeight: limitByContentHeight ? this.computeMaxContentHeight() : null,
                 });
             }
@@ -762,7 +764,7 @@ var FullCalendarDayGrid = (function (exports, common) {
                 topsByInstanceId[placement.seg.eventRange.instance.instanceId] = placement.absoluteTop;
             }
         }
-        return colPlacements;
+        return topsByInstanceId;
     }
 
     var Table = /** @class */ (function (_super) {
@@ -821,13 +823,13 @@ var FullCalendarDayGrid = (function (exports, common) {
                     minWidth: props.tableMinWidth,
                 } },
                 common.createElement(common.NowTimer, { unit: "day" }, function (nowDate, todayRange) { return (common.createElement(common.Fragment, null,
-                    common.createElement("table", { className: "fc-scrollgrid-sync-table", style: {
+                    common.createElement("table", { role: "presentation", className: "fc-scrollgrid-sync-table", style: {
                             width: props.clientWidth,
                             minWidth: props.tableMinWidth,
                             height: expandRows ? props.clientHeight : '',
                         } },
                         props.colGroupNode,
-                        common.createElement("tbody", null, props.cells.map(function (cells, row) { return (common.createElement(TableRow, { ref: _this.rowRefs.createRef(row), key: cells.length
+                        common.createElement("tbody", { role: "presentation" }, props.cells.map(function (cells, row) { return (common.createElement(TableRow, { ref: _this.rowRefs.createRef(row), key: cells.length
                                 ? cells[0].date.toISOString() /* best? or put key on cell? or use diff formatter? */
                                 : row // in case there are no cells (like when resource view is loading)
                             , showDayNumbers: rowCnt > 1, showWeekNumbers: props.showWeekNumbers, todayRange: todayRange, dateProfile: dateProfile, cells: cells, renderIntro: props.renderRowIntro, businessHourSegs: businessHourSegsByRow[row], eventSelection: props.eventSelection, bgEventSegs: bgEventSegsByRow[row].filter(isSegAllDay) /* hack */, fgEventSegs: fgEventSegsByRow[row], dateSelectionSegs: dateSelectionSegsByRow[row], eventDrag: eventDragByRow[row], eventResize: eventResizeByRow[row], dayMaxEvents: dayMaxEvents, dayMaxEventRows: dayMaxEventRows, clientWidth: props.clientWidth, clientHeight: props.clientHeight, forPrint: props.forPrint })); }))))); })));