@syncfusion/ej2-schedule 25.1.35 → 25.1.39

package/dist/es6/ej2-schedule.es2015.js

@@ -557,6 +557,8 @@ const RTL = 'e-rtl';
 /** @private */
 const DEVICE_CLASS = 'e-device';
 /** @private */
+const ADAPTIVE_CLASS = 'e-adaptive';
+/** @private */
 const MULTI_DRAG = 'e-multi-drag';
 /** @private */
 const ICON = 'e-icons';
@@ -671,6 +673,8 @@ const TIMELINE_WRAPPER_CLASS = 'e-timeline-wrapper';
 /** @private */
 const APPOINTMENT_WRAPPER_CLASS = 'e-appointment-wrapper';
 /** @private */
+const APPOINTMENT_WRAPPER_HIDDEN_CLASS = 'e-appointment-wrapper-hidden';
+/** @private */
 const DAY_WRAPPER_CLASS = 'e-day-wrapper';
 /** @private */
 const TOOLBAR_CONTAINER = 'e-schedule-toolbar-container';
@@ -1082,6 +1086,7 @@ class HeaderRenderer {
             });
             this.toolbarObj.root = this.parent.root ? this.parent.root : this.parent;
             this.toolbarObj.appendTo(this.parent.element.querySelector('.' + HEADER_TOOLBAR));
+            this.toolbarObj.element.setAttribute('aria-label', 'Scheduler');
             const prevNavEle = this.toolbarObj.element.querySelector('.e-prev');
             if (prevNavEle) {
                 prevNavEle.firstElementChild.setAttribute('title', this.l10n.getConstant('previous'));
@@ -1267,7 +1272,7 @@ class HeaderRenderer {
                 switch (item.name) {
                     case 'Today':
                         tbItem = {
-                            showAlwaysInPopup: (this.parent.isAdaptive || this.parent.enableAdaptiveUI), prefixIcon: 'e-icon-day',
+                            showAlwaysInPopup: (this.parent.isAdaptive || this.parent.enableAdaptiveUI), prefixIcon: 'e-icon-today',
                             text: this.l10n.getConstant('today'), cssClass: 'e-today', overflow: 'Show'
                         };
                         tbItem.align = propItem.align ? propItem.align : item.align;
@@ -1353,7 +1358,7 @@ class HeaderRenderer {
         }
         else {
             items.push({
-                align: 'Right', showAlwaysInPopup: (this.parent.isAdaptive || this.parent.enableAdaptiveUI), prefixIcon: 'e-icon-day',
+                align: 'Right', showAlwaysInPopup: (this.parent.isAdaptive || this.parent.enableAdaptiveUI), prefixIcon: 'e-icon-today',
                 text: this.l10n.getConstant('today'), cssClass: 'e-today', overflow: 'Show'
             });
             if (this.parent.views.length > 1) {
@@ -6629,11 +6634,13 @@ class EventBase {
     createEventWrapper(type = '', index = 0) {
         const tr = createElement('tr');
         const levels = this.parent.activeView.colLevels.slice(-1)[0];
+        const className = this.parent.isReact && this.parent.activeViewOptions.eventTemplate ?
+            ' ' + APPOINTMENT_WRAPPER_HIDDEN_CLASS : '';
         for (let i = 0, len = levels.length; i < len; i++) {
             const col = levels[parseInt(i.toString(), 10)];
             const appointmentWrap = createElement('td', {
-                className: (type === 'allDay') ? ALLDAY_APPOINTMENT_WRAPPER_CLASS : (type === 'timeIndicator') ?
-                    TIMELINE_WRAPPER_CLASS : DAY_WRAPPER_CLASS, attrs: { 'data-date': col.date.getTime().toString() }
+                className: (type === 'allDay') ? ALLDAY_APPOINTMENT_WRAPPER_CLASS + className : (type === 'timeIndicator') ?
+                    TIMELINE_WRAPPER_CLASS : DAY_WRAPPER_CLASS + className, attrs: { 'data-date': col.date.getTime().toString() }
             });
             if (!isNullOrUndefined(col.groupIndex)) {
                 appointmentWrap.setAttribute('data-group-index', col.groupIndex.toString());
@@ -6747,6 +6754,14 @@ class VerticalEvent extends EventBase {
         const wrapperElements = [].slice.call(this.parent.element.querySelectorAll('.' + BLOCK_APPOINTMENT_CLASS +
             ',.' + APPOINTMENT_CLASS + ',.' + ROW_COUNT_WRAPPER_CLASS));
         const isDragging = (this.parent.crudModule && this.parent.crudModule.crudObj.isCrudAction) ? true : false;
+        const hideWrapper = (wrapper) => {
+            if (this.parent.isReact && !isNullOrUndefined(this.parent.activeViewOptions.eventTemplate)) {
+                const appWrapper = closest(wrapper, '.' + DAY_WRAPPER_CLASS + ',.' + ALLDAY_APPOINTMENT_WRAPPER_CLASS);
+                if (appWrapper && !appWrapper.classList.contains(APPOINTMENT_WRAPPER_HIDDEN_CLASS)) {
+                    addClass([appWrapper], APPOINTMENT_WRAPPER_HIDDEN_CLASS);
+                }
+            }
+        };
         for (const wrapper of wrapperElements) {
             if (isDragging && !(wrapper.classList.contains(ALLDAY_APPOINTMENT_CLASS) ||
                 wrapper.classList.contains(ROW_COUNT_WRAPPER_CLASS))) {
@@ -6754,11 +6769,13 @@ class VerticalEvent extends EventBase {
                 for (let j = 0, len = this.parent.crudModule.crudObj.sourceEvent.length; j < len; j++) {
                     if (groupIndex === this.parent.crudModule.crudObj.sourceEvent[parseInt(j.toString(), 10)].groupIndex ||
                         groupIndex === this.parent.crudModule.crudObj.targetEvent[parseInt(j.toString(), 10)].groupIndex) {
+                        hideWrapper(wrapper);
                         remove(wrapper);
                     }
                 }
             }
             else {
+                hideWrapper(wrapper);
                 remove(wrapper);
             }
         }
@@ -6793,7 +6810,12 @@ class VerticalEvent extends EventBase {
         if (isDragging) {
             this.parent.crudModule.crudObj.isCrudAction = false;
         }
-        this.parent.renderTemplates();
+        this.parent.renderTemplates(() => {
+            if (this.parent.isReact && this.parent.activeViewOptions.eventTemplate) {
+                const wraps = [].slice.call(this.parent.element.querySelectorAll('.' + APPOINTMENT_WRAPPER_HIDDEN_CLASS));
+                removeClass(wraps, APPOINTMENT_WRAPPER_HIDDEN_CLASS);
+            }
+        });
     }
     initializeValues() {
         this.resources = (this.parent.activeViewOptions.group.resources.length > 0) ? this.parent.uiStateValues.isGroupAdaptive ?
@@ -8165,8 +8187,7 @@ class MonthEvent extends EventBase {
             attrs: {
                 'role': 'button',
                 'tabindex': '0',
-                'aria-label': this.parent.globalize.formatNumber(count) + '&nbsp;'
-                    + (this.parent.isAdaptive ? '' : this.parent.localeObj.getConstant('more')),
+                'aria-label': this.parent.globalize.formatNumber(count) + ' ' + this.parent.localeObj.getConstant('moreEvents'),
                 'data-count': count.toString(),
                 'data-start-date': startDate.getTime().toString(),
                 'data-end-date': endDate.getTime().toString()
@@ -8273,8 +8294,16 @@ class TimelineEvent extends MonthEvent {
         const appointments = [];
         for (const app of appointmentsCollection) {
             if (this.renderType === 'day') {
-                if ((resetTime(app[this.fields.startTime]).getTime() <= resetTime(new Date(startDate.getTime())).getTime()) &&
-                    (resetTime(app[this.fields.endTime]).getTime() >= resetTime(new Date(startDate.getTime())).getTime())) {
+                const start = resetTime(startDate).getTime();
+                const end = resetTime(endDate).getTime();
+                const appStart = resetTime(app[this.fields.startTime]).getTime();
+                const appEnd = resetTime(app[this.fields.endTime]).getTime();
+                const isEndOverlap = () => {
+                    let endTime = (end - (getDateInMs(endDate) <= 0 ? MS_PER_DAY : 0));
+                    endTime = start > endTime ? start : endTime;
+                    return appEnd >= endTime && appStart <= endTime;
+                };
+                if (appStart <= start && appEnd >= start || isEndOverlap() || appStart > start && appEnd < end) {
                     appointments.push(app);
                 }
             }
@@ -9147,7 +9176,7 @@ class QuickPopups {
     renderMorePopup() {
         const moreEventPopup = `<div class="${MORE_EVENT_POPUP_CLASS}"><div class="${MORE_EVENT_HEADER_CLASS}">` +
             `<div class="${MORE_EVENT_CLOSE_CLASS}" title="${this.l10n.getConstant('close')}" tabindex="0" role="button"></div>` +
-            `<div class="${MORE_EVENT_DATE_HEADER_CLASS}"><div class="${MORE_EVENT_HEADER_DAY_CLASS}"></div>` +
+            `<div class="${MORE_EVENT_DATE_HEADER_CLASS}"><div class="${MORE_EVENT_HEADER_DAY_CLASS}" id="${this.parent.element.id}_more_popup"></div>` +
             `<div class="${MORE_EVENT_HEADER_DATE_CLASS} ${NAVIGATE_CLASS}" tabindex="0" role="link"></div></div></div></div>`;
         const moreEventWrapper = createElement('div', {
             className: MORE_POPUP_WRAPPER_CLASS + ' e-popup-close',
@@ -9172,6 +9201,8 @@ class QuickPopups {
             viewPortElement: (this.parent.isAdaptive ? document.body : this.parent.element),
             zIndex: (this.parent.isAdaptive ? 1002 : 2)
         });
+        this.morePopup.element.setAttribute('role', 'dialog');
+        this.morePopup.element.setAttribute('aria-labelledby', this.parent.element.id + '_more_popup');
         const closeButton = this.morePopup.element.querySelector('.' + MORE_EVENT_CLOSE_CLASS);
         this.renderButton('e-round', ICON + ' ' + CLOSE_ICON_CLASS, false, closeButton, this.closeClick);
         EventHandler.add(this.morePopup.element.querySelector('.' + MORE_EVENT_HEADER_DATE_CLASS), 'click', this.navigationClick, this);
@@ -11324,7 +11355,6 @@ let RecurrenceEditor = class RecurrenceEditor extends Component {
     setTemplate() {
         const dayData = this.getDayData('narrow');
         const fullDay = this.getDayData('wide');
-        const labelId = this.element.id + '_' + 'end_label';
         this.element.innerHTML = '<div class="' + HEADER + '">' +
             '<div class="' + INPUTWARAPPER + ' ' + FORMLEFT + '">' +
             '<input type="text" tabindex="0" class="' + REPEATELEMENT +
@@ -11371,7 +11401,7 @@ let RecurrenceEditor = class RecurrenceEditor extends Component {
             '</div></div>' +
             '<div class="' + INPUTWARAPPERSIDE + ' ' + ENDON + ' ' + FORMRIGHT + '">' +
             '<div class="' + INPUTWARAPPER + ' ' + ENDONLEFT + '">' +
-            '<input type="text" tabindex="0" class="' + ENDONELEMENT + '" aria-labelledby="' + labelId + '"title="' + this.localeObj.getConstant(END) + '" />' +
+            '<input type="text" tabindex="0" class="' + ENDONELEMENT + '"title="' + this.localeObj.getConstant(END) + '" />' +
             '</div>' +
             '<div class="' + INPUTWARAPPER + ' ' + ENDONDATE + '" >' +
             '<input type="text" tabindex="0" class="' + UNTILDATE + '"title="' + this.localeObj.getConstant(UNTIL$1) + '" />' +
@@ -13790,6 +13820,27 @@ class VirtualScroll {
             this.itemSize = getElementHeightFromClass(this.parent.activeView.element, WORK_CELLS_CLASS) || this.itemSize;
         }
     }
+    refreshLayout() {
+        const initialHeight = this.parent.uiStateValues.scheduleHeight;
+        this.parent.uiStateValues.scheduleHeight = this.parent.element.offsetHeight;
+        const preRenderedLength = this.renderedLength;
+        if (this.parent.uiStateValues.scheduleHeight !== initialHeight) {
+            if (preRenderedLength < this.getRenderedCount()) {
+                this.isRemoteRefresh = true;
+            }
+            const resWrap = this.parent.element.querySelector('.' + RESOURCE_COLUMN_WRAP_CLASS);
+            const conWrap = this.parent.element.querySelector('.' + CONTENT_WRAP_CLASS);
+            const eventWrap = this.parent.element.querySelector('.' + EVENT_TABLE_CLASS);
+            let firstTDIndex = parseInt(resWrap.querySelector('tbody td').getAttribute('data-group-index'), 10);
+            const endIndex = (firstTDIndex + this.renderedLength);
+            firstTDIndex = (endIndex > this.parent.resourceBase.expandedResources.length) ?
+                (this.parent.resourceBase.expandedResources.length - this.renderedLength) : firstTDIndex;
+            this.parent.resourceBase.renderedResources = this.parent.resourceBase.expandedResources.slice(firstTDIndex, endIndex);
+            if (this.parent.resourceBase.renderedResources.length > 0) {
+                this.updateContent(resWrap, conWrap, eventWrap, this.parent.resourceBase.renderedResources);
+            }
+        }
+    }
     renderEvents() {
         this.setTabIndex();
         const dynamicData = this.triggerScrollEvent(virtualScrollStop);
@@ -13824,7 +13875,9 @@ class VirtualScroll {
             const eventWrap = this.parent.element.querySelector('.' + EVENT_TABLE_CLASS);
             const timeIndicator = this.parent.element.querySelector('.' + CURRENT_TIMELINE_CLASS);
             const conTable = this.parent.element.querySelector('.' + CONTENT_TABLE_CLASS);
-            addClass([conWrap], 'e-transition');
+            if (!this.parent.rowAutoHeight) {
+                addClass([conWrap, resWrap], 'e-transition');
+            }
             this.renderedLength = resWrap.querySelector('tbody').children.length;
             const firstTDIndex = parseInt(resWrap.querySelector('tbody td').getAttribute('data-group-index'), 10);
             const scrollHeight = this.parent.rowAutoHeight ?
@@ -14218,6 +14271,7 @@ class Render {
             }
             throw Error('Inject required modules');
         }
+        this.parent.uiStateValues.scheduleHeight = this.parent.element.offsetHeight;
         this.parent.activeView.viewIndex = this.parent.viewIndex;
         this.updateLabelText(viewName);
         this.parent.activeView.addEventListener();
@@ -14407,6 +14461,9 @@ class Crud {
             return;
         }
         this.parent.trigger(dataBinding, e, (args) => {
+            if (args.cancel) {
+                return;
+            }
             const resultData = extend([], args.result, null, true);
             this.parent.eventsData = resultData.filter((data) => !data[this.parent.eventFields.isBlock]);
             this.parent.blockData = resultData.filter((data) => data[this.parent.eventFields.isBlock]);
@@ -15903,6 +15960,7 @@ class ResourceBase {
                 args = {
                     cancel: false, event: (event) ? event.event : null, groupIndex: this.parent.uiStateValues.groupIndex, requestType: 'resourceChanged'
                 };
+                this.parent.adaptiveGroupIndex = this.parent.uiStateValues.groupIndex;
                 this.parent.trigger(actionComplete, args);
             }
         });
@@ -16559,6 +16617,7 @@ let Schedule = class Schedule extends Component {
      */
     constructor(options, element) {
         super(options, element);
+        this.adaptiveGroupIndex = 0;
     }
     /**
      * Core method that initializes the control rendering.
@@ -16582,6 +16641,12 @@ let Schedule = class Schedule extends Component {
         else {
             removeClasses.push(DEVICE_CLASS);
         }
+        if (this.enableAdaptiveUI) {
+            addClasses.push(ADAPTIVE_CLASS);
+        }
+        else {
+            removeClasses.push(ADAPTIVE_CLASS);
+        }
         if (this.allowMultiDrag) {
             addClasses.push(MULTI_DRAG);
         }
@@ -17183,7 +17248,7 @@ let Schedule = class Schedule extends Component {
         if (this && isNullOrUndefined(this.uiStateValues) || !(this.enablePersistence)) {
             this.uiStateValues = {
                 expand: false, isInitial: true, left: 0, top: 0, isGroupAdaptive: false,
-                isIgnoreOccurrence: false, groupIndex: 0, action: false, isBlock: false, isCustomMonth: true, isPreventTimezone: false
+                isIgnoreOccurrence: false, groupIndex: this.adaptiveGroupIndex, action: false, isBlock: false, isCustomMonth: true, isPreventTimezone: false
             };
         }
         this.currentTimezoneDate = this.getCurrentTime();
@@ -17675,6 +17740,9 @@ let Schedule = class Schedule extends Component {
             && document.activeElement.classList.contains(SUBJECT_CLASS))) {
             return;
         }
+        if (this.virtualScrollModule && this.activeView.isTimelineView()) {
+            this.virtualScrollModule.refreshLayout();
+        }
         if (this.activeViewOptions.timeScale.enable && this.activeView) {
             this.activeView.highlightCurrentTime();
         }
@@ -17686,7 +17754,12 @@ let Schedule = class Schedule extends Component {
             && !this.activeViewOptions.timeScale.enable) || this.activeView.isTimelineView()) {
             this.activeView.resetColWidth();
             this.notify(scrollUiUpdate, { cssProperties: this.getCssProperties(), isPreventScrollUpdate: true });
-            this.refreshEvents(false);
+            let isRemoteRefresh = false;
+            if (this.activeViewOptions.enableLazyLoading && this.virtualScrollModule && this.virtualScrollModule.isRemoteRefresh) {
+                isRemoteRefresh = this.virtualScrollModule.isRemoteRefresh;
+                this.virtualScrollModule.isRemoteRefresh = false;
+            }
+            this.refreshEvents(isRemoteRefresh);
         }
         else {
             this.notify(contentReady, {});
@@ -17869,7 +17942,7 @@ let Schedule = class Schedule extends Component {
      * @private
      */
     getPersistData() {
-        return this.addOnPersist(['currentView', 'selectedDate', 'scrollTop', 'scrollLeft']);
+        return this.addOnPersist(['currentView', 'selectedDate', 'scrollTop', 'scrollLeft', 'adaptiveGroupIndex']);
     }
     /**
      * Called internally, if any of the property value changed.
@@ -22870,7 +22943,7 @@ class ViewBase {
             const colWidth = (getElementWidth(contentBody) / (colElements.length / 2));
             if (content.offsetHeight !== content.clientHeight) {
                 const resourceColumn = this.parent.element.querySelector('.' + RESOURCE_COLUMN_WRAP_CLASS);
-                if (!isNullOrUndefined(resourceColumn)) {
+                if (!isNullOrUndefined(resourceColumn) && resourceColumn.offsetHeight !== content.clientHeight) {
                     setStyleAttribute(resourceColumn, { 'height': formatUnit(content.clientHeight) });
                 }
             }
@@ -23687,6 +23760,20 @@ class VerticalView extends ViewBase {
             append(tooltipTemplate, ntd);
         }
         ntd.setAttribute('data-date', cellDate.getTime().toString());
+        const skeleton = 'full';
+        if (!this.parent.activeViewOptions.timeScale.enable) {
+            const announcementText = this.parent.globalize.formatDate(tdData.date, { skeleton: skeleton, calendar: this.parent.getCalendarMode() });
+            ntd.setAttribute('aria-label', announcementText);
+        }
+        else {
+            const startDateText = this.parent.globalize.formatDate(cellDate, {
+                type: 'dateTime', skeleton: skeleton, calendar: this.parent.getCalendarMode()
+            });
+            const endDateText = this.parent.globalize.formatDate(this.getEndDateFromStartDate(cellDate), {
+                type: 'dateTime', skeleton: skeleton, calendar: this.parent.getCalendarMode()
+            });
+            ntd.setAttribute('aria-label', startDateText + ' ' + this.parent.localeObj.getConstant('endAt') + ' ' + endDateText);
+        }
         if (!isNullOrUndefined(tdData.groupIndex) || this.parent.uiStateValues.isGroupAdaptive) {
             const groupIndex = this.parent.uiStateValues.isGroupAdaptive ? this.parent.uiStateValues.groupIndex :
                 tdData.groupIndex;
@@ -25134,23 +25221,40 @@ class AgendaBase extends ViewBase {
             EventHandler.add(element, 'click', this.parent.agendaModule.dayNavigationClick, this);
         }
     }
-    calculateResourceTableElement(tBody, noOfDays, agendaDate) {
+    calculateResourceTableElement(tBody, noOfDays, agendaDate, agendaEnd = null) {
         if (isNullOrUndefined(this.parent.resourceBase.lastResourceLevel)) {
             const level = this.getDateSlots(this.renderDates, this.parent.activeViewOptions.workDays);
             this.parent.resourceBase.generateResourceLevels(level);
         }
-        const agendaLastDate = addDays(new Date(agendaDate.getTime()), noOfDays);
+        let agendaLastDate = addDays(new Date(agendaDate.getTime()), noOfDays);
         const days = (this.parent.activeViewOptions.group.byDate || this.parent.currentView === 'MonthAgenda') ? noOfDays : 1;
         const resColl = this.parent.resourceBase.resourceCollection;
         const resData = this.parent.resourceBase.lastResourceLevel;
-        const initialDate = agendaDate;
+        const agendaStart = agendaDate;
+        let initialDate = agendaDate;
+        const showWeekend = this.parent.activeViewOptions.showWeekend;
         for (let i = 0; i < days; i++) {
             const lastLevelInfo = [];
             const tempLastLevelInfo = [];
             let tempIndex = 0;
             let eventObj;
             let dateObj;
-            const firstDate = addDays(initialDate, i);
+            let firstDate = addDays(initialDate, i);
+            if (this.parent.currentView === 'Agenda' && this.parent.activeViewOptions.group.byDate &&
+                this.parent.activeViewOptions.allowVirtualScrolling && !showWeekend && !this.isWorkDay(firstDate)) {
+                do {
+                    firstDate = addDays(firstDate, 1);
+                    if (firstDate >= agendaEnd) {
+                        break;
+                    }
+                } while (!this.isWorkDay(firstDate) ||
+                    this.parent.eventBase.filterEvents(firstDate, addDays(firstDate, 1)).length < 1);
+                if (firstDate >= agendaEnd) {
+                    break;
+                }
+                initialDate = addDays(firstDate, -i);
+                agendaLastDate = addDays(firstDate, 1);
+            }
             const finalDate = (this.parent.activeViewOptions.group.byDate || this.parent.currentView === 'MonthAgenda')
                 ? addDays(firstDate, 1) : agendaLastDate;
             const agendaCollection = this.parent.eventBase.filterEvents(firstDate, finalDate);
@@ -25165,7 +25269,9 @@ class AgendaBase extends ViewBase {
                         for (let r = 0; r < noOfDays; r++) {
                             // eslint-disable-next-line max-len
                             const resDayCollection = this.parent.eventBase.filterEvents(agendaDate, addDays(agendaDate, 1), resDataCollection, undefined);
-                            if (resDayCollection.length > 0 || !this.parent.hideEmptyAgendaDays ||
+                            if (((showWeekend || !showWeekend && (this.parent.group.byDate ? this.isWorkDay(agendaDate) :
+                                this.isWorkDay(agendaDate, resData[parseInt(res.toString(), 10)].workDays)))
+                                && (resDayCollection.length > 0 || !this.parent.hideEmptyAgendaDays)) ||
                                 this.parent.currentView === 'MonthAgenda') {
                                 data.push(resDayCollection[0]);
                                 eventObj = {
@@ -25191,16 +25297,18 @@ class AgendaBase extends ViewBase {
                             agendaDate = addDays(agendaDate, 1);
                             if (agendaDate.getTime() >= agendaLastDate.getTime() || this.parent.activeViewOptions.group.byDate
                                 || this.parent.currentView === 'MonthAgenda') {
-                                lastLevelInfo[lastLevelInfo.length - 1][1].cssClass = AGENDA_DAY_BORDER_CLASS;
-                                const tempObj = {
-                                    rowSpan: data.length, type: 'resourceColumn', resource: resColl[parseInt((resColl.length - 1).toString(), 10)],
-                                    groupOrder: resData[parseInt(res.toString(), 10)].groupOrder.slice(0, -1),
-                                    resourceData: resData[parseInt(res.toString(), 10)].resourceData,
-                                    groupIndex: (lastLevelInfo.length - data.length), className: [RESOURCE_NAME],
-                                    date: agendaDate
-                                };
-                                lastLevelInfo[parseInt((lastLevelInfo.length - data.length).toString(), 10)].push(tempObj);
-                                tempLastLevelInfo.push(extend({}, tempObj, null, true));
+                                if (data.length > 0) {
+                                    lastLevelInfo[lastLevelInfo.length - 1][1].cssClass = AGENDA_DAY_BORDER_CLASS;
+                                    const tempObj = {
+                                        rowSpan: data.length, type: 'resourceColumn', resource: resColl[parseInt((resColl.length - 1).toString(), 10)],
+                                        groupOrder: resData[parseInt(res.toString(), 10)].groupOrder.slice(0, -1),
+                                        resourceData: resData[parseInt(res.toString(), 10)].resourceData,
+                                        groupIndex: (lastLevelInfo.length - data.length), className: [RESOURCE_NAME],
+                                        date: agendaDate
+                                    };
+                                    lastLevelInfo[parseInt((lastLevelInfo.length - data.length).toString(), 10)].push(tempObj);
+                                    tempLastLevelInfo.push(extend({}, tempObj, null, true));
+                                }
                                 break;
                             }
                         }
@@ -25235,9 +25343,9 @@ class AgendaBase extends ViewBase {
                 this.createResourceTableRow(lastLevelInfo, tBody);
             }
         }
-        const totalCollection = this.parent.eventBase.filterEvents(initialDate, agendaLastDate);
+        const totalCollection = this.parent.eventBase.filterEvents(agendaStart, agendaLastDate);
         if (totalCollection.length === 0 && !this.parent.activeViewOptions.allowVirtualScrolling && this.parent.hideEmptyAgendaDays) {
-            this.renderEmptyContent(tBody, initialDate);
+            this.renderEmptyContent(tBody, agendaStart);
         }
     }
     createResourceTableRow(tContent, tBody) {
@@ -25492,9 +25600,19 @@ class Agenda extends AgendaBase {
         const firstDate = new Date(agendaDate.getTime());
         const isObject = this.appointmentFiltering(firstDate, lastDate);
         if (isObject.length > 0 && this.parent.activeViewOptions.allowVirtualScrolling && this.parent.hideEmptyAgendaDays) {
-            agendaDate = isObject[0][fieldMapping.startTime];
-            agendaDate = new Date(new Date(agendaDate.getTime()).setHours(0, 0, 0, 0));
-            this.updateHeaderText(isObject[0][fieldMapping.startTime]);
+            if (!this.parent.activeViewOptions.showWeekend && !this.isAgendaWorkDay(isObject[0][fieldMapping.startTime])) {
+                for (const event of isObject) {
+                    if (this.isAgendaWorkDay(event[fieldMapping.startTime])) {
+                        agendaDate = new Date(new Date(event[fieldMapping.startTime].getTime()).setHours(0, 0, 0, 0));
+                        this.updateHeaderText(event[fieldMapping.startTime]);
+                        break;
+                    }
+                }
+            }
+            else {
+                agendaDate = new Date(new Date(isObject[0][fieldMapping.startTime].getTime()).setHours(0, 0, 0, 0));
+                this.updateHeaderText(isObject[0][fieldMapping.startTime]);
+            }
         }
         let endDate;
         if (!this.parent.hideEmptyAgendaDays || (this.parent.agendaDaysCount > 0 && isObject.length > 0)) {
@@ -25508,18 +25626,25 @@ class Agenda extends AgendaBase {
                         this.parent.headerModule.updateHeaderItems('remove');
                     }
                 }
-                this.calculateResourceTableElement(tBody, this.parent.agendaDaysCount, date);
+                this.calculateResourceTableElement(tBody, this.parent.agendaDaysCount, date, lastDate);
             }
             else {
                 for (let day = 0; day < this.parent.agendaDaysCount; day++) {
-                    const filterData = this.appointmentFiltering(agendaDate);
                     const nTr = this.createTableRowElement(agendaDate, 'data');
-                    if (this.element.querySelector('tr[data-row-index="' + parseInt(nTr.getAttribute('data-row-index'), 10) + '"]')) {
+                    const virtualContent = this.element.querySelector('tr[data-row-index="' + (+(nTr.dataset.rowIndex)) + '"]');
+                    if (virtualContent || !this.parent.activeViewOptions.showWeekend && !this.isAgendaWorkDay(agendaDate)) {
                         agendaDate = addDays(agendaDate, 1);
+                        if (!virtualContent && this.parent.activeViewOptions.allowVirtualScrolling) {
+                            day--;
+                        }
+                        if (agendaDate.getTime() > lastDate.getTime()) {
+                            break;
+                        }
                         continue;
                     }
                     const dTd = nTr.children[0];
                     const aTd = nTr.children[1];
+                    const filterData = this.appointmentFiltering(agendaDate);
                     if (filterData.length > 0 || (!this.parent.hideEmptyAgendaDays && filterData.length === 0)) {
                         const elementType = (!this.parent.hideEmptyAgendaDays && filterData.length === 0) ? 'noEvents' : 'data';
                         dTd.appendChild(this.createDateHeaderElement(agendaDate));
@@ -25546,6 +25671,14 @@ class Agenda extends AgendaBase {
         }
         this.agendaDates = { start: firstDate, end: endDate };
     }
+    isAgendaWorkDay(date) {
+        if (this.parent.uiStateValues.isGroupAdaptive && !this.parent.group.byDate) {
+            return this.isWorkDay(date, this.parent.resourceBase.lastResourceLevel[this.parent.uiStateValues.groupIndex].workDays);
+        }
+        else {
+            return this.isWorkDay(date);
+        }
+    }
     agendaScrolling(event) {
         if (this.parent.quickPopup) {
             this.parent.quickPopup.quickPopupHide();
@@ -25650,9 +25783,12 @@ class Agenda extends AgendaBase {
         const lastDate = this.getEndDateFromStartDate(date);
         let daysCount = 0;
         do {
-            const filterData = this.appointmentFiltering(currentDate);
-            if (filterData.length > 0 || !this.parent.hideEmptyAgendaDays) {
-                daysCount++;
+            if (this.parent.activeViewOptions.showWeekend || !this.parent.activeViewOptions.showWeekend &&
+                this.isAgendaWorkDay(currentDate)) {
+                const filterData = this.appointmentFiltering(currentDate);
+                if (filterData.length > 0 || !this.parent.hideEmptyAgendaDays) {
+                    daysCount++;
+                }
             }
             currentDate = addDays(currentDate, (type === 'next') ? 1 : -1);
             if (currentDate < firstDate || currentDate > lastDate) {
@@ -26864,11 +27000,14 @@ class TimelineYear extends Year {
                     groupIndex = this.colLevels.slice(-1)[0][parseInt(month.toString(), 10)].groupIndex;
                     classList$$1.push(WORKDAY_CLASS);
                 }
+                const startDateText = this.parent.globalize.formatDate(date, { type: 'dateTime', skeleton: 'full', calendar: this.parent.getCalendarMode() });
+                const endDateText = this.parent.globalize.formatDate(this.parent.calendarUtil.getMonthEndDate(new Date(monthDate.getTime())), { type: 'dateTime', skeleton: 'full', calendar: this.parent.getCalendarMode() });
                 const td = createElement('td', {
                     className: WORK_CELLS_CLASS,
                     attrs: {
                         'aria-selected': 'false',
-                        'data-date': date.getTime().toString()
+                        'data-date': date.getTime().toString(),
+                        'aria-label': startDateText + ' ' + this.parent.localeObj.getConstant('endAt') + ' ' + endDateText
                     }
                 });
                 addClass([td], classList$$1);