@syncfusion/ej2-schedule 20.3.50 → 20.3.52

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

@@ -1607,8 +1607,8 @@ class ScheduleTouch {
     }
     scrollHandler(e) {
         if (this.parent.currentView === 'Agenda' || this.parent.uiStateValues.action || !this.parent.allowSwiping ||
-            (e.originalEvent && (e.originalEvent.target.classList.contains(APPOINTMENT_CLASS) ||
-                closest(e.originalEvent.target, '.' + APPOINTMENT_CLASS)))) {
+            (e.originalEvent && e.originalEvent.target && (e.originalEvent.target.classList.contains(APPOINTMENT_CLASS) ||
+                closest(e.originalEvent.target, '.' + APPOINTMENT_CLASS)) && !this.parent.isAdaptive)) {
             return;
         }
         if (!this.timeStampStart) {
@@ -1842,6 +1842,7 @@ class KeyboardInteraction {
             enter: 'enter',
             escape: 'escape',
             delete: 'delete',
+            backspace: 'backspace',
             home: 'home',
             pageUp: 'pageup',
             pageDown: 'pagedown',
@@ -1913,6 +1914,7 @@ class KeyboardInteraction {
                 this.processTab(e, e.shiftKey);
                 break;
             case 'delete':
+            case 'backspace':
                 this.processDelete(e);
                 break;
             case 'ctrlShiftUpArrow':
@@ -3054,9 +3056,11 @@ class Gregorian {
         }
     }
     setMonth(date, interval, startDate) {
+        date.setDate(1);
         date.setFullYear(date.getFullYear());
         date.setMonth(interval - 1);
-        date.setDate(startDate);
+        const maxDay = new Date(date.getFullYear(), date.getMonth() + 1, 0).getDate();
+        date.setDate(Math.min(startDate, maxDay));
     }
     addYears(date, interval) {
         date.setFullYear(date.getFullYear() + interval);
@@ -5944,7 +5948,8 @@ class EventBase {
         }
         if (idType === 'number') {
             const datas = this.parent.eventsData.concat(this.parent.blockData);
-            let maxId = Math.max(...datas.map((event) => event[this.parent.eventFields.id]));
+            const appIds = datas.map((event) => event[this.parent.eventFields.id]);
+            let maxId = appIds.reduce((a, b) => Math.max(a, b));
             maxId = isNullOrUndefined(resourceId) ? maxId : maxId + resourceId;
             eventId = maxId + 1;
         }
@@ -7986,7 +7991,13 @@ class TimelineEvent extends MonthEvent {
         eventObj[this.fields.endTime] = eventData[this.fields.endTime];
         const currentDate = resetTime(new Date(this.dateRender[this.day].getTime()));
         const schedule = getStartEndHours(currentDate, this.startHour, this.endHour);
-        const isValidEvent = this.isValidEvent(eventObj, startTime, endTime, schedule);
+        let isValidEvent = true;
+        if (this.isDayProcess() || eventObj[this.fields.isAllDay]) {
+            isValidEvent = true;
+        }
+        else {
+            isValidEvent = this.isValidEvent(eventObj, startTime, endTime, schedule);
+        }
         if (startTime <= endTime && isValidEvent) {
             let appWidth = this.getEventWidth(startTime, endTime, event[this.fields.isAllDay], diffInDays);
             appWidth = this.renderType === 'day' ? appWidth - 2 : appWidth;
@@ -8147,14 +8158,19 @@ class TimelineEvent extends MonthEvent {
     getStartTime(event, eventData) {
         let startTime = event[this.fields.startTime];
         const schedule = getStartEndHours(startTime, this.startHour, this.endHour);
-        if (schedule.startHour.getTime() >= eventData[this.fields.startTime]) {
-            startTime = schedule.startHour;
-        }
-        else if (schedule.endHour.getTime() <= eventData[this.fields.startTime]) {
-            startTime = this.getNextDay(schedule.startHour, eventData);
+        if (this.isDayProcess()) {
+            startTime = event[this.fields.startTime];
         }
         else {
-            startTime = eventData[this.fields.startTime];
+            if (schedule.startHour.getTime() >= eventData[this.fields.startTime]) {
+                startTime = schedule.startHour;
+            }
+            else if (schedule.endHour.getTime() <= eventData[this.fields.startTime]) {
+                startTime = this.getNextDay(schedule.startHour, eventData);
+            }
+            else {
+                startTime = eventData[this.fields.startTime];
+            }
         }
         // To overcome the overflow
         eventData.trimStartTime = (event[this.fields.isAllDay]) ? schedule.startHour : eventData[this.fields.startTime];
@@ -8174,17 +8190,15 @@ class TimelineEvent extends MonthEvent {
     getEndTime(event, eventData) {
         let endTime = event[this.fields.endTime];
         const schedule = getStartEndHours(endTime, this.startHour, this.endHour);
-        if (this.parent.currentView === 'TimelineMonth' || !this.parent.activeViewOptions.timeScale.enable ||
-            (this.parent.activeViewOptions.headerRows.length > 0 &&
-                this.parent.activeViewOptions.headerRows.slice(-1)[0].option !== 'Hour')) {
+        if (this.isDayProcess()) {
             endTime = eventData[this.fields.endTime];
         }
         else {
             endTime = eventData[this.fields.endTime];
-            if (schedule.endHour.getTime() <= eventData[this.fields.endTime]) {
+            if (schedule.endHour.getTime() <= eventData[this.fields.endTime] || event[this.fields.isAllDay]) {
                 endTime = schedule.endHour;
             }
-            if (schedule.startHour.getTime() >= eventData[this.fields.endTime].getTime() && !event.isAllDay) {
+            if (schedule.startHour.getTime() >= eventData[this.fields.endTime].getTime() && !event[this.fields.isAllDay]) {
                 endTime = this.getPreviousDay(schedule.startHour, schedule.endHour, eventData);
             }
         }
@@ -8337,6 +8351,14 @@ class TimelineEvent extends MonthEvent {
             'height': (this.cellHeight - (this.maxHeight ? 0 : EVENT_GAP$1) - (this.maxHeight ? 0 : this.moreIndicatorHeight)) + 'px'
         });
     }
+    isDayProcess() {
+        if (this.parent.currentView === 'TimelineMonth' || !this.parent.activeViewOptions.timeScale.enable ||
+            (this.parent.activeViewOptions.headerRows.length > 0 &&
+                this.parent.activeViewOptions.headerRows.slice(-1)[0].option !== 'Hour')) {
+            return true;
+        }
+        return false;
+    }
     destroy() {
         this.renderType = null;
         this.eventContainers = null;
@@ -11740,7 +11762,8 @@ class EventWindow {
                     const resourceModel = resourceCollection[i + 1];
                     // eslint-disable-next-line max-len
                     const filter = resourceModel.dataSource.filter((data) => data[resourceModel.groupIDField] === args.value[j])[0];
-                    const groupId = filter[resourceCollection[i + 1].groupIDField];
+                    const groupId = (!isNullOrUndefined(filter)) ?
+                        filter[resourceCollection[i + 1].groupIDField] : null;
                     const filterRes = this.filterDatasource(i, groupId);
                     datasource = datasource.concat(filterRes);
                 }
@@ -11753,6 +11776,7 @@ class EventWindow {
         const resourceData = this.parent.resourceBase.resourceCollection[index + 1];
         const resObject = this.element.querySelector('.e-' + resourceData.field).
             ej2_instances[0];
+        resObject.clear();
         return resObject;
     }
     onDropdownResourceChange(args) {
@@ -11767,7 +11791,8 @@ class EventWindow {
                 const groupId = args.itemData[resourceCollection[i].idField];
                 resObj.dataSource = this.filterDatasource(i, groupId);
                 resObj.dataBind();
-                const resValue = resObj.dataSource[0][resourceCollection[i + 1].idField];
+                const resValue = (resObj.dataSource.length > 0) ?
+                    resObj.dataSource[0][resourceCollection[i + 1].idField] : null;
                 resObj.value = (resourceCollection[i + 1].allowMultiple) ? [resValue] : resValue;
                 resObj.dataBind();
             }
@@ -13131,7 +13156,9 @@ class VirtualScroll {
     }
     renderEvents() {
         this.setTabIndex();
-        this.parent.refreshEvents(false);
+        if (this.parent.crudModule) {
+            this.parent.crudModule.refreshProcessedData(true);
+        }
         if (this.parent.currentView !== 'Month') {
             this.parent.notify(contentReady, {});
         }
@@ -13714,7 +13741,7 @@ class Crud {
         }
         this.parent.trigger(actionFailure, { error: e }, () => this.parent.hideSpinner());
     }
-    refreshProcessedData() {
+    refreshProcessedData(isVirtualScrollAction = false) {
         if (this.parent.dragAndDropModule) {
             this.parent.dragAndDropModule.actionObj.action = '';
             removeClass([this.parent.element], 'e-event-action');
@@ -13734,6 +13761,10 @@ class Crud {
             }
             this.parent.resetTemplates(templateNames);
         }
+        if (isVirtualScrollAction) {
+            this.parent.notify(dataReady, { processedData: this.parent.eventsProcessed });
+            return;
+        }
         const eventsData = this.parent.eventsData || [];
         const blockData = this.parent.blockData || [];
         const data = eventsData.concat(blockData);
@@ -17778,11 +17809,11 @@ let Schedule = class Schedule extends Component {
      * @returns {void}
      */
     refreshEvents(isRemoteRefresh = true) {
-        if (this.dragAndDropModule) {
-            this.dragAndDropModule.actionObj.action = '';
-            removeClass([this.element], EVENT_ACTION_CLASS);
-        }
         if (isRemoteRefresh) {
+            if (this.dragAndDropModule) {
+                this.dragAndDropModule.actionObj.action = '';
+                removeClass([this.element], EVENT_ACTION_CLASS);
+            }
             this.crudModule.refreshDataManager();
         }
         else {
@@ -25855,9 +25886,9 @@ class ICalendarImport {
             }
         });
         const app = extend([], events, null, true);
-        this.parent.addEvent(this.processOccurrence(app));
+        this.parent.addEvent(this.processOccurrence(app, id));
     }
-    processOccurrence(app) {
+    processOccurrence(app, maxId) {
         const appoint = [];
         const uId = 'UID';
         const fields = this.parent.eventFields;
@@ -25876,31 +25907,49 @@ class ICalendarImport {
             if (appointmentIds.indexOf(eventObj[fields.id]) < 0) {
                 const data = app.filter((data) => data.UID === eventObj[uId]);
                 if (data.length > 1 && isNullOrUndefined(eventObj[fields.recurrenceID])) {
+                    id = typeof (maxId) === 'number' ? maxId++ : id;
                     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.id] = this.parent.eventBase.generateGuid();
+                            data[i][fields.id] = typeof (maxId) === 'number' ? maxId++ : this.parent.eventBase.generateGuid();
                             data[i][fields.recurrenceID] = id;
                             data[i][fields.recurrenceException] = null;
-                            parentObj[fields.recurrenceException] = (isNullOrUndefined(parentObj[fields.recurrenceException])) ?
-                                exdate : parentObj[fields.recurrenceException] + ',' + exdate;
+                            parentObj[fields.recurrenceException] =
+                                this.getExcludeDateString(parentObj[fields.recurrenceException], exdate);
                             delete data[i][uId];
                             appoint.push(data[i]);
                         }
                     }
                     delete parentObj[uId];
+                    parentObj[fields.id] = id;
                     appoint.push(parentObj);
                     // eslint-disable-next-line no-prototype-builtins
                 }
                 else if (!eventObj.hasOwnProperty(fields.recurrenceID)) {
                     delete eventObj[uId];
+                    eventObj[fields.id] = typeof (maxId) === 'number' ? maxId++ : id;
                     appoint.push(eventObj);
                 }
             }
         });
         return appoint;
     }
+    getExcludeDateString(parentException, occurrenceException) {
+        if (isNullOrUndefined(parentException)) {
+            return occurrenceException;
+        }
+        else if (isNullOrUndefined(occurrenceException)) {
+            return parentException;
+        }
+        const parentExDate = parentException.split(',').map((x) => x.split('T')[0]);
+        const childExDate = occurrenceException.split(',').map((x) => x.split('T')[0]);
+        const exDate = parentExDate.filter((x) => childExDate.indexOf(x) > -1);
+        if (exDate.length > 0) {
+            return parentException;
+        }
+        return parentException + ',' + occurrenceException;
+    }
     getDateString(value) {
         value = value || '';
         // eslint-disable-next-line no-useless-escape