@syncfusion/ej2-schedule 20.1.61 → 20.2.40

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

@@ -5154,7 +5154,7 @@ class EventBase {
             if (timeZonePropChanged) {
                 this.processTimezoneChange(event, oldTimezone);
             }
-            else if (!this.parent.isPrinting && !this.parent.uiStateValues.isResize) {
+            else if (!this.parent.isPrinting && !this.parent.uiStateValues.isPreventTimezone) {
                 event = this.processTimezone(event);
             }
             for (let level = 0; level < resourceCollection.length; level++) {
@@ -5600,7 +5600,7 @@ class EventBase {
     removeSelectedAppointmentClass() {
         const selectedAppointments = this.getSelectedAppointments();
         for (const appointment of selectedAppointments) {
-            appointment.setAttribute('aria-selected', 'false');
+            appointment.setAttribute('aria-pressed', 'false');
         }
         removeClass(selectedAppointments, APPOINTMENT_BORDER);
         if (this.parent.currentView === 'Agenda' || this.parent.currentView === 'MonthAgenda') {
@@ -5609,7 +5609,7 @@ class EventBase {
     }
     addSelectedAppointments(cells) {
         for (const cell of cells) {
-            cell.setAttribute('aria-selected', 'true');
+            cell.setAttribute('aria-pressed', 'true');
         }
         if (this.parent.currentView !== 'MonthAgenda') {
             this.parent.removeSelectedClass();
@@ -5946,7 +5946,7 @@ class EventBase {
         const exception = event[this.parent.eventFields.recurrenceException];
         let maxCount;
         if (this.parent.currentView !== 'Agenda' && isMaxCount) {
-            maxCount = getDateCount(this.parent.activeView.startDate(), this.parent.activeView.endDate()) + 1;
+            maxCount = getDateCount(viewDate, this.parent.activeView.endDate()) + 1;
         }
         const newTimezone = this.parent.timezone || this.parent.tzModule.getLocalTimezoneName();
         const firstDay = this.parent.activeViewOptions.firstDayOfWeek;
@@ -5966,8 +5966,9 @@ class EventBase {
             }
         }
         const occurrenceCollection = [];
-        for (const date of dates) {
+        for (let date of dates) {
             const clonedObject = extend({}, event, null, true);
+            date = this.getDSTAdjustedTime(date, clonedObject);
             clonedObject[this.parent.eventFields.startTime] = new Date(date);
             clonedObject[this.parent.eventFields.endTime] = new Date(new Date(date).setMilliseconds(duration));
             clonedObject[this.parent.eventFields.recurrenceID] = clonedObject[this.parent.eventFields.id];
@@ -5978,6 +5979,21 @@ class EventBase {
         }
         return occurrenceCollection;
     }
+    getDSTAdjustedTime(date, event) {
+        let occurDate = date;
+        if (this.parent.timezone &&
+            (event[this.parent.eventFields.startTimezone] || event[this.parent.eventFields.endTimezone])) {
+            const eventOffset = this.getDSTDiff(event[this.parent.eventFields.startTime], new Date(date), event[this.parent.eventFields.startTimezone]);
+            const schOffset = this.getDSTDiff(event[this.parent.eventFields.startTime], new Date(date), this.parent.timezone);
+            occurDate = (new Date(date).getTime() - (eventOffset - schOffset) * 60000);
+        }
+        return occurDate;
+    }
+    getDSTDiff(startDate, occurDate, timezone) {
+        const startOffset = this.parent.tzModule.offset(new Date(startDate), timezone);
+        const occurOffset = this.parent.tzModule.offset(new Date(occurDate), timezone);
+        return startOffset - occurOffset;
+    }
     getParentEvent(eventObj, isParent = false) {
         let parentEvent;
         do {
@@ -6123,7 +6139,7 @@ class EventBase {
             className: BLOCK_APPOINTMENT_CLASS,
             attrs: {
                 'data-id': 'Appointment_' + record[this.parent.eventFields.id],
-                'aria-readonly': 'true', 'aria-selected': 'false'
+                'aria-disabled': 'true', 'aria-pressed': 'false'
             }
         });
         let templateElement;
@@ -6547,8 +6563,8 @@ class VerticalEvent extends EventBase {
                 'data-guid': record.Guid,
                 'role': 'button',
                 'tabindex': '0',
-                'aria-readonly': this.parent.eventBase.getReadonlyAttribute(record),
-                'aria-selected': 'false',
+                'aria-disabled': this.parent.eventBase.getReadonlyAttribute(record),
+                'aria-pressed': 'false',
                 'aria-grabbed': 'true',
                 'aria-label': this.parent.getAnnouncementString(record)
             }
@@ -6643,7 +6659,7 @@ class VerticalEvent extends EventBase {
             });
             const moreIndicatorElement = createElement('div', {
                 className: MORE_INDICATOR_CLASS,
-                attrs: { 'tabindex': '0', 'role': 'list', 'data-index': index.toString(), 'data-count': '1' },
+                attrs: { 'tabindex': '0', 'data-index': index.toString(), 'data-count': '1' },
                 innerHTML: '+1&nbsp;' + (this.parent.isAdaptive ? '' : this.parent.localeObj.getConstant('more'))
             });
             innerCountWrap.appendChild(moreIndicatorElement);
@@ -7436,7 +7452,7 @@ class MonthEvent extends EventBase {
         const attrs = {
             'data-id': 'Appointment_' + record[this.fields.id],
             'role': 'button', 'tabindex': '0',
-            'aria-readonly': this.parent.eventBase.getReadonlyAttribute(record), 'aria-selected': 'false', 'aria-grabbed': 'true',
+            'aria-disabled': this.parent.eventBase.getReadonlyAttribute(record), 'aria-pressed': 'false', 'aria-grabbed': 'true',
             'aria-label': this.parent.getAnnouncementString(newRecord, eventSubject)
         };
         if (!isCloneElement) {
@@ -7726,8 +7742,7 @@ class MonthEvent extends EventBase {
                 'tabindex': '0',
                 'data-count': count.toString(),
                 'data-start-date': startDate.getTime().toString(),
-                'data-end-date': endDate.getTime().toString(),
-                'role': 'list'
+                'data-end-date': endDate.getTime().toString()
             }
         });
         return moreIndicatorElement;
@@ -8893,8 +8908,8 @@ class QuickPopups {
                     attrs: {
                         'data-id': '' + eventData[fields.id],
                         'data-guid': eventData.Guid, 'role': 'button', 'tabindex': '0',
-                        'aria-readonly': this.parent.eventBase.getReadonlyAttribute(eventData),
-                        'aria-selected': 'false', 'aria-grabbed': 'true', 'aria-label': this.parent.getAnnouncementString(eventData)
+                        'aria-disabled': this.parent.eventBase.getReadonlyAttribute(eventData),
+                        'aria-pressed': 'false', 'aria-grabbed': 'true', 'aria-label': this.parent.getAnnouncementString(eventData)
                     }
                 });
                 let templateElement;
@@ -8985,7 +9000,7 @@ class QuickPopups {
             this.quickPopupHide();
             return;
         }
-        const targetEle = args.event.target;
+        const targetEle = !isNullOrUndefined(args.event) ? args.event.target : args.element;
         if (this.parent.isAdaptive) {
             this.quickPopupHide();
             let newEventClone = this.parent.element.querySelector('.' + NEW_EVENT_CLASS);
@@ -10372,7 +10387,7 @@ let RecurrenceEditor = class RecurrenceEditor extends Component {
                 value: VALUEFIELD
             },
             placeholder: this.localeObj.getConstant(REPEAT),
-            htmlAttributes: { 'title': this.localeObj.getConstant(REPEAT) },
+            htmlAttributes: { 'title': this.localeObj.getConstant(REPEAT), role: 'option' },
             change: (args) => {
                 self.setProperties({ selectedType: this.frequencies.indexOf(args.value) }, false);
                 self.element.querySelector('.' + REPEATCONTENT).innerHTML =
@@ -10394,6 +10409,7 @@ let RecurrenceEditor = class RecurrenceEditor extends Component {
                 text: TEXTFIELD,
                 value: VALUEFIELD
             },
+            htmlAttributes: { role: 'option' },
             change: (args) => {
                 self.freshOnEndForm();
                 self.updateEndOnForm(args.value);
@@ -10411,6 +10427,7 @@ let RecurrenceEditor = class RecurrenceEditor extends Component {
                     text: TEXTFIELD,
                     value: VALUEFIELD
                 },
+                htmlAttributes: { role: 'option' },
                 index: 1,
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 change: (args) => {
@@ -10430,6 +10447,7 @@ let RecurrenceEditor = class RecurrenceEditor extends Component {
                 text: TEXTFIELD,
                 value: VALUEFIELD
             },
+            htmlAttributes: { role: 'option' },
             enableRtl: this.enableRtl,
             index: 7,
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -11272,6 +11290,7 @@ class EventWindow {
     setDialogContent() {
         this.dialogObject.content = this.getEventWindowContent();
         this.dialogObject.dataBind();
+        this.applyFormValidation();
     }
     preventEventSave(e) {
         if (this.parent && !this.parent.allowKeyboardInteraction && e.code === 'Enter') {
@@ -11528,6 +11547,7 @@ class EventWindow {
             resourceData.colorField + '}"></div><div class="e-resource-text">${' + resourceData.textField + '}</div></div>';
         if (resourceData.allowMultiple) {
             const listObj = new MultiSelect({
+                enableRtl: this.parent.enableRtl,
                 cssClass: this.parent.cssClass || '',
                 dataSource: resourceData.dataSource,
                 change: this.onMultiselectResourceChange.bind(this),
@@ -11585,7 +11605,7 @@ class EventWindow {
                 query = (e.text !== '') ? query.where('Text', 'contains', e.text, true) : query;
                 e.updateData(this.parent.timezoneDataSource, query);
             },
-            htmlAttributes: { 'title': this.getFieldLabel(value), 'name': fieldName },
+            htmlAttributes: { 'title': this.getFieldLabel(value), 'name': fieldName, role: 'option' },
             floatLabelType: 'Always',
             placeholder: this.getFieldLabel(value),
             popupHeight: '230px'
@@ -13382,7 +13402,7 @@ class Crud {
             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]);
-            this.parent.refreshEvents(false);
+            this.refreshProcessedData();
             if (this.parent.dragAndDropModule && this.parent.dragAndDropModule.actionObj.action === 'drag') {
                 this.parent.dragAndDropModule.navigationWrapper();
             }
@@ -13400,6 +13420,31 @@ class Crud {
         }
         this.parent.trigger(actionFailure, { error: e }, () => this.parent.hideSpinner());
     }
+    refreshProcessedData() {
+        if (this.parent.dragAndDropModule) {
+            this.parent.dragAndDropModule.actionObj.action = '';
+            removeClass([this.parent.element], 'e-event-action');
+        }
+        if (this.parent.activeViewOptions && this.parent.activeViewOptions.eventTemplate) {
+            let templateNames = ['eventTemplate'];
+            if (this.crudObj.isCrudAction &&
+                ['Agenda', 'MonthAgenda', 'Year', 'TimelineYear'].indexOf(this.parent.currentView) === -1) {
+                templateNames = [];
+                for (let i = 0, len = this.crudObj.sourceEvent.length; i < len; i++) {
+                    templateNames.push('eventTemplate_' + this.crudObj.sourceEvent[i].groupIndex);
+                    if (this.crudObj.targetEvent[i] && this.crudObj.sourceEvent[i].groupIndex !==
+                        this.crudObj.targetEvent[i].groupIndex) {
+                        templateNames.push('eventTemplate_' + this.crudObj.targetEvent[i].groupIndex);
+                    }
+                }
+            }
+            this.parent.resetTemplates(templateNames);
+        }
+        const eventsData = this.parent.eventsData || [];
+        const blockData = this.parent.blockData || [];
+        const data = eventsData.concat(blockData);
+        this.parent.notify(dataReady, { processedData: this.parent.eventBase ? this.parent.eventBase.processData(data) : [] });
+    }
     refreshData(args) {
         const actionArgs = {
             requestType: args.requestType, cancel: false, data: args.data,
@@ -13927,13 +13972,15 @@ class Crud {
         else {
             endDate = new Date(+followEvent[fields.startTime]);
             const newRecurrenceRule = followEvent[fields.recurrenceRule];
-            const startDate = parentEvent[fields.startTime];
-            const ruleException = (this.parent.currentAction === 'DeleteFollowingEvents') ? followEvent[fields.recurrenceException] : null;
-            const dateCollection = generate(startDate, newRecurrenceRule, ruleException, this.parent.activeViewOptions.firstDayOfWeek);
-            const untilDate = new Date(dateCollection.slice(-1)[0]);
-            untilDate.setHours(endDate.getHours(), endDate.getMinutes(), endDate.getSeconds());
-            endDate.setHours(startDate.getHours(), startDate.getMinutes(), startDate.getSeconds());
-            followEvent[fields.recurrenceRule] = this.getUpdatedRecurrenceRule(newRecurrenceRule, new Date(+untilDate), false);
+            if (newRecurrenceRule) {
+                const startDate = parentEvent[fields.startTime];
+                const ruleException = (this.parent.currentAction === 'DeleteFollowingEvents') ? followEvent[fields.recurrenceException] : null;
+                const dateCollection = generate(startDate, newRecurrenceRule, ruleException, this.parent.activeViewOptions.firstDayOfWeek);
+                const untilDate = new Date(dateCollection.slice(-1)[0]);
+                untilDate.setHours(endDate.getHours(), endDate.getMinutes(), endDate.getSeconds());
+                endDate.setHours(startDate.getHours(), startDate.getMinutes(), startDate.getSeconds());
+                followEvent[fields.recurrenceRule] = this.getUpdatedRecurrenceRule(newRecurrenceRule, new Date(+untilDate), false);
+            }
         }
         parentEvent[fields.recurrenceRule] = this.getUpdatedRecurrenceRule(recurrenceRule, addDays(new Date(endDate.getTime()), -1), true);
     }
@@ -15897,7 +15944,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, isResize: false
+                isIgnoreOccurrence: false, groupIndex: 0, action: false, isBlock: false, isCustomMonth: true, isPreventTimezone: false
             };
         }
         this.activeCellsData = { startTime: this.getCurrentTime(), endTime: this.getCurrentTime(), isAllDay: false };
@@ -16357,11 +16404,9 @@ let Schedule = class Schedule extends Component {
         }
         if (this.currentView === 'Month' || ((this.currentView !== 'Agenda' && this.currentView !== 'MonthAgenda')
             && !this.activeViewOptions.timeScale.enable) || this.activeView.isTimelineView()) {
-            this.uiStateValues.isResize = true;
             this.activeView.resetColWidth();
             this.notify(scrollUiUpdate, { cssProperties: this.getCssProperties(), isPreventScrollUpdate: true });
             this.refreshEvents(false);
-            this.uiStateValues.isResize = false;
         }
         else {
             this.notify(contentReady, {});
@@ -17427,25 +17472,15 @@ let Schedule = class Schedule extends Component {
             this.crudModule.refreshDataManager();
         }
         else {
-            if (this.activeViewOptions && this.activeViewOptions.eventTemplate) {
-                let templateNames = ['eventTemplate'];
-                if (this.crudModule && this.crudModule.crudObj.isCrudAction &&
-                    ['Agenda', 'MonthAgenda', 'Year', 'TimelineYear'].indexOf(this.currentView) === -1) {
-                    templateNames = [];
-                    for (let i = 0, len = this.crudModule.crudObj.sourceEvent.length; i < len; i++) {
-                        templateNames.push('eventTemplate_' + this.crudModule.crudObj.sourceEvent[i].groupIndex);
-                        if (this.crudModule.crudObj.targetEvent[i] && this.crudModule.crudObj.sourceEvent[i].groupIndex !==
-                            this.crudModule.crudObj.targetEvent[i].groupIndex) {
-                            templateNames.push('eventTemplate_' + this.crudModule.crudObj.targetEvent[i].groupIndex);
-                        }
-                    }
-                }
-                this.resetTemplates(templateNames);
+            if (this.uiStateValues) {
+                this.uiStateValues.isPreventTimezone = true;
+            }
+            if (this.crudModule) {
+                this.crudModule.refreshProcessedData();
+            }
+            if (this.uiStateValues) {
+                this.uiStateValues.isPreventTimezone = false;
             }
-            const eventsData = this.eventsData || [];
-            const blockData = this.blockData || [];
-            const data = eventsData.concat(blockData);
-            this.notify(dataReady, { processedData: this.eventBase ? this.eventBase.processData(data) : [] });
         }
     }
     /**
@@ -17628,6 +17663,67 @@ let Schedule = class Schedule extends Component {
             this.eventWindow.dialogClose();
         }
     }
+    /**
+     * To manually open the quick info popup based on cell or event details.
+     *
+     * @param {object} data Defines the cell or event data. If the data contains valid ID, it will open event quick info popup,
+     * otherwise cell quick info popup displayed.
+     * @returns {void}
+     */
+    openQuickInfoPopup(data) {
+        if (this.currentView === 'Year' || isNullOrUndefined(data)) {
+            return;
+        }
+        if (isNullOrUndefined(data[this.eventFields.id])) {
+            if (this.currentView === 'Agenda' || this.currentView === 'MonthAgenda' || isNullOrUndefined(this.activeView)) {
+                return;
+            }
+            const cellData = {
+                startTime: this.activeCellsData.startTime = this.getDateTime(data[this.eventFields.startTime]),
+                endTime: this.activeCellsData.endTime = this.getDateTime(data[this.eventFields.endTime]),
+                isAllDay: this.activeCellsData.isAllDay =
+                    !isNullOrUndefined(data[this.eventFields.isAllDay]) ? data[this.eventFields.isAllDay] : false
+            };
+            const startTime = this.activeView.getAdjustedDate(new Date(cellData.startTime));
+            if (startTime) {
+                let query = '.' + WORK_CELLS_CLASS + '[data-date="' + startTime.getTime() + '"]';
+                if (this.activeViewOptions.group.resources.length > 0 && !this.uiStateValues.isGroupAdaptive
+                    && this.resourceBase && this.eventBase) {
+                    cellData.groupIndex = this.eventBase.getGroupIndexFromEvent(data);
+                    query = '.' + WORK_CELLS_CLASS + '[data-date="' + startTime.getTime() + '"][data-group-index="' + cellData.groupIndex + '"]';
+                }
+                const workCell = this.element.querySelector(query);
+                if (workCell) {
+                    workCell.focus();
+                    cellData.element = workCell;
+                    this.notify(cellClick, cellData);
+                }
+            }
+        }
+        else {
+            const app = this.getCurrentViewEvents().filter((item) => data[this.eventFields.id] === item[this.eventFields.id]);
+            if (app.length <= 0) {
+                return;
+            }
+            let selectEvent = app[0];
+            if (data[this.eventFields.recurrenceRule]) {
+                const occurence = app.filter((x) => x[this.eventFields.startTime].getTime() === data[this.eventFields.startTime].getTime());
+                if (occurence.length > 0) {
+                    selectEvent = occurence[0];
+                }
+            }
+            const element = this.element.querySelector('div[data-guid="' + selectEvent.Guid + '"]');
+            if (element) {
+                this.eventBase.removeSelectedAppointmentClass();
+                this.eventBase.addSelectedAppointments([element]);
+                this.activeEventData = { event: selectEvent, element: element };
+                if (this.currentView === 'Agenda' || this.currentView === 'MonthAgenda') {
+                    addClass([this.activeEventData.element], AGENDA_SELECTED_CELL);
+                }
+                this.notify(eventClick, this.activeEventData);
+            }
+        }
+    }
     /**
      * To manually close the quick info popup
      *
@@ -19061,7 +19157,7 @@ class YearEvent extends TimelineEvent {
         }
     }
     timelineYearViewEvents() {
-        const workCell = this.parent.element.querySelector('.' + WORK_CELLS_CLASS);
+        const workCell = this.parent.element.querySelector('.' + WORK_CELLS_CLASS + ':not(.' + OTHERMONTH_CLASS + ')');
         this.cellWidth = workCell.offsetWidth;
         this.cellHeader = getOuterHeight(workCell.querySelector('.' + DATE_HEADER_CLASS));
         const eventTable = this.parent.element.querySelector('.' + EVENT_TABLE_CLASS);
@@ -19337,7 +19433,7 @@ class YearEvent extends TimelineEvent {
                 'data-id': 'Appointment_' + record[this.fields.id],
                 'data-guid': record.Guid,
                 'role': 'button', 'tabindex': '0',
-                'aria-readonly': this.parent.eventBase.getReadonlyAttribute(record), 'aria-selected': 'false', 'aria-grabbed': 'true',
+                'aria-disabled': this.parent.eventBase.getReadonlyAttribute(record), 'aria-pressed': 'false', 'aria-grabbed': 'true',
                 'aria-label': this.parent.getAnnouncementString(record)
             }
         });
@@ -21279,6 +21375,17 @@ class ViewBase {
         }
         return endDate;
     }
+    getAdjustedDate(startTime) {
+        if (!this.parent.activeViewOptions.timeScale.enable || this.parent.currentView === 'Month' ||
+            (this.parent.currentView === 'TimelineYear' && this.parent.activeViewOptions.group.resources.length === 0)) {
+            return new Date(startTime.setHours(0, 0, 0, 0));
+        }
+        else if (this.parent.currentView === 'TimelineYear' && this.parent.activeViewOptions.group.resources.length > 0) {
+            startTime.setHours(0, 0, 0, 0);
+            return new Date(startTime.setDate(1));
+        }
+        return null;
+    }
     destroy() {
         if (this.element && this.element.parentNode) {
             remove(this.element);
@@ -21774,12 +21881,11 @@ class VerticalView extends ViewBase {
         const wrap = createElement('div', { className: DATE_HEADER_WRAP_CLASS });
         container.appendChild(wrap);
         const tbl = this.createTableLayout();
-        const trEle = createElement('tr');
+        const trEle = createElement('tr', { className: HEADER_ROW_CLASS });
         const rowCount = this.colLevels.length;
         const lastLevel = this.colLevels[rowCount - 1];
         for (let i = 0; i < rowCount; i++) {
             const ntr = trEle.cloneNode();
-            addClass([ntr], HEADER_ROW_CLASS);
             const level = this.colLevels[i];
             for (let j = 0; j < level.length; j++) {
                 ntr.appendChild(this.createTd(level[j]));
@@ -21792,13 +21898,13 @@ class VerticalView extends ViewBase {
         return container;
     }
     createAllDayRow(table, tdData) {
-        const ntr = createElement('tr');
-        addClass([ntr], ALLDAY_ROW_CLASS);
+        const ntr = createElement('tr', { className: ALLDAY_ROW_CLASS });
         for (let j = 0; j < tdData.length; j++) {
             const td = extend({}, tdData[j]);
             td.className = [ALLDAY_CELLS_CLASS];
             td.type = 'alldayCells';
             const ntd = this.createTd(td);
+            ntd.setAttribute('role', 'gridcell');
             ntd.setAttribute('data-date', td.date.getTime().toString());
             if (!isNullOrUndefined(td.groupIndex)) {
                 ntd.setAttribute('data-group-index', '' + td.groupIndex);
@@ -21831,6 +21937,7 @@ class VerticalView extends ViewBase {
         }
         if (td.type === 'dateHeader' && td.className.indexOf(HEADER_CELLS_CLASS) >= 0) {
             tdEle.setAttribute('data-date', td.date.getTime().toString());
+            tdEle.setAttribute('role', 'gridcell');
             if (!isNullOrUndefined(td.groupIndex)) {
                 tdEle.setAttribute('data-group-index', '' + td.groupIndex);
             }
@@ -22029,6 +22136,23 @@ class VerticalView extends ViewBase {
         }
         return rows;
     }
+    getAdjustedDate(startTime) {
+        if (!this.parent.activeViewOptions.timeScale.enable) {
+            return new Date(startTime.setHours(0, 0, 0, 0));
+        }
+        else {
+            const timeSlots = this.getTimeSlotRows();
+            const startDate = new Date(new Date(timeSlots[0].date.getTime()).
+                setHours(startTime.getHours(), startTime.getMinutes(), startTime.getMilliseconds()));
+            for (let i = 0; i < timeSlots.length; i++) {
+                if (timeSlots[i].date.getTime() > startDate.getTime()) {
+                    startTime.setHours(timeSlots[i - 1].date.getHours(), timeSlots[i - 1].date.getMinutes(), timeSlots[i - 1].date.getMilliseconds());
+                    return new Date(startTime);
+                }
+            }
+        }
+        return null;
+    }
     destroy() {
         if (!this.parent || this.parent && this.parent.isDestroyed) {
             return;
@@ -23079,7 +23203,8 @@ class Year extends ViewBase {
         return this.parent.currentView === 'Year' ? getWeekFirstDate(this.getStartDate(), this.parent.firstDayOfWeek) : this.getStartDate();
     }
     endDate() {
-        return this.parent.currentView === 'Year' ? addDays(getWeekLastDate(this.getEndDate(), this.parent.firstDayOfWeek), 1) : this.getEndDate();
+        return this.parent.currentView === 'Year' ? addDays(getWeekLastDate(this.getEndDate(), this.parent.firstDayOfWeek), 1) :
+            addDays(this.getEndDate(), 1);
     }
     getEndDateFromStartDate(start) {
         let date = new Date(start.getTime());
@@ -23189,8 +23314,8 @@ class AgendaBase extends ViewBase {
                         'data-guid': listData[li].Guid,
                         'role': 'button',
                         'tabindex': '0',
-                        'aria-readonly': this.parent.eventBase.getReadonlyAttribute(listData[li]),
-                        'aria-selected': 'false',
+                        'aria-disabled': this.parent.eventBase.getReadonlyAttribute(listData[li]),
+                        'aria-pressed': 'false',
                         'aria-grabbed': 'true',
                         'aria-label': this.parent.getAnnouncementString(listData[li])
                     }
@@ -23455,8 +23580,8 @@ class AgendaBase extends ViewBase {
                 ntd.appendChild(this.createDateHeaderElement(tempData.date));
                 addClass([ntd], [AGENDA_CELLS_CLASS, AGENDA_DATE_CLASS, DATE_BORDER_CLASS]);
                 const daysCount = getDaysCount(this.parent.selectedDate.getTime(), tempData.date.getTime());
-                ntr.setAttribute('aria-rowindex', daysCount.toString());
-                if (this.parent.element.querySelector(`.e-agenda-view tr[aria-rowindex="${daysCount}"]`)) {
+                ntr.setAttribute('data-row-index', daysCount.toString());
+                if (this.parent.element.querySelector(`.e-agenda-view tr[data-row-index="${daysCount}"]`)) {
                     break;
                 }
                 ntr.insertBefore(ntd, ntr.childNodes[0]);
@@ -23492,13 +23617,13 @@ class AgendaBase extends ViewBase {
     }
     createTableRowElement(date, type) {
         const daysCount = getDaysCount(this.parent.selectedDate.getTime(), date.getTime());
-        const tr = createElement('tr', { attrs: { 'role': 'row', 'aria-rowindex': daysCount.toString() } });
+        const tr = createElement('tr', { attrs: { 'role': 'row', 'data-row-index': daysCount.toString() } });
         const td = createElement('td', {
             attrs: {
                 'class': (type === 'monthHeader') ? MONTH_HEADER_CLASS : AGENDA_CELLS_CLASS,
                 'role': 'gridcell',
                 'aria-selected': 'false',
-                'aria-colindex': daysCount.toString(),
+                'data-column-index': daysCount.toString(),
                 'data-date': date.getTime().toString()
             }
         });
@@ -23665,7 +23790,7 @@ class Agenda extends AgendaBase {
                 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[aria-rowindex="' + parseInt(nTr.getAttribute('aria-rowindex'), 10) + '"]')) {
+                    if (this.element.querySelector('tr[data-row-index="' + parseInt(nTr.getAttribute('data-row-index'), 10) + '"]')) {
                         agendaDate = addDays(agendaDate, 1);
                         continue;
                     }
@@ -23729,7 +23854,7 @@ class Agenda extends AgendaBase {
                 prepend([].slice.call(emptyTBody.childNodes), tBody);
                 this.wireEventActions();
                 for (let s = 0, element = tBody.children; s < element.length; s++) {
-                    if (element[s].getAttribute('aria-rowindex') === topElement.getAttribute('aria-colindex')) {
+                    if (element[s].getAttribute('data-row-index') === topElement.getAttribute('data-column-index')) {
                         const scrollToValue = element[s].offsetTop -
                             this.element.querySelector('.e-agenda-item').offsetHeight;
                         target.scrollTop = scrollToValue;
@@ -24429,6 +24554,20 @@ class TimelineViews extends VerticalView {
         this.timelineAppointment.renderAppointments();
         this.parent.notify(eventsLoaded, {});
     }
+    getAdjustedDate(date) {
+        if (!this.parent.activeViewOptions.timeScale.enable) {
+            return new Date(date.setHours(0, 0, 0, 0));
+        }
+        else {
+            const timeSlots = this.colLevels[this.colLevels.length - 1];
+            for (let i = 0; i < timeSlots.length; i++) {
+                if (timeSlots[i].date.getTime() > date.getTime()) {
+                    return timeSlots[i - 1].date;
+                }
+            }
+        }
+        return null;
+    }
     destroy() {
         if (!this.parent || this.parent && this.parent.isDestroyed) {
             return;
@@ -24569,6 +24708,15 @@ class TimelineMonth extends Month {
         this.colLevels = colLevels;
         return colLevels;
     }
+    getAdjustedDate(startTime) {
+        const timeSlots = this.colLevels[this.colLevels.length - 1];
+        for (let i = 0; i < timeSlots.length; i++) {
+            if (timeSlots[i].date.getTime() > startTime.getTime()) {
+                return timeSlots[i - 1].date;
+            }
+        }
+        return null;
+    }
     destroy() {
         if (!this.parent || this.parent && this.parent.isDestroyed) {
             return;
@@ -24838,6 +24986,9 @@ class TimelineYear extends Year {
                 else {
                     addClass([td], OTHERMONTH_CLASS);
                 }
+                if (td.classList.contains(OTHERMONTH_CLASS)) {
+                    continue;
+                }
                 td.appendChild(dateHeader);
                 if (isDateAvail) {
                     td.setAttribute('data-date', date.getTime().toString());
@@ -25014,6 +25165,10 @@ class ICalendarExport {
         this.parent = parent;
     }
     initializeCalendarExport(fileName, customData) {
+        const icsString = this.getCalendarString(fileName, customData);
+        this.download(icsString, fileName);
+    }
+    getCalendarString(fileName, customData) {
         let eventsData = (customData) ? customData :
             extend([], this.parent.eventsData, null, true);
         eventsData = this.parent.eventBase.sortByTime(eventsData);
@@ -25023,7 +25178,7 @@ class ICalendarExport {
         const timeZone = this.parent.timezone || this.parent.tzModule.getLocalTimezoneName();
         const fields = this.parent.eventFields;
         eventsData.forEach((eventObj) => {
-            let uId = this.parent.eventBase.generateGuid();
+            let uId = eventObj[fields.id] || eventObj.Guid || this.parent.eventBase.generateGuid();
             const editedExDate = [];
             if (eventObj[fields.recurrenceID]) {
                 const filter = this.filterEvents(filterCollection, fields.id, eventObj[fields.recurrenceID]);
@@ -25096,7 +25251,7 @@ class ICalendarExport {
             'X-WR-TIMEZONE:' + timeZone
         ].join(SEPARATOR);
         const icsString = iCalendar + SEPARATOR + iCalendarEvents.join(SEPARATOR) + SEPARATOR + 'END:VCALENDAR';
-        this.download(icsString, fileName);
+        return icsString;
     }
     customFieldFilter(eventObj, fields) {
         const defaultFields = Object.keys(fields).map((key) => fields[key]);
@@ -25222,8 +25377,16 @@ class ICalendarImport {
                             break;
                         case 'UID':
                             curEvent[uId] = value;
-                            curEvent[fields.id] = typeof (id) === 'string' ? id + count.toString() : id + count;
-                            count++;
+                            if (typeof (id) == 'number') {
+                                curEvent[fields.id] = parseInt(value, 10);
+                                if (isNaN(curEvent[fields.id])) {
+                                    curEvent[fields.id] = id + count;
+                                    count++;
+                                }
+                            }
+                            else {
+                                curEvent[fields.id] = value;
+                            }
                             break;
                         case 'SUMMARY':
                             curEvent[fields.subject] = value;
@@ -25259,6 +25422,10 @@ class ICalendarImport {
         const appoint = [];
         const uId = 'UID';
         const fields = this.parent.eventFields;
+        let appointmentIds = [];
+        this.parent.eventsData.forEach((eventObj) => {
+            appointmentIds.push(eventObj[fields.id]);
+        });
         app.forEach((eventObj) => {
             let parentObj;
             let id;
@@ -25267,24 +25434,26 @@ class ICalendarImport {
                 parentObj = eventObj;
                 id = eventObj[fields.id];
             }
-            const data = app.filter((data) => data.UID === eventObj[uId]);
-            if (data.length > 1 && isNullOrUndefined(eventObj[fields.recurrenceID])) {
-                for (let i = 0; i < data.length; i++) {
-                    // eslint-disable-next-line no-prototype-builtins
-                    if (data[i].hasOwnProperty(fields.recurrenceID)) {
-                        const exdate = data[i][fields.recurrenceID];
-                        data[i][fields.recurrenceID] = id;
-                        data[i][fields.recurrenceException] = null;
-                        parentObj[fields.recurrenceException] = (isNullOrUndefined(parentObj[fields.recurrenceException])) ?
-                            exdate : parentObj[fields.recurrenceException] + ',' + exdate;
-                        appoint.push(data[i]);
+            if (appointmentIds.indexOf(eventObj[fields.id]) < 0) {
+                const data = app.filter((data) => data.UID === eventObj[uId]);
+                if (data.length > 1 && isNullOrUndefined(eventObj[fields.recurrenceID])) {
+                    for (let i = 0; i < data.length; i++) {
+                        // eslint-disable-next-line no-prototype-builtins
+                        if (data[i].hasOwnProperty(fields.recurrenceID)) {
+                            const exdate = data[i][fields.recurrenceID];
+                            data[i][fields.recurrenceID] = id;
+                            data[i][fields.recurrenceException] = null;
+                            parentObj[fields.recurrenceException] = (isNullOrUndefined(parentObj[fields.recurrenceException])) ?
+                                exdate : parentObj[fields.recurrenceException] + ',' + exdate;
+                            appoint.push(data[i]);
+                        }
                     }
+                    appoint.push(parentObj);
+                    // eslint-disable-next-line no-prototype-builtins
+                }
+                else if (!eventObj.hasOwnProperty(fields.recurrenceID)) {
+                    appoint.push(eventObj);
                 }
-                appoint.push(parentObj);
-                // eslint-disable-next-line no-prototype-builtins
-            }
-            else if (!eventObj.hasOwnProperty(fields.recurrenceID)) {
-                appoint.push(eventObj);
             }
         });
         return appoint;
@@ -25342,6 +25511,10 @@ class ExcelExport {
         const exportName = excelExportOptions.fileName || 'Schedule';
         const exportType = excelExportOptions.exportType || 'xlsx';
         const isIncludeOccurrences = excelExportOptions.includeOccurrences || false;
+        let separator;
+        if (!isNullOrUndefined(excelExportOptions.separator) && excelExportOptions.separator !== ',') {
+            separator = excelExportOptions.separator;
+        }
         let eventCollection;
         if (excelExportOptions.customData) {
             eventCollection = !isIncludeOccurrences ? excelExportOptions.customData :
@@ -25350,9 +25523,9 @@ class ExcelExport {
         else {
             eventCollection = !isIncludeOccurrences ? this.parent.eventsData : this.parent.eventsProcessed;
         }
-        this.processWorkbook(exportColumns, exportName, exportType, eventCollection);
+        this.processWorkbook(exportColumns, exportName, exportType, eventCollection, separator);
     }
-    processWorkbook(fields, name, type, eventCollection) {
+    processWorkbook(fields, name, type, eventCollection, separator) {
         const columns = [];
         const rows = [];
         const columnHeader = [];
@@ -25373,7 +25546,7 @@ class ExcelExport {
             rows.push({ index: i + 2, cells: columnData });
         });
         const workSheet = [{ columns: columns, rows: rows }];
-        const book = new Workbook({ worksheets: workSheet }, type, this.parent.locale);
+        const book = new Workbook({ worksheets: workSheet }, type, this.parent.locale, undefined, separator);
         book.save(name + '.' + type);
     }
     getExportColumns(exportOptions) {