@syncfusion/ej2-schedule 24.2.8 → 25.1.37

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 24.2.8
+*  version : 25.1.37
 *  Copyright Syncfusion Inc. 2001 - 2023. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-schedule@*",
-  "_id": "@syncfusion/ej2-schedule@24.2.4",
+  "_id": "@syncfusion/ej2-schedule@25.1.35",
   "_inBundle": false,
-  "_integrity": "sha512-oBgKnAT6yCQiWtsncH5FXAnymoL6njD8ugNGu7gYoDjpxbslOUZWLq034w0dSmhfjwUfMwOEm9P//XR46ZVcsA==",
+  "_integrity": "sha512-C5bGDJaFwqPz1Wq+Z8zpeJVuVORM+lbciSAfEMADI0Y4RxFMazNh7QeO+TmJob7HNwweDSMqndt8PekrkE+/iw==",
   "_location": "/@syncfusion/ej2-schedule",
   "_phantomChildren": {},
   "_requested": {
@@ -23,10 +23,10 @@
     "/@syncfusion/ej2-react-schedule",
     "/@syncfusion/ej2-vue-schedule"
   ],
-  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-schedule/-/ej2-schedule-24.2.4.tgz",
-  "_shasum": "4439adf0387fa69424cea8d1c249c87491244ef2",
+  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-schedule/-/ej2-schedule-25.1.35.tgz",
+  "_shasum": "dcc2a86f99921e8b4a2578498d701159a470ecec",
   "_spec": "@syncfusion/ej2-schedule@*",
-  "_where": "/jenkins/workspace/elease-automation_release_24.1.1/packages/included",
+  "_where": "/jenkins/workspace/elease-automation_release_25.1.1/packages/included",
   "author": {
     "name": "Syncfusion Inc."
   },
@@ -35,16 +35,16 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~24.2.7",
-    "@syncfusion/ej2-buttons": "~24.2.7",
-    "@syncfusion/ej2-calendars": "~24.2.8",
-    "@syncfusion/ej2-data": "~24.2.3",
-    "@syncfusion/ej2-dropdowns": "~24.2.8",
-    "@syncfusion/ej2-excel-export": "~24.2.4",
-    "@syncfusion/ej2-inputs": "~24.2.7",
-    "@syncfusion/ej2-lists": "~24.2.8",
-    "@syncfusion/ej2-navigations": "~24.2.8",
-    "@syncfusion/ej2-popups": "~24.2.8"
+    "@syncfusion/ej2-base": "~25.1.35",
+    "@syncfusion/ej2-buttons": "~25.1.35",
+    "@syncfusion/ej2-calendars": "~25.1.37",
+    "@syncfusion/ej2-data": "~25.1.35",
+    "@syncfusion/ej2-dropdowns": "~25.1.37",
+    "@syncfusion/ej2-excel-export": "~25.1.35",
+    "@syncfusion/ej2-inputs": "~25.1.37",
+    "@syncfusion/ej2-lists": "~25.1.35",
+    "@syncfusion/ej2-navigations": "~25.1.37",
+    "@syncfusion/ej2-popups": "~25.1.35"
   },
   "deprecated": false,
   "description": "Flexible scheduling library with more built-in features and enhanced customization options similar to outlook and google calendar, allowing the users to plan and manage their appointments with efficient data-binding support.",
@@ -73,6 +73,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "24.2.8",
+  "version": "25.1.37",
   "sideEffects": false
 }

package/src/recurrence-editor/recurrence-editor.js

@@ -716,7 +716,6 @@ var RecurrenceEditor = /** @class */ (function (_super) {
     RecurrenceEditor.prototype.setTemplate = function () {
         var dayData = this.getDayData('narrow');
         var fullDay = this.getDayData('wide');
-        var labelId = this.element.id + '_' + 'end_label';
         this.element.innerHTML = '<div class="' + HEADER + '">' +
             '<div class="' + INPUTWARAPPER + ' ' + FORMLEFT + '">' +
             '<input type="text" tabindex="0" class="' + REPEATELEMENT +
@@ -763,7 +762,7 @@ var RecurrenceEditor = /** @class */ (function (_super) {
             '</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) + '" />' +

package/src/schedule/actions/crud.js

@@ -29,6 +29,12 @@ var Crud = /** @class */ (function () {
         if (!this.parent.activeView) {
             return;
         }
+        if (this.parent.uiStateValues && this.parent.uiStateValues.isPreventEventRefresh) {
+            this.parent.uiStateValues.isPreventEventRefresh = false;
+            this.parent.refreshEvents(false);
+            this.parent.hideSpinner();
+            return;
+        }
         var start = this.parent.activeView.startDate();
         var end = this.parent.activeView.endDate();
         var dataManager = this.parent.dataModule.getData(this.parent.dataModule.generateQuery(start, end));
@@ -40,6 +46,9 @@ var Crud = /** @class */ (function () {
             return;
         }
         this.parent.trigger(events.dataBinding, e, function (args) {
+            if (args.cancel) {
+                return;
+            }
             var resultData = extend([], args.result, null, true);
             _this.parent.eventsData = resultData.filter(function (data) { return !data[_this.parent.eventFields.isBlock]; });
             _this.parent.blockData = resultData.filter(function (data) { return data[_this.parent.eventFields.isBlock]; });

package/src/schedule/actions/keyboard.d.ts

@@ -42,6 +42,7 @@ export declare class KeyboardInteraction {
     private getUniqueAppointmentElements;
     private getWorkCellFromAppointmentElement;
     private processViewNavigation;
+    private isCalendarTarget;
     private cancelUpDownAction;
     private processUp;
     private processDown;

package/src/schedule/actions/keyboard.js

@@ -558,6 +558,13 @@ var KeyboardInteraction = /** @class */ (function () {
             }
         }
     };
+    KeyboardInteraction.prototype.isCalendarTarget = function (e) {
+        var keyTarget = e.currentTarget || e.target;
+        if (keyTarget && !isNullOrUndefined(keyTarget.querySelector('.e-header-popup.e-popup-open'))) {
+            return true;
+        }
+        return false;
+    };
     KeyboardInteraction.prototype.cancelUpDownAction = function (isTimelineYear) {
         var isVerticalYear = isTimelineYear && this.parent.activeViewOptions.orientation === 'Vertical';
         var isGroup = this.parent.activeViewOptions.group.resources.length > 0;
@@ -571,7 +578,7 @@ var KeyboardInteraction = /** @class */ (function () {
     };
     KeyboardInteraction.prototype.processUp = function (e, isMultiple) {
         var isTimelineYear = this.parent.currentView === 'TimelineYear';
-        if (isMultiple && this.cancelUpDownAction(isTimelineYear)) {
+        if (isMultiple && this.cancelUpDownAction(isTimelineYear) || (this.isCalendarTarget(e))) {
             return;
         }
         var target = (e.target);
@@ -619,7 +626,7 @@ var KeyboardInteraction = /** @class */ (function () {
     };
     KeyboardInteraction.prototype.processDown = function (e, isMultiple) {
         var isTimelineYear = this.parent.currentView === 'TimelineYear';
-        if (isMultiple && this.cancelUpDownAction(isTimelineYear)) {
+        if (isMultiple && this.cancelUpDownAction(isTimelineYear) || (this.isCalendarTarget(e))) {
             return;
         }
         var target = (e.target);
@@ -729,7 +736,7 @@ var KeyboardInteraction = /** @class */ (function () {
     };
     KeyboardInteraction.prototype.processRight = function (e, isMultiple) {
         var isTimelineYear = this.parent.currentView === 'TimelineYear';
-        if (this.isCancelLeftRightAction(e, isMultiple, isTimelineYear)) {
+        if (this.isCancelLeftRightAction(e, isMultiple, isTimelineYear) || (this.isCalendarTarget(e))) {
             return;
         }
         var selectedCells = this.parent.getSelectedCells();
@@ -800,7 +807,7 @@ var KeyboardInteraction = /** @class */ (function () {
     };
     KeyboardInteraction.prototype.processLeft = function (e, isMultiple) {
         var isTimelineYear = this.parent.currentView === 'TimelineYear';
-        if (this.isCancelLeftRightAction(e, isMultiple, isTimelineYear)) {
+        if (this.isCancelLeftRightAction(e, isMultiple, isTimelineYear) || (this.isCalendarTarget(e))) {
             return;
         }
         var target = (e.target);

package/src/schedule/base/css-constant.d.ts

@@ -122,6 +122,8 @@ export declare const TIMELINE_WRAPPER_CLASS: string;
 /** @private */
 export declare const APPOINTMENT_WRAPPER_CLASS: string;
 /** @private */
+export declare const APPOINTMENT_WRAPPER_HIDDEN_CLASS: string;
+/** @private */
 export declare const DAY_WRAPPER_CLASS: string;
 /** @private */
 export declare const TOOLBAR_CONTAINER: string;

package/src/schedule/base/css-constant.js

@@ -122,6 +122,8 @@ export var TIMELINE_WRAPPER_CLASS = 'e-timeline-wrapper';
 /** @private */
 export var APPOINTMENT_WRAPPER_CLASS = 'e-appointment-wrapper';
 /** @private */
+export var APPOINTMENT_WRAPPER_HIDDEN_CLASS = 'e-appointment-wrapper-hidden';
+/** @private */
 export var DAY_WRAPPER_CLASS = 'e-day-wrapper';
 /** @private */
 export var TOOLBAR_CONTAINER = 'e-schedule-toolbar-container';

package/src/schedule/base/interface.d.ts

@@ -521,6 +521,7 @@ export interface UIStateArgs {
     isBlock?: boolean;
     isCustomMonth?: boolean;
     isPreventTimezone?: boolean;
+    isPreventEventRefresh?: boolean;
 }
 /**
  *  @private

package/src/schedule/base/schedule.d.ts

@@ -1457,9 +1457,10 @@ export declare class Schedule extends Component<HTMLElement> implements INotifyP
      *
      * @function setResourceCollections
      * @param {ResourcesModel[]} resourceCol Accepts the resource collections in ResourcesModel type
+     * @param {boolean} isEventDataRefresh Accepts the boolean to refresh the appointment data source from remote or local
      * @returns {void}
      */
-    setResourceCollections(resourceCol: ResourcesModel[]): void;
+    setResourceCollections(resourceCol: ResourcesModel[], isEventDataRefresh?: boolean): void;
     /**
      * Current View could be change based on the provided parameters.
      *
@@ -1708,6 +1709,8 @@ export declare class Schedule extends Component<HTMLElement> implements INotifyP
     getEventDetails(element: Element): Record<string, any>;
     /**
      * To check whether the given time range slots are available for event creation or already occupied by other events.
+     * This method currently focuses on validating appointments within the current view date range.
+     * However, it does not extend this availability check to recurrence occurrences outside of the current date range.
      *
      * @function isSlotAvailable
      * @param {Date | Object} startTime Denotes the start time of the slot.

package/src/schedule/base/schedule.js

@@ -1992,9 +1992,14 @@ var Schedule = /** @class */ (function (_super) {
      *
      * @function setResourceCollections
      * @param {ResourcesModel[]} resourceCol Accepts the resource collections in ResourcesModel type
+     * @param {boolean} isEventDataRefresh Accepts the boolean to refresh the appointment data source from remote or local
      * @returns {void}
      */
-    Schedule.prototype.setResourceCollections = function (resourceCol) {
+    Schedule.prototype.setResourceCollections = function (resourceCol, isEventDataRefresh) {
+        if (isEventDataRefresh === void 0) { isEventDataRefresh = true; }
+        if (!isEventDataRefresh && this.uiStateValues) {
+            this.uiStateValues.isPreventEventRefresh = true;
+        }
         this.setProperties({ resources: resourceCol }, false);
     };
     /**
@@ -2114,6 +2119,8 @@ var Schedule = /** @class */ (function (_super) {
             this.iCalendarExportModule.initializeCalendarExport(fileName, customData);
         }
         else {
+            console.warn('[WARNING] :: Module "ICalendarExport" is not available in Schedule component!' +
+                ' You either misspelled the module name or forgot to load it.');
             throw Error('Inject ICalendarExport module');
         }
     };
@@ -2130,6 +2137,8 @@ var Schedule = /** @class */ (function (_super) {
             this.iCalendarImportModule.initializeCalendarImport(fileContent);
         }
         else {
+            console.warn('[WARNING] :: Module "ICalendarImport" is not available in Schedule component!' +
+                ' You either misspelled the module name or forgot to load it.');
             throw Error('Inject ICalendarImport module');
         }
     };
@@ -2175,6 +2184,8 @@ var Schedule = /** @class */ (function (_super) {
             this.excelExportModule.initializeExcelExport(excelExportOptions);
         }
         else {
+            console.warn('[WARNING] :: Module "ExcelExport" is not available in Schedule component!' +
+                ' You either misspelled the module name or forgot to load it.');
             throw Error('Inject ExcelExport module');
         }
     };
@@ -2191,6 +2202,8 @@ var Schedule = /** @class */ (function (_super) {
             this.printModule.print(printOptions);
         }
         else {
+            console.warn('[WARNING] :: Module "Print" is not available in Schedule component!' +
+                ' You either misspelled the module name or forgot to load it.');
             throw Error('Inject Print module');
         }
     };
@@ -2474,6 +2487,8 @@ var Schedule = /** @class */ (function (_super) {
     };
     /**
      * To check whether the given time range slots are available for event creation or already occupied by other events.
+     * This method currently focuses on validating appointments within the current view date range.
+     * However, it does not extend this availability check to recurrence occurrences outside of the current date range.
      *
      * @function isSlotAvailable
      * @param {Date | Object} startTime Denotes the start time of the slot.

package/src/schedule/base/type.d.ts

@@ -41,6 +41,7 @@ export declare type ReturnType = {
     result: Record<string, any>[];
     count: number;
     aggregates?: Record<string, any>;
+    cancel: boolean;
 };
 /**
  * An enum that holds the available popup types in the scheduler. They are

package/src/schedule/event-renderer/agenda-base.d.ts

@@ -6,7 +6,7 @@ export declare class AgendaBase extends ViewBase {
     createAppointment(event: Record<string, any>): HTMLElement[];
     processAgendaEvents(events: Record<string, any>[]): Record<string, any>[];
     wireEventActions(): void;
-    calculateResourceTableElement(tBody: Element, noOfDays: number, agendaDate: Date): void;
+    calculateResourceTableElement(tBody: Element, noOfDays: number, agendaDate: Date, agendaEnd?: Date): void;
     private createResourceTableRow;
     createDateHeaderElement(date: Date): Element;
     renderEmptyContent(tBody: Element, agendaDate: Date): void;

package/src/schedule/event-renderer/agenda-base.js

@@ -163,7 +163,8 @@ var AgendaBase = /** @class */ (function (_super) {
             EventHandler.add(element, 'click', this.parent.agendaModule.dayNavigationClick, this);
         }
     };
-    AgendaBase.prototype.calculateResourceTableElement = function (tBody, noOfDays, agendaDate) {
+    AgendaBase.prototype.calculateResourceTableElement = function (tBody, noOfDays, agendaDate, agendaEnd) {
+        if (agendaEnd === void 0) { agendaEnd = null; }
         if (isNullOrUndefined(this.parent.resourceBase.lastResourceLevel)) {
             var level = this.getDateSlots(this.renderDates, this.parent.activeViewOptions.workDays);
             this.parent.resourceBase.generateResourceLevels(level);
@@ -172,7 +173,9 @@ var AgendaBase = /** @class */ (function (_super) {
         var days = (this.parent.activeViewOptions.group.byDate || this.parent.currentView === 'MonthAgenda') ? noOfDays : 1;
         var resColl = this.parent.resourceBase.resourceCollection;
         var resData = this.parent.resourceBase.lastResourceLevel;
+        var agendaStart = agendaDate;
         var initialDate = agendaDate;
+        var showWeekend = this.parent.activeViewOptions.showWeekend;
         for (var i = 0; i < days; i++) {
             var lastLevelInfo = [];
             var tempLastLevelInfo = [];
@@ -180,6 +183,21 @@ var AgendaBase = /** @class */ (function (_super) {
             var eventObj = void 0;
             var dateObj = void 0;
             var firstDate = util.addDays(initialDate, i);
+            if (this.parent.currentView === 'Agenda' && this.parent.activeViewOptions.group.byDate &&
+                this.parent.activeViewOptions.allowVirtualScrolling && !showWeekend && !this.isWorkDay(firstDate)) {
+                do {
+                    firstDate = util.addDays(firstDate, 1);
+                    if (firstDate >= agendaEnd) {
+                        break;
+                    }
+                } while (!this.isWorkDay(firstDate) ||
+                    this.parent.eventBase.filterEvents(firstDate, util.addDays(firstDate, 1)).length < 1);
+                if (firstDate >= agendaEnd) {
+                    break;
+                }
+                initialDate = util.addDays(firstDate, -i);
+                agendaLastDate = util.addDays(firstDate, 1);
+            }
             var finalDate = (this.parent.activeViewOptions.group.byDate || this.parent.currentView === 'MonthAgenda')
                 ? util.addDays(firstDate, 1) : agendaLastDate;
             var agendaCollection = this.parent.eventBase.filterEvents(firstDate, finalDate);
@@ -194,7 +212,9 @@ var AgendaBase = /** @class */ (function (_super) {
                         for (var r = 0; r < noOfDays; r++) {
                             // eslint-disable-next-line max-len
                             var resDayCollection = this.parent.eventBase.filterEvents(agendaDate, util.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 = {
@@ -220,16 +240,18 @@ var AgendaBase = /** @class */ (function (_super) {
                             agendaDate = util.addDays(agendaDate, 1);
                             if (agendaDate.getTime() >= agendaLastDate.getTime() || this.parent.activeViewOptions.group.byDate
                                 || this.parent.currentView === 'MonthAgenda') {
-                                lastLevelInfo[lastLevelInfo.length - 1][1].cssClass = cls.AGENDA_DAY_BORDER_CLASS;
-                                var 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: [cls.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 = cls.AGENDA_DAY_BORDER_CLASS;
+                                    var 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: [cls.RESOURCE_NAME],
+                                        date: agendaDate
+                                    };
+                                    lastLevelInfo[parseInt((lastLevelInfo.length - data.length).toString(), 10)].push(tempObj);
+                                    tempLastLevelInfo.push(extend({}, tempObj, null, true));
+                                }
                                 break;
                             }
                         }
@@ -264,9 +286,9 @@ var AgendaBase = /** @class */ (function (_super) {
                 this.createResourceTableRow(lastLevelInfo, tBody);
             }
         }
-        var totalCollection = this.parent.eventBase.filterEvents(initialDate, agendaLastDate);
+        var 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);
         }
     };
     AgendaBase.prototype.createResourceTableRow = function (tContent, tBody) {

package/src/schedule/event-renderer/event-base.js

@@ -1281,11 +1281,13 @@ var EventBase = /** @class */ (function () {
         if (index === void 0) { index = 0; }
         var tr = createElement('tr');
         var levels = this.parent.activeView.colLevels.slice(-1)[0];
+        var className = this.parent.isReact && this.parent.activeViewOptions.eventTemplate ?
+            ' ' + cls.APPOINTMENT_WRAPPER_HIDDEN_CLASS : '';
         for (var i = 0, len = levels.length; i < len; i++) {
             var col = levels[parseInt(i.toString(), 10)];
             var appointmentWrap = createElement('td', {
-                className: (type === 'allDay') ? cls.ALLDAY_APPOINTMENT_WRAPPER_CLASS : (type === 'timeIndicator') ?
-                    cls.TIMELINE_WRAPPER_CLASS : cls.DAY_WRAPPER_CLASS, attrs: { 'data-date': col.date.getTime().toString() }
+                className: (type === 'allDay') ? cls.ALLDAY_APPOINTMENT_WRAPPER_CLASS + className : (type === 'timeIndicator') ?
+                    cls.TIMELINE_WRAPPER_CLASS : cls.DAY_WRAPPER_CLASS + className, attrs: { 'data-date': col.date.getTime().toString() }
             });
             if (!isNullOrUndefined(col.groupIndex)) {
                 appointmentWrap.setAttribute('data-group-index', col.groupIndex.toString());

package/src/schedule/event-renderer/vertical-view.js

@@ -44,6 +44,7 @@ var VerticalEvent = /** @class */ (function (_super) {
         return _this;
     }
     VerticalEvent.prototype.renderAppointments = function () {
+        var _this = this;
         if (isNullOrUndefined(this.parent)) {
             return;
         }
@@ -103,7 +104,12 @@ var VerticalEvent = /** @class */ (function (_super) {
         if (isDragging) {
             this.parent.crudModule.crudObj.isCrudAction = false;
         }
-        this.parent.renderTemplates();
+        this.parent.renderTemplates(function () {
+            if (_this.parent.isReact && _this.parent.activeViewOptions.eventTemplate) {
+                var wraps = [].slice.call(_this.parent.element.querySelectorAll('.' + cls.APPOINTMENT_WRAPPER_HIDDEN_CLASS));
+                removeClass(wraps, cls.APPOINTMENT_WRAPPER_HIDDEN_CLASS);
+            }
+        });
     };
     VerticalEvent.prototype.initializeValues = function () {
         this.resources = (this.parent.activeViewOptions.group.resources.length > 0) ? this.parent.uiStateValues.isGroupAdaptive ?

package/src/schedule/popups/quick-popups.js

@@ -1357,6 +1357,17 @@ var QuickPopups = /** @class */ (function () {
                 instance.destroy();
             }
         }
+        if (popupName === 'quickPopup') {
+            var input = popup.element.querySelector('input.' + cls.SUBJECT_CLASS);
+            if (input) {
+                input.remove();
+            }
+            var form = this.quickPopup.element.querySelector('form.' + cls.FORM_CLASS);
+            if (form) {
+                util.removeChildren(form);
+                form.remove();
+            }
+        }
     };
     QuickPopups.prototype.refreshQuickDialog = function () {
         this.destroyQuickDialog();

package/src/schedule/renderer/agenda.d.ts

@@ -20,6 +20,7 @@ export declare class Agenda extends AgendaBase implements IRenderer {
     refreshHeader(): void;
     private renderInitialContent;
     renderContent(tBody: Element, agendaDate: Date, lastDate: Date): void;
+    private isAgendaWorkDay;
     private agendaScrolling;
     private virtualScrolling;
     private getElementFromScrollerPosition;

package/src/schedule/renderer/agenda.js

@@ -150,9 +150,20 @@ var Agenda = /** @class */ (function (_super) {
         var firstDate = new Date(agendaDate.getTime());
         var 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 (var _i = 0, isObject_1 = isObject; _i < isObject_1.length; _i++) {
+                    var event_2 = isObject_1[_i];
+                    if (this.isAgendaWorkDay(event_2[fieldMapping.startTime])) {
+                        agendaDate = new Date(new Date(event_2[fieldMapping.startTime].getTime()).setHours(0, 0, 0, 0));
+                        this.updateHeaderText(event_2[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]);
+            }
         }
         var endDate;
         if (!this.parent.hideEmptyAgendaDays || (this.parent.agendaDaysCount > 0 && isObject.length > 0)) {
@@ -166,18 +177,25 @@ var Agenda = /** @class */ (function (_super) {
                         this.parent.headerModule.updateHeaderItems('remove');
                     }
                 }
-                this.calculateResourceTableElement(tBody, this.parent.agendaDaysCount, date);
+                this.calculateResourceTableElement(tBody, this.parent.agendaDaysCount, date, lastDate);
             }
             else {
                 for (var day = 0; day < this.parent.agendaDaysCount; day++) {
-                    var filterData = this.appointmentFiltering(agendaDate);
                     var nTr = this.createTableRowElement(agendaDate, 'data');
-                    if (this.element.querySelector('tr[data-row-index="' + parseInt(nTr.getAttribute('data-row-index'), 10) + '"]')) {
+                    var virtualContent = this.element.querySelector('tr[data-row-index="' + (+(nTr.dataset.rowIndex)) + '"]');
+                    if (virtualContent || !this.parent.activeViewOptions.showWeekend && !this.isAgendaWorkDay(agendaDate)) {
                         agendaDate = util.addDays(agendaDate, 1);
+                        if (!virtualContent && this.parent.activeViewOptions.allowVirtualScrolling) {
+                            day--;
+                        }
+                        if (agendaDate.getTime() > lastDate.getTime()) {
+                            break;
+                        }
                         continue;
                     }
                     var dTd = nTr.children[0];
                     var aTd = nTr.children[1];
+                    var filterData = this.appointmentFiltering(agendaDate);
                     if (filterData.length > 0 || (!this.parent.hideEmptyAgendaDays && filterData.length === 0)) {
                         var elementType = (!this.parent.hideEmptyAgendaDays && filterData.length === 0) ? 'noEvents' : 'data';
                         dTd.appendChild(this.createDateHeaderElement(agendaDate));
@@ -204,6 +222,14 @@ var Agenda = /** @class */ (function (_super) {
         }
         this.agendaDates = { start: firstDate, end: endDate };
     };
+    Agenda.prototype.isAgendaWorkDay = function (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);
+        }
+    };
     Agenda.prototype.agendaScrolling = function (event) {
         if (this.parent.quickPopup) {
             this.parent.quickPopup.quickPopupHide();
@@ -308,9 +334,12 @@ var Agenda = /** @class */ (function (_super) {
         var lastDate = this.getEndDateFromStartDate(date);
         var daysCount = 0;
         do {
-            var filterData = this.appointmentFiltering(currentDate);
-            if (filterData.length > 0 || !this.parent.hideEmptyAgendaDays) {
-                daysCount++;
+            if (this.parent.activeViewOptions.showWeekend || !this.parent.activeViewOptions.showWeekend &&
+                this.isAgendaWorkDay(currentDate)) {
+                var filterData = this.appointmentFiltering(currentDate);
+                if (filterData.length > 0 || !this.parent.hideEmptyAgendaDays) {
+                    daysCount++;
+                }
             }
             currentDate = util.addDays(currentDate, (type === 'next') ? 1 : -1);
             if (currentDate < firstDate || currentDate > lastDate) {

package/src/schedule/renderer/renderer.js

@@ -51,15 +51,21 @@ var Render = /** @class */ (function () {
                 break;
             case 'TimelineDay':
                 this.parent.activeView = this.parent.timelineViewsModule;
-                this.parent.activeView.viewClass = 'e-timeline-day-view';
+                if (!isNullOrUndefined(this.parent.activeView)) {
+                    this.parent.activeView.viewClass = 'e-timeline-day-view';
+                }
                 break;
             case 'TimelineWorkWeek':
                 this.parent.activeView = this.parent.timelineViewsModule;
-                this.parent.activeView.viewClass = 'e-timeline-work-week-view';
+                if (!isNullOrUndefined(this.parent.activeView)) {
+                    this.parent.activeView.viewClass = 'e-timeline-work-week-view';
+                }
                 break;
             case 'TimelineWeek':
                 this.parent.activeView = this.parent.timelineViewsModule;
-                this.parent.activeView.viewClass = 'e-timeline-week-view';
+                if (!isNullOrUndefined(this.parent.activeView)) {
+                    this.parent.activeView.viewClass = 'e-timeline-week-view';
+                }
                 break;
             case 'TimelineMonth':
                 this.parent.activeView = this.parent.timelineMonthModule;
@@ -76,6 +82,8 @@ var Render = /** @class */ (function () {
                     this.parent.headerModule.updateActiveView();
                     this.parent.headerModule.setCalendarView();
                 }
+                console.warn('[WARNING] :: Module "' + viewName + '" is not available in Schedule component!' +
+                    ' You either misspelled the module name or forgot to load it.');
                 return this.initializeLayout(firstView);
             }
             throw Error('Inject required modules');

package/styles/bootstrap-dark.css

@@ -138,6 +138,10 @@
   color: #fff;
 }
 
+.e-bigger.e-multiselect.e-control-container .e-multi-select-wrapper .e-clear-icon {
+  margin-top: -3.2em;
+}
+
 /*! recurrence editor theme wise definitions*/ /*! Schedule component's bootstrap theme definitions and variables */
 .e-schedule .e-schedule-toolbar .e-icon-prev::before {
   content: "\e990";
@@ -323,6 +327,9 @@
   font-size: 14px;
   text-transform: initial;
 }
+.e-schedule .e-schedule-toolbar .e-toolbar-items {
+  height: 43px;
+}
 .e-schedule .e-schedule-toolbar .e-toolbar-items.e-tbar-pos {
   height: 43px;
   min-height: 43px;
@@ -1031,6 +1038,9 @@
   padding: 0;
   position: relative;
 }
+.e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
+  visibility: hidden;
+}
 .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
   cursor: default;
 }
@@ -2485,8 +2495,8 @@
 .e-bigger.e-schedule .e-schedule-toolbar .e-toolbar-items .e-toolbar-item {
   min-height: 56px;
 }
-.e-bigger .e-schedule .e-schedule-toolbar .e-toolbar-items .e-toolbar-item:not(.e-separator),
-.e-bigger.e-schedule .e-schedule-toolbar .e-toolbar-items .e-toolbar-item:not(.e-separator) {
+.e-bigger .e-schedule .e-schedule-toolbar .e-toolbar-items .e-toolbar-item:not(.e-separator):not(.e-spacer),
+.e-bigger.e-schedule .e-schedule-toolbar .e-toolbar-items .e-toolbar-item:not(.e-separator):not(.e-spacer) {
   min-width: 34px;
 }
 .e-bigger .e-schedule .e-schedule-toolbar .e-toolbar-items .e-toolbar-item.e-separator,