@fullcalendar/timeline 7.0.0-beta.1 → 7.0.0-beta.3

package/internal.js

@@ -1,4 +1,4 @@
-import { config, createFormatter, greatestDurationDenominator, asCleanDays, createDuration, wholeDivideDurations, asRoughMs, addDays, startOfDay, asRoughSeconds, asRoughMinutes, diffWholeDays, isInt, computeVisibleDayRange, padStart, BaseComponent, getDateMeta, ContentContainer, getDayClassNames, getSlotClassNames, watchWidth, setRef, RefMap, afterSize, SegHierarchy, groupIntersectingEntries, buildEventRangeKey, BgEvent, getEventRangeMeta, renderFill, Slicer, intersectRanges, addMs, StandardEvent, MoreLinkContainer, watchHeight, memoize, sortEventSegs, memoizeObjArg, watchSize, buildNavLinkAttrs, NowIndicatorContainer, DateComponent, getIsHeightAuto, getStickyHeaderDates, getStickyFooterScrollbar, NowTimer, rangeContainsMarker, ViewContainer, Scroller, multiplyDuration, injectStyles } from '@fullcalendar/core/internal.js';
+import { config, createFormatter, greatestDurationDenominator, asCleanDays, createDuration, wholeDivideDurations, asRoughMs, addDays, startOfDay, asRoughSeconds, asRoughMinutes, diffWholeDays, isInt, computeVisibleDayRange, padStart, BaseComponent, getDateMeta, ContentContainer, joinClassNames, getDayClassName, getSlotClassName, watchWidth, setRef, RefMap, afterSize, getEventKey, SegHierarchy, groupIntersectingSegs, buildEventRangeKey, BgEvent, getEventRangeMeta, renderFill, Slicer, intersectRanges, addMs, StandardEvent, MoreLinkContainer, watchHeight, memoize, sortEventSegs, memoizeObjArg, watchSize, buildNavLinkAttrs, NowIndicatorContainer, DateComponent, getIsHeightAuto, getStickyHeaderDates, getStickyFooterScrollbar, NowTimer, rangeContainsMarker, ViewContainer, Scroller, multiplyDuration, injectStyles } from '@fullcalendar/core/internal.js';
 import { createRef, createElement, Fragment, Component } from '@fullcalendar/core/preact.js';
 import { ScrollerSyncer } from '@fullcalendar/scrollgrid/internal.js';
 
@@ -448,42 +448,35 @@ class TimelineSlatCell extends BaseComponent {
     }
     render() {
         let { props, context } = this;
-        let { dateEnv, options, theme } = context;
+        let { dateEnv, options } = context;
         let { date, tDateProfile, isEm } = props;
         let dateMeta = getDateMeta(props.date, props.todayRange, props.nowDate, props.dateProfile);
         let renderProps = Object.assign(Object.assign({ date: dateEnv.toDate(props.date) }, dateMeta), { view: context.viewApi });
-        return (createElement(ContentContainer, { elTag: "div", elClasses: [
-                'fc-flex-column',
-                'fc-align-start',
-                'fc-cell',
-                'fc-timeline-slot',
-                'fc-timeline-slot-lane',
-                isEm ? 'fc-timeline-slot-em' : '',
-                tDateProfile.isTimeScale ? (isInt(dateEnv.countDurationsBetween(// best to do this here?
-                tDateProfile.normalizedRange.start, props.date, tDateProfile.labelInterval)) ?
-                    'fc-timeline-slot-major' :
-                    'fc-timeline-slot-minor') : '',
-                ...(props.isDay ?
-                    getDayClassNames(dateMeta, theme) :
-                    getSlotClassNames(dateMeta, theme)),
-            ], elAttrs: {
+        return (createElement(ContentContainer, { tag: "div", 
+            // fc-align-start shrinks width of InnerContent
+            // TODO: document this semantic className fc-timeline-slot-em
+            className: joinClassNames('fc-timeline-slot', isEm && 'fc-timeline-slot-em', tDateProfile.isTimeScale && (isInt(dateEnv.countDurationsBetween(// best to do this here?
+            tDateProfile.normalizedRange.start, props.date, tDateProfile.labelInterval)) ?
+                'fc-timeline-slot-major' :
+                'fc-timeline-slot-minor'), 'fc-timeline-slot-lane fc-cell fc-flex-col fc-align-start', props.borderStart && 'fc-border-s', props.isDay ?
+                getDayClassName(dateMeta) :
+                getSlotClassName(dateMeta)), attrs: {
                 'data-date': dateEnv.formatIso(date, {
                     omitTimeZoneOffset: true,
                     omitTime: !tDateProfile.isTimeScale,
                 }),
-            }, elStyle: {
+            }, style: {
                 width: props.width,
-            }, renderProps: renderProps, generatorName: "slotLaneContent", customGenerator: options.slotLaneContent, classNameGenerator: options.slotLaneClassNames, didMount: options.slotLaneDidMount, willUnmount: options.slotLaneWillUnmount }, (InnerContent) => (createElement("div", { ref: this.innerElRef, className: 'fc-flex-column' },
-            createElement(InnerContent, { elTag: "div", elClasses: ['fc-cell-inner'] })))));
+            }, renderProps: renderProps, generatorName: "slotLaneContent", customGenerator: options.slotLaneContent, classNameGenerator: options.slotLaneClassNames, didMount: options.slotLaneDidMount, willUnmount: options.slotLaneWillUnmount }, (InnerContent) => (createElement(InnerContent, { tag: "div", className: 'fc-cell-inner', elRef: this.innerElRef }))));
     }
     componentDidMount() {
         const innerEl = this.innerElRef.current;
-        this.detachWidth = watchWidth(innerEl, (width) => {
+        this.disconnectInnerWidth = watchWidth(innerEl, (width) => {
             setRef(this.props.innerWidthRef, width);
         });
     }
     componentWillUnmount() {
-        this.detachWidth();
+        this.disconnectInnerWidth();
         setRef(this.props.innerWidthRef, null);
     }
 }
@@ -509,9 +502,9 @@ class TimelineSlats extends BaseComponent {
         let { tDateProfile, slotWidth } = props;
         let { slotDates, isWeekStarts } = tDateProfile;
         let isDay = !tDateProfile.isTimeScale && !tDateProfile.largeUnit;
-        return (createElement("div", { className: "fc-timeline-slots fc-fill fc-flex-row" }, slotDates.map((slotDate, i) => {
+        return (createElement("div", { className: "fc-timeline-slots fc-fill fc-flex-row", style: { height: props.height } }, slotDates.map((slotDate, i) => {
             let key = slotDate.toISOString();
-            return (createElement(TimelineSlatCell, { key: key, date: slotDate, dateProfile: props.dateProfile, tDateProfile: tDateProfile, nowDate: props.nowDate, todayRange: props.todayRange, isEm: isWeekStarts[i], isDay: isDay, 
+            return (createElement(TimelineSlatCell, { key: key, date: slotDate, dateProfile: props.dateProfile, tDateProfile: tDateProfile, nowDate: props.nowDate, todayRange: props.todayRange, isEm: isWeekStarts[i], isDay: isDay, borderStart: Boolean(i), 
                 // ref
                 innerWidthRef: innerWidthRefMap.createRef(key), 
                 // dimensions
@@ -545,30 +538,6 @@ function computeDateSnapCoverage$1(date, tDateProfile, dateEnv) {
     return snapCoverage;
 }
 /*
-TODO: audit!!!
-*/
-function coordToCss(hcoord, isRtl) {
-    if (hcoord === null) {
-        return { left: '', right: '' };
-    }
-    if (isRtl) {
-        return { right: hcoord, left: '' };
-    }
-    return { left: hcoord, right: '' };
-}
-/*
-TODO: audit!!!
-*/
-function coordsToCss(hcoords, isRtl) {
-    if (!hcoords) {
-        return { left: '', right: '' };
-    }
-    if (isRtl) {
-        return { right: hcoords.start, left: -hcoords.end };
-    }
-    return { left: hcoords.start, right: -hcoords.end };
-}
-/*
 TODO: DRY up with elsewhere?
 */
 function horizontalsToCss(hcoord, isRtl) {
@@ -599,7 +568,8 @@ function createVerticalStyle(props) {
         };
     }
 }
-function createHorizontalStyle(props, isRtl) {
+function createHorizontalStyle(// TODO: DRY up?
+props, isRtl) {
     if (props) {
         return {
             [isRtl ? 'right' : 'left']: props.start,
@@ -672,13 +642,13 @@ function computeDateSnapCoverage(date, tDateProfile, dateEnv) {
 function computeManySegHorizontals(segs, segMinWidth, dateEnv, tDateProfile, slotWidth) {
     const res = {};
     for (const seg of segs) {
-        res[seg.eventRange.instance.instanceId] = computeSegHorizontals(seg, segMinWidth, dateEnv, tDateProfile, slotWidth);
+        res[getEventKey(seg)] = computeSegHorizontals(seg, segMinWidth, dateEnv, tDateProfile, slotWidth);
     }
     return res;
 }
 function computeSegHorizontals(seg, segMinWidth, dateEnv, tDateProfile, slotWidth) {
-    const startCoord = dateToCoord(seg.start, dateEnv, tDateProfile, slotWidth);
-    const endCoord = dateToCoord(seg.end, dateEnv, tDateProfile, slotWidth);
+    const startCoord = dateToCoord(seg.startDate, dateEnv, tDateProfile, slotWidth);
+    const endCoord = dateToCoord(seg.endDate, dateEnv, tDateProfile, slotWidth);
     let size = endCoord - startCoord;
     if (segMinWidth) {
         size = Math.max(size, segMinWidth);
@@ -686,95 +656,58 @@ function computeSegHorizontals(seg, segMinWidth, dateEnv, tDateProfile, slotWidt
     return { start: startCoord, size };
 }
 function computeFgSegPlacements(// mostly horizontals
-segs, segHorizontals, segHeights, // keyed by instanceId
-strictOrder, maxStackCnt) {
-    let segEntries = [];
-    for (let i = 0; i < segs.length; i += 1) {
-        let seg = segs[i];
-        let instanceId = seg.eventRange.instance.instanceId;
-        let height = segHeights.get(instanceId);
-        let hcoords = segHorizontals[instanceId];
-        if (height != null && hcoords != null) {
-            segEntries.push({
-                index: i,
-                seg,
-                span: {
-                    start: hcoords.start,
-                    end: hcoords.start + hcoords.size,
-                },
-                thickness: height,
-            });
+segs, segHorizontals, // TODO: use Map
+segHeights, // keyed by instanceId
+hiddenGroupHeights, strictOrder, maxDepth) {
+    const segRanges = [];
+    // isn't it true that there will either be ALL hcoords or NONE? can optimize
+    for (const seg of segs) {
+        const hcoords = segHorizontals[getEventKey(seg)];
+        if (hcoords) {
+            segRanges.push(Object.assign(Object.assign({}, seg), { start: hcoords.start, end: hcoords.start + hcoords.size }));
         }
     }
-    let hierarchy = new SegHierarchy();
-    if (strictOrder != null) {
-        hierarchy.strictOrder = strictOrder;
-    }
-    if (maxStackCnt != null) {
-        hierarchy.maxStackCnt = maxStackCnt;
-    }
-    let hiddenEntries = hierarchy.addSegs(segEntries);
-    let hiddenGroups = groupIntersectingEntries(hiddenEntries);
-    let hiddenGroupEntries = hiddenGroups.map((hiddenGroup, index) => ({
-        index: segs.length + index,
-        segGroup: hiddenGroup,
-        span: hiddenGroup.span,
-        thickness: 1, // HACK to ensure it's placed
-    }));
-    // add more-links into the hierarchy, but don't limit
-    hierarchy.maxStackCnt = -1;
-    hierarchy.addSegs(hiddenGroupEntries);
-    let visibleRects = hierarchy.toRects();
-    let segTops = {};
-    let hiddenGroupTops = {};
-    for (let rect of visibleRects) {
-        const { seg, segGroup } = rect;
-        if (seg) { // regular seg
-            segTops[seg.eventRange.instance.instanceId] = rect.levelCoord;
-        }
-        else { // hiddenGroup
-            hiddenGroupTops[segGroup.key] = rect.levelCoord;
+    const hierarchy = new SegHierarchy(segRanges, (seg) => segHeights.get(getEventKey(seg)), strictOrder, undefined, // maxCoord
+    maxDepth);
+    const segTops = new Map();
+    hierarchy.traverseSegs((seg, segTop) => {
+        segTops.set(getEventKey(seg), segTop);
+    });
+    const { hiddenSegs } = hierarchy;
+    let totalHeight = 0;
+    for (const segRange of segRanges) {
+        const segKey = getEventKey(segRange);
+        const segHeight = segHeights.get(segKey);
+        const segTop = segTops.get(segKey);
+        if (segHeight != null) {
+            if (segTop != null) {
+                totalHeight = Math.max(totalHeight, segTop + segHeight);
+            }
         }
     }
+    const hiddenGroups = groupIntersectingSegs(hiddenSegs);
+    const hiddenGroupTops = new Map();
+    // HACK for hiddenGroup findInsertion() call
+    hierarchy.strictOrder = true;
+    for (const hiddenGroup of hiddenGroups) {
+        const { levelCoord: top } = hierarchy.findInsertion(hiddenGroup, 0);
+        const hiddenGroupHeight = hiddenGroupHeights.get(hiddenGroup.key) || 0;
+        hiddenGroupTops.set(hiddenGroup.key, top);
+        totalHeight = Math.max(totalHeight, top + hiddenGroupHeight);
+    }
     return [
         segTops,
-        computeMaxBottom(segs, segTops, segHeights),
         hiddenGroups,
         hiddenGroupTops,
+        totalHeight,
     ];
 }
-function computeMaxBottom(segs, segTops, segHeights) {
-    let max = 0;
-    for (const seg of segs) {
-        const { instanceId } = seg.eventRange.instance;
-        const top = segTops[instanceId];
-        const height = segHeights.get(instanceId);
-        if (top != null && height != null) {
-            max = Math.max(max, top + height);
-        }
-    }
-    return max;
-}
-/*
-TODO: converge with computeMaxBottom, but keys are different
-*/
-function computeMoreLinkMaxBottom(hiddenGroups, hiddenGroupTops, hiddenGroupHeights) {
-    let max = 0;
-    for (const hiddenGroup of hiddenGroups) {
-        const top = hiddenGroupTops[hiddenGroup.key];
-        const height = hiddenGroupHeights.get(hiddenGroup.key);
-        if (top != null && height != null) {
-            max = Math.max(max, top + height);
-        }
-    }
-    return max;
-}
 
 class TimelineLaneBg extends BaseComponent {
     render() {
         let { props } = this;
         let highlightSeg = [].concat(props.eventResizeSegs, props.dateSelectionSegs);
-        return (createElement("div", { className: "fc-timeline-bg" },
+        return (createElement(Fragment, null,
             this.renderSegs(props.businessHourSegs || [], 'non-business'),
             this.renderSegs(props.bgEventSegs || [], 'bg-event'),
             this.renderSegs(highlightSeg, 'highlight')));
@@ -788,7 +721,7 @@ class TimelineLaneBg extends BaseComponent {
                 let segHorizontal = computeSegHorizontals(seg, undefined, dateEnv, tDateProfile, slotWidth);
                 hStyle = horizontalsToCss(segHorizontal, isRtl);
             }
-            return (createElement("div", { key: buildEventRangeKey(seg.eventRange), className: "fc-timeline-bg-harness", style: hStyle }, fillType === 'bg-event' ?
+            return (createElement("div", { key: buildEventRangeKey(seg.eventRange), className: "fc-fill-y", style: hStyle }, fillType === 'bg-event' ?
                 createElement(BgEvent, Object.assign({ eventRange: seg.eventRange, isStart: seg.isStart, isEnd: seg.isEnd }, getEventRangeMeta(seg.eventRange, todayRange, nowDate))) : (renderFill(fillType))));
         })));
     }
@@ -805,8 +738,8 @@ class TimelineLaneSlicer extends Slicer {
             let slicedRange = intersectRanges(normalRange, tDateProfile.normalizedRange);
             if (slicedRange) {
                 segs.push({
-                    start: slicedRange.start,
-                    end: slicedRange.end,
+                    startDate: slicedRange.start,
+                    endDate: slicedRange.end,
                     isStart: slicedRange.start.valueOf() === normalRange.start.valueOf()
                         && isValidDate(slicedRange.start, tDateProfile, dateProfile, dateProfileGenerator),
                     isEnd: slicedRange.end.valueOf() === normalRange.end.valueOf()
@@ -828,13 +761,8 @@ class TimelineEvent extends BaseComponent {
     render() {
         let { props, context } = this;
         let { options } = context;
-        return (createElement(StandardEvent, Object.assign({}, props, { elClasses: [
-                'fc-timeline-event',
-                'fc-h-event',
-                options.eventOverlap === false // TODO: fix bad default
-                    ? 'fc-timeline-event-spacious'
-                    : ''
-            ], defaultTimeFormat: DEFAULT_TIME_FORMAT, defaultDisplayEventTime: !props.isTimeScale })));
+        return (createElement(StandardEvent, Object.assign({}, props, { className: joinClassNames('fc-timeline-event', options.eventOverlap === false // TODO: fix bad default
+                && 'fc-timeline-event-spacious', 'fc-h-event'), defaultTimeFormat: DEFAULT_TIME_FORMAT, defaultDisplayEventTime: !props.isTimeScale })));
     }
 }
 
@@ -842,13 +770,13 @@ class TimelineLaneMoreLink extends BaseComponent {
     render() {
         let { props } = this;
         let { hiddenSegs, resourceId, forcedInvisibleMap } = props;
-        let extraDateSpan = resourceId ? { resourceId } : {};
-        return (createElement(MoreLinkContainer, { elClasses: ['fc-timeline-more-link'], allDayDate: null, segs: hiddenSegs, hiddenSegs: hiddenSegs, dateProfile: props.dateProfile, todayRange: props.todayRange, extraDateSpan: extraDateSpan, popoverContent: () => (createElement(Fragment, null, hiddenSegs.map((seg) => {
+        let dateSpanProps = resourceId ? { resourceId } : {};
+        return (createElement(MoreLinkContainer, { className: 'fc-timeline-more-link', allDayDate: null, segs: hiddenSegs, hiddenSegs: hiddenSegs, dateProfile: props.dateProfile, todayRange: props.todayRange, dateSpanProps: dateSpanProps, popoverContent: () => (createElement(Fragment, null, hiddenSegs.map((seg) => {
                 let { eventRange } = seg;
                 let instanceId = eventRange.instance.instanceId;
                 return (createElement("div", { key: instanceId, style: { visibility: forcedInvisibleMap[instanceId] ? 'hidden' : '' } },
                     createElement(TimelineEvent, Object.assign({ isTimeScale: props.isTimeScale, eventRange: eventRange, isStart: seg.isStart, isEnd: seg.isEnd, isDragging: false, isResizing: false, isDateSelecting: false, isSelected: instanceId === props.eventSelection }, getEventRangeMeta(eventRange, props.todayRange, props.nowDate)))));
-            }))) }, (InnerContent) => (createElement(InnerContent, { elTag: "div", elClasses: ['fc-timeline-more-link-inner', 'fc-sticky-x'] }))));
+            }))) }, (InnerContent) => (createElement(InnerContent, { tag: "div", className: 'fc-timeline-more-link-inner fc-sticky-s' }))));
     }
 }
 
@@ -867,12 +795,12 @@ class TimelineEventHarness extends Component {
     }
     componentDidMount() {
         const rootEl = this.rootElRef.current; // TODO: make dynamic with useEffect
-        this.detachHeight = watchHeight(rootEl, (height) => {
+        this.disconnectHeight = watchHeight(rootEl, (height) => {
             setRef(this.props.heightRef, height);
         });
     }
     componentWillUnmount() {
-        this.detachHeight();
+        this.disconnectHeight();
         setRef(this.props.heightRef, null);
     }
 }
@@ -905,7 +833,7 @@ class TimelineLane extends BaseComponent {
     TODO: lots of memoization needed here!
     */
     render() {
-        let { props, context, segHeightRefMap } = this;
+        let { props, context, segHeightRefMap, moreLinkHeightRefMap } = this;
         let { options } = context;
         let { dateProfile, tDateProfile } = props;
         let slicedProps = this.slicer.sliceProps(props, dateProfile, tDateProfile.isTimeScale ? null : props.nextDayThreshold, context, // wish we didn't have to pass in the rest of the args...
@@ -917,10 +845,7 @@ class TimelineLane extends BaseComponent {
         let fgSegHorizontals = props.slotWidth != null
             ? computeManySegHorizontals(fgSegs, options.eventMinWidth, context.dateEnv, tDateProfile, props.slotWidth)
             : {};
-        let [fgSegTops, fgSegsBottom, hiddenGroups, hiddenGroupTops] = computeFgSegPlacements(// verticals
-        fgSegs, fgSegHorizontals, segHeightRefMap.current, options.eventOrderStrict, options.eventMaxStack);
-        let moreLinksBottom = computeMoreLinkMaxBottom(hiddenGroups, hiddenGroupTops, this.moreLinkHeightRefMap.current);
-        let innerHeight = Math.max(moreLinksBottom, fgSegsBottom);
+        let [fgSegTops, hiddenGroups, hiddenGroupTops, totalHeight] = computeFgSegPlacements(fgSegs, fgSegHorizontals, segHeightRefMap.current, moreLinkHeightRefMap.current, options.eventOrderStrict, options.eventMaxStack);
         let forcedInvisibleMap = // TODO: more convenient/DRY
          (slicedProps.eventDrag ? slicedProps.eventDrag.affectedInstances : null) ||
             (slicedProps.eventResize ? slicedProps.eventResize.affectedInstances : null) ||
@@ -931,20 +856,18 @@ class TimelineLane extends BaseComponent {
                 bgEventSegs: slicedProps.bgEventSegs, businessHourSegs: slicedProps.businessHourSegs, dateSelectionSegs: slicedProps.dateSelectionSegs, eventResizeSegs: slicedProps.eventResize ? slicedProps.eventResize.segs : [] /* bad new empty array? */, 
                 // dimensions
                 slotWidth: props.slotWidth }),
-            createElement("div", { className: [
-                    'fc-timeline-events',
-                    'fc-content-box',
-                    options.eventOverlap === false // TODO: fix bad default
-                        ? 'fc-timeline-events-overlap-disabled'
-                        : 'fc-timeline-events-overlap-enabled'
-                ].join(' '), style: { height: innerHeight } },
+            createElement("div", { className: joinClassNames('fc-timeline-events', options.eventOverlap === false // TODO: fix bad default
+                    ? 'fc-timeline-events-overlap-disabled'
+                    : 'fc-timeline-events-overlap-enabled', 'fc-content-box'), style: { height: totalHeight } },
                 this.renderFgSegs(fgSegs, fgSegHorizontals, fgSegTops, forcedInvisibleMap, hiddenGroups, hiddenGroupTops, false, // isDragging
                 false, // isResizing
                 false),
                 this.renderFgSegs(mirrorSegs, props.slotWidth // TODO: memoize
                     ? computeManySegHorizontals(mirrorSegs, options.eventMinWidth, context.dateEnv, tDateProfile, props.slotWidth)
                     : {}, fgSegTops, {}, // forcedInvisibleMap
-                [], {}, Boolean(slicedProps.eventDrag), Boolean(slicedProps.eventResize), false))));
+                [], // hiddenGroups
+                new Map(), // hiddenGroupTops
+                Boolean(slicedProps.eventDrag), Boolean(slicedProps.eventResize), false))));
     }
     renderFgSegs(segs, segHorizontals, segTops, forcedInvisibleMap, hiddenGroups, hiddenGroupTops, isDragging, isResizing, isDateSelecting) {
         let { props, context, segHeightRefMap, moreLinkHeightRefMap } = this;
@@ -953,18 +876,18 @@ class TimelineLane extends BaseComponent {
             segs.map((seg) => {
                 const { eventRange } = seg;
                 const { instanceId } = eventRange.instance;
-                const segTop = segTops[instanceId];
+                const segTop = segTops.get(instanceId);
                 const segHorizontal = segHorizontals[instanceId];
                 const isVisible = isMirror ||
                     (segHorizontal && segTop != null && !forcedInvisibleMap[instanceId]);
                 return (createElement(TimelineEventHarness, { key: instanceId, style: Object.assign({ visibility: isVisible ? '' : 'hidden', top: segTop || 0 }, horizontalsToCss(segHorizontal, context.isRtl)), heightRef: isMirror ? undefined : segHeightRefMap.createRef(instanceId) },
                     createElement(TimelineEvent, Object.assign({ isTimeScale: props.tDateProfile.isTimeScale, eventRange: eventRange, isStart: seg.isStart, isEnd: seg.isEnd, isDragging: isDragging, isResizing: isResizing, isDateSelecting: isDateSelecting, isSelected: instanceId === props.eventSelection /* TODO: bad for mirror? */ }, getEventRangeMeta(eventRange, props.todayRange, props.nowDate)))));
             }),
-            hiddenGroups.map((hiddenGroup) => (createElement(TimelineEventHarness, { key: hiddenGroup.key, style: Object.assign({ top: hiddenGroupTops[hiddenGroup.key] || 0 }, horizontalsToCss({
-                    start: hiddenGroup.span.start,
-                    size: hiddenGroup.span.end - hiddenGroup.span.start
+            hiddenGroups.map((hiddenGroup) => (createElement(TimelineEventHarness, { key: hiddenGroup.key, style: Object.assign({ top: hiddenGroupTops.get(hiddenGroup.key) || 0 }, horizontalsToCss({
+                    start: hiddenGroup.start,
+                    size: hiddenGroup.end - hiddenGroup.start
                 }, context.isRtl)), heightRef: moreLinkHeightRefMap.createRef(hiddenGroup.key) },
-                createElement(TimelineLaneMoreLink, { hiddenSegs: hiddenGroup.segs /* TODO: make SegGroup generic! */, dateProfile: props.dateProfile, nowDate: props.nowDate, todayRange: props.todayRange, isTimeScale: props.tDateProfile.isTimeScale, eventSelection: props.eventSelection, resourceId: props.resourceId, forcedInvisibleMap: forcedInvisibleMap }))))));
+                createElement(TimelineLaneMoreLink, { hiddenSegs: hiddenGroup.segs, dateProfile: props.dateProfile, nowDate: props.nowDate, todayRange: props.todayRange, isTimeScale: props.tDateProfile.isTimeScale, eventSelection: props.eventSelection, resourceId: props.resourceId, forcedInvisibleMap: forcedInvisibleMap }))))));
     }
 }
 
@@ -992,36 +915,21 @@ class TimelineHeaderCell extends BaseComponent {
             dateEnv: context.dateEnv,
             viewApi: context.viewApi,
         });
-        return (createElement(ContentContainer, { elTag: "div", elClasses: [
-                'fc-timeline-slot-label',
-                'fc-timeline-slot',
-                cell.isWeekStart ? 'fc-timeline-slot-em' : '',
-                'fc-header-cell',
-                'fc-cell',
-                'fc-flex-column',
-                'fc-justify-center',
-                props.isCentered ? 'fc-align-center' : 'fc-align-start',
-                ...( // TODO: so slot classnames for week/month/bigger. see note above about rowUnit
-                cell.rowUnit === 'time' ?
-                    getSlotClassNames(dateMeta, context.theme) :
-                    getDayClassNames(dateMeta, context.theme)),
-            ], elAttrs: {
+        return (createElement(ContentContainer, { tag: "div", className: joinClassNames('fc-timeline-slot-label fc-timeline-slot', cell.isWeekStart && 'fc-timeline-slot-em', // TODO: document this semantic className
+            'fc-header-cell fc-cell fc-flex-col fc-justify-center', props.borderStart && 'fc-border-s', props.isCentered ? 'fc-align-center' : 'fc-align-start', 
+            // TODO: so slot classnames for week/month/bigger. see note above about rowUnit
+            cell.rowUnit === 'time' ?
+                getSlotClassName(dateMeta) :
+                getDayClassName(dateMeta)), attrs: {
                 'data-date': dateEnv.formatIso(cell.date, {
                     omitTime: !tDateProfile.isTimeScale,
                     omitTimeZoneOffset: true,
                 }),
-            }, elStyle: {
+            }, style: {
                 width: props.slotWidth != null
                     ? props.slotWidth * cell.colspan
                     : undefined,
-            }, renderProps: renderProps, generatorName: "slotLabelContent", customGenerator: options.slotLabelContent, defaultGenerator: renderInnerContent, classNameGenerator: options.slotLabelClassNames, didMount: options.slotLabelDidMount, willUnmount: options.slotLabelWillUnmount }, (InnerContent) => (createElement("div", { ref: this.innerElRef, className: [
-                'fc-flex-column',
-                props.isSticky ? 'fc-sticky-x' : '',
-            ].join(' ') },
-            createElement(InnerContent, { elTag: "a", elClasses: [
-                    'fc-cell-inner',
-                    'fc-padding-md',
-                ], elAttrs: this.buildCellNavLinkAttrs(context, cell.date, cell.rowUnit) })))));
+            }, renderProps: renderProps, generatorName: "slotLabelContent", customGenerator: options.slotLabelContent, defaultGenerator: renderInnerContent, classNameGenerator: options.slotLabelClassNames, didMount: options.slotLabelDidMount, willUnmount: options.slotLabelWillUnmount }, (InnerContent) => (createElement(InnerContent, { tag: "a", attrs: this.buildCellNavLinkAttrs(context, cell.date, cell.rowUnit), className: joinClassNames('fc-cell-inner fc-padding-md', props.isSticky && 'fc-sticky-s'), elRef: this.innerElRef }))));
     }
     componentDidMount() {
         const { props } = this;
@@ -1095,13 +1003,14 @@ class TimelineHeaderRow extends BaseComponent {
         const { props, innerWidthRefMap, innerHeightRefMap } = this;
         const isCentered = !(props.tDateProfile.isTimeScale && props.isLastRow);
         const isSticky = !props.isLastRow;
-        return (createElement("div", { className: 'fc-row', style: { height: props.height } }, props.cells.map((cell) => {
+        return (createElement("div", { className: joinClassNames('fc-flex-row fc-grow', // TODO: move fc-grow to parent?
+            !props.isLastRow && 'fc-border-b') }, props.cells.map((cell, cellI) => {
             // TODO: make this part of the cell obj?
             // TODO: rowUnit seems wrong sometimes. says 'month' when it should be day
             // TODO: rowUnit is relevant to whole row. put it on a row object, not the cells
             // TODO: use rowUnit to key the Row itself?
             const key = cell.rowUnit + ':' + cell.date.toISOString();
-            return (createElement(TimelineHeaderCell, { key: key, cell: cell, rowLevel: props.rowLevel, dateProfile: props.dateProfile, tDateProfile: props.tDateProfile, todayRange: props.todayRange, nowDate: props.nowDate, isCentered: isCentered, isSticky: isSticky, 
+            return (createElement(TimelineHeaderCell, { key: key, cell: cell, rowLevel: props.rowLevel, dateProfile: props.dateProfile, tDateProfile: props.tDateProfile, todayRange: props.todayRange, nowDate: props.nowDate, isCentered: isCentered, isSticky: isSticky, borderStart: Boolean(cellI), 
                 // refs
                 innerWidthRef: innerWidthRefMap.createRef(key), innerHeightRef: innerHeightRefMap.createRef(key), 
                 // dimensions
@@ -1119,7 +1028,7 @@ class TimelineNowIndicatorLine extends BaseComponent {
         const { props, context } = this;
         return (createElement("div", { className: "fc-timeline-now-indicator-container" },
             createElement(NowIndicatorContainer // TODO: make separate component?
-            , { elClasses: ['fc-timeline-now-indicator-line'], elStyle: props.slotWidth != null
+            , { className: 'fc-timeline-now-indicator-line', style: props.slotWidth != null
                     ? horizontalCoordToCss(dateToCoord(props.nowDate, context.dateEnv, props.tDateProfile, props.slotWidth), context.isRtl)
                     : {}, isAxis: false, date: props.nowDate })));
     }
@@ -1129,7 +1038,7 @@ class TimelineNowIndicatorArrow extends BaseComponent {
     render() {
         const { props, context } = this;
         return (createElement("div", { className: "fc-timeline-now-indicator-container" },
-            createElement(NowIndicatorContainer, { elClasses: ['fc-timeline-now-indicator-arrow'], elStyle: props.slotWidth != null
+            createElement(NowIndicatorContainer, { className: 'fc-timeline-now-indicator-arrow', style: props.slotWidth != null
                     ? horizontalCoordToCss(dateToCoord(props.nowDate, context.dateEnv, props.tDateProfile, props.slotWidth), context.isRtl)
                     : {}, isAxis: true, date: props.nowDate })));
     }
@@ -1162,19 +1071,14 @@ class TimelineView extends DateComponent {
                 this.setState({ slotInnerWidth });
             }
         };
-        this.handleScrollerWidth = (scrollerWidth) => {
-            this.setState({
-                scrollerWidth,
-            });
-        };
-        this.handleLeftScrollbarWidth = (leftScrollbarWidth) => {
+        this.handleClientWidth = (clientWidth) => {
             this.setState({
-                leftScrollbarWidth
+                clientWidth,
             });
         };
-        this.handleRightScrollbarWidth = (rightScrollbarWidth) => {
+        this.handleEndScrollbarWidth = (endScrollbarWidth) => {
             this.setState({
-                rightScrollbarWidth
+                endScrollbarWidth
             });
         };
         this.handleTimeScroll = (scrollTime) => {
@@ -1186,7 +1090,7 @@ class TimelineView extends DateComponent {
             if (scrollTime != null && slotWidth != null) {
                 let x = timeToCoord(scrollTime, context.dateEnv, props.dateProfile, tDateProfile, slotWidth);
                 if (x) {
-                    x += context.isRtl ? -1 : 1; // overcome border. TODO: DRY this up
+                    x += 1; // overcome border. TODO: DRY this up
                 }
                 this.syncedScroller.scrollTo({ x });
             }
@@ -1219,44 +1123,30 @@ class TimelineView extends DateComponent {
         const stickyFooterScrollbar = !props.forPrint && getStickyFooterScrollbar(options);
         /* table positions */
         const [canvasWidth, slotWidth] = this.computeSlotWidth(tDateProfile.slotCnt, tDateProfile.slotsPerLabel, options.slotMinWidth, state.slotInnerWidth, // is ACTUALLY the label width. rename?
-        state.scrollerWidth);
+        state.clientWidth);
         this.slotWidth = slotWidth;
         return (createElement(NowTimer, { unit: timerUnit }, (nowDate, todayRange) => {
             const enableNowIndicator = // TODO: DRY
              options.nowIndicator &&
                 slotWidth != null &&
                 rangeContainsMarker(props.dateProfile.currentRange, nowDate);
-            return (createElement(ViewContainer, { viewSpec: context.viewSpec, elClasses: [
-                    'fc-timeline-view',
-                    'fc-flex-column',
-                    'fc-border',
-                ] },
-                createElement(Scroller, { horizontal: true, hideScrollbars: true, elClassNames: [
-                        'fc-timeline-header',
-                        'fc-rowgroup',
-                        stickyHeaderDates ? 'fc-sticky-header' : '',
-                    ], ref: this.headerScrollerRef },
-                    createElement("div", { className: 'fc-rel fc-content-box' // origin for now-indicator
-                        , style: {
-                            width: canvasWidth,
-                            paddingLeft: state.leftScrollbarWidth,
-                            paddingRight: state.rightScrollbarWidth,
-                        } },
-                        createElement("div", null, cellRows.map((cells, rowLevel) => {
+            return (createElement(ViewContainer, { viewSpec: context.viewSpec, className: joinClassNames('fc-timeline fc-border', 
+                // HACK for Safari print-mode, where fc-scroller-no-bars won't take effect for
+                // the below Scrollers if they have liquid flex height
+                !props.forPrint && 'fc-flex-col') },
+                createElement(Scroller, { horizontal: true, hideScrollbars: true, className: joinClassNames('fc-timeline-header fc-flex-row fc-border-b', stickyHeaderDates && 'fc-table-header-sticky'), ref: this.headerScrollerRef },
+                    createElement("div", { 
+                        // TODO: DRY
+                        className: joinClassNames('fc-rel', // origin for now-indicator
+                        canvasWidth == null && 'fc-liquid'), style: { width: canvasWidth } },
+                        cellRows.map((cells, rowLevel) => {
                             const isLast = rowLevel === cellRows.length - 1;
                             return (createElement(TimelineHeaderRow, { key: rowLevel, dateProfile: props.dateProfile, tDateProfile: tDateProfile, nowDate: nowDate, todayRange: todayRange, rowLevel: rowLevel, isLastRow: isLast, cells: cells, slotWidth: slotWidth, innerWidthRef: this.headerRowInnerWidthMap.createRef(rowLevel) }));
-                        })),
-                        enableNowIndicator && (
-                        // TODO: make this positioned WITHIN padding?
-                        createElement(TimelineNowIndicatorArrow, { tDateProfile: tDateProfile, nowDate: nowDate, slotWidth: slotWidth })))),
-                createElement(Scroller, { vertical: verticalScrolling, horizontal: true, elClassNames: [
-                        'fc-timeline-body',
-                        'fc-rowgroup',
-                        verticalScrolling ? 'fc-liquid' : '',
-                    ], ref: this.bodyScrollerRef, widthRef: this.handleScrollerWidth, leftScrollbarWidthRef: this.handleLeftScrollbarWidth, rightScrollbarWidthRef: this.handleRightScrollbarWidth },
-                    createElement("div", { className: "fc-rel fc-grow", style: {
-                            width: canvasWidth,
-                        }, ref: this.handeBodyEl },
+                        }),
+                        enableNowIndicator && (createElement(TimelineNowIndicatorArrow, { tDateProfile: tDateProfile, nowDate: nowDate, slotWidth: slotWidth }))),
+                    Boolean(state.endScrollbarWidth) && (createElement("div", { className: 'fc-border-s fc-filler', style: { minWidth: state.endScrollbarWidth } }))),
+                createElement(Scroller, { vertical: verticalScrolling, horizontal: true, hideScrollbars: props.forPrint, className: joinClassNames('fc-timeline-body fc-flex-col', verticalScrolling && 'fc-liquid'), ref: this.bodyScrollerRef, clientWidthRef: this.handleClientWidth, endScrollbarWidthRef: this.handleEndScrollbarWidth },
+                    createElement("div", { className: "fc-rel fc-grow", style: { width: canvasWidth }, ref: this.handeBodyEl },
                         createElement(TimelineSlats, { dateProfile: props.dateProfile, tDateProfile: tDateProfile, nowDate: nowDate, todayRange: todayRange, 
                             // ref
                             innerWidthRef: this.handleBodySlotInnerWidth, 
@@ -1349,7 +1239,7 @@ class TimelineView extends DateComponent {
     }
 }
 
-var css_248z = ".fc-timeline-slots{z-index:1}.fc-timeline-slot-minor{border-style:dotted}.fc-timeline-now-indicator-container{bottom:0;left:0;overflow:hidden;position:absolute;right:0;top:0;z-index:4}.fc-timeline-now-indicator-arrow,.fc-timeline-now-indicator-line{border-color:var(--fc-now-indicator-color);border-style:solid;pointer-events:none;position:absolute;top:0}.fc-timeline-now-indicator-arrow{border-left-color:transparent;border-right-color:transparent;border-width:6px 5px 0;margin:0 -5px}.fc-timeline-now-indicator-line{border-width:0 0 0 1px;bottom:0}.fc-timeline-events{z-index:3}.fc-timeline-events-overlap-enabled{padding-bottom:10px}.fc-timeline-event{border-radius:0;font-size:var(--fc-small-font-size);margin-bottom:1px;z-index:1}.fc-timeline-event.fc-event-mirror{z-index:2}.fc-direction-ltr .fc-timeline-event.fc-event-end{margin-right:1px}.fc-direction-rtl .fc-timeline-event.fc-event-end{margin-left:1px}.fc-timeline-event-spacious{margin-bottom:0;padding-bottom:5px;padding-top:5px}.fc-timeline-event .fc-event-inner{align-items:center;display:flex;flex-direction:row;padding:2px 1px}.fc-timeline-event:not(.fc-event-end) .fc-event-inner:after,.fc-timeline-event:not(.fc-event-start) .fc-event-inner:before{border-color:transparent #000;border-style:solid;border-width:5px;content:\"\";flex-grow:0;flex-shrink:0;height:0;margin:0 1px;opacity:.5;width:0}.fc-direction-ltr .fc-timeline-event:not(.fc-event-start) .fc-event-inner:before,.fc-direction-rtl .fc-timeline-event:not(.fc-event-end) .fc-event-inner:after{border-left:0}.fc-direction-ltr .fc-timeline-event:not(.fc-event-end) .fc-event-inner:after,.fc-direction-rtl .fc-timeline-event:not(.fc-event-start) .fc-event-inner:before{border-right:0}.fc-timeline-event .fc-event-time{font-weight:700}.fc-timeline-event .fc-event-time,.fc-timeline-event .fc-event-title{padding:0 2px}.fc-timeline-more-link{align-items:flex-start;background:var(--fc-more-link-bg-color);color:var(--fc-more-link-text-color);cursor:pointer;display:flex;flex-direction:column;font-size:var(--fc-small-font-size);padding:1px}.fc-direction-ltr .fc-timeline-more-link{margin-right:1px}.fc-direction-rtl .fc-timeline-more-link{margin-left:1px}.fc-timeline-more-link-inner{padding:2px}.fc-timeline-bg{bottom:0;left:0;position:absolute;right:0;top:0;z-index:2}.fc-timeline-bg .fc-non-business{z-index:1}.fc-timeline-bg .fc-bg-event{z-index:2}.fc-timeline-bg .fc-highlight{z-index:3}.fc-timeline-bg-harness{bottom:0;position:absolute;top:0}";
+var css_248z = ".fc-timeline-slots{z-index:1}.fc-timeline-events{position:relative;z-index:2}.fc-timeline-slot-minor{border-style:dotted}.fc-timeline-events-overlap-enabled{padding-bottom:10px}.fc-timeline-event{border-radius:0;font-size:var(--fc-small-font-size);margin-bottom:1px}.fc-direction-ltr .fc-timeline-event.fc-event-end{margin-right:1px}.fc-direction-rtl .fc-timeline-event.fc-event-end{margin-left:1px}.fc-timeline-event .fc-event-inner{align-items:center;display:flex;flex-direction:row;padding:2px 1px}.fc-timeline-event-spacious .fc-event-inner{padding-bottom:5px;padding-top:5px}.fc-timeline-event .fc-event-time{font-weight:700}.fc-timeline-event .fc-event-time,.fc-timeline-event .fc-event-title{padding:0 2px}.fc-timeline-event:not(.fc-event-end) .fc-event-inner:after,.fc-timeline-event:not(.fc-event-start) .fc-event-inner:before{border-color:transparent #000;border-style:solid;border-width:5px;content:\"\";flex-grow:0;flex-shrink:0;height:0;margin:0 1px;opacity:.5;width:0}.fc-direction-ltr .fc-timeline-event:not(.fc-event-start) .fc-event-inner:before,.fc-direction-rtl .fc-timeline-event:not(.fc-event-end) .fc-event-inner:after{border-left:0}.fc-direction-ltr .fc-timeline-event:not(.fc-event-end) .fc-event-inner:after,.fc-direction-rtl .fc-timeline-event:not(.fc-event-start) .fc-event-inner:before{border-right:0}.fc-timeline-more-link{align-items:flex-start;background:var(--fc-more-link-bg-color);color:var(--fc-more-link-text-color);cursor:pointer;display:flex;flex-direction:column;font-size:var(--fc-small-font-size);padding:1px}.fc-direction-ltr .fc-timeline-more-link{margin-right:1px}.fc-direction-rtl .fc-timeline-more-link{margin-left:1px}.fc-timeline-more-link-inner{padding:2px}.fc-timeline-now-indicator-container{bottom:0;left:0;overflow:hidden;pointer-events:none;position:absolute;right:0;top:0;z-index:4}.fc-timeline-now-indicator-arrow{border-bottom-style:solid;border-bottom-width:0;border-color:var(--fc-now-indicator-color);border-left:5px solid transparent;border-right:5px solid transparent;border-top-style:solid;border-top-width:6px;height:0;margin:0 -5px;position:absolute;top:0;width:0}.fc-timeline-now-indicator-line{border-left:1px solid var(--fc-now-indicator-color);bottom:0;position:absolute;top:0}";
 injectStyles(css_248z);
 
-export { TimelineHeaderRow, TimelineLane, TimelineLaneBg, TimelineLaneSlicer, TimelineNowIndicatorArrow, TimelineNowIndicatorLine, TimelineSlats, TimelineView, buildTimelineDateProfile, computeSlotWidth, coordToCss, coordsToCss, createHorizontalStyle, createVerticalStyle, timeToCoord };
+export { TimelineHeaderRow, TimelineLane, TimelineLaneBg, TimelineLaneSlicer, TimelineNowIndicatorArrow, TimelineNowIndicatorLine, TimelineSlats, TimelineView, buildTimelineDateProfile, computeSlotWidth, createHorizontalStyle, createVerticalStyle, timeToCoord };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fullcalendar/timeline",
-  "version": "7.0.0-beta.1",
+  "version": "7.0.0-beta.3",
   "title": "FullCalendar Timeline Plugin",
   "description": "Display events on a horizontal time axis (without resources)",
   "keywords": [
@@ -15,11 +15,11 @@
   ],
   "homepage": "https://fullcalendar.io/docs/timeline-view-no-resources",
   "dependencies": {
-    "@fullcalendar/premium-common": "7.0.0-beta.1",
-    "@fullcalendar/scrollgrid": "7.0.0-beta.1"
+    "@fullcalendar/premium-common": "7.0.0-beta.3",
+    "@fullcalendar/scrollgrid": "7.0.0-beta.3"
   },
   "peerDependencies": {
-    "@fullcalendar/core": "7.0.0-beta.1"
+    "@fullcalendar/core": "7.0.0-beta.3"
   },
   "type": "module",
   "bugs": "https://fullcalendar.io/reporting-bugs",