@syncfusion/ej2-schedule 20.4.44 → 20.4.49

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

@@ -1690,7 +1690,7 @@ class ScheduleTouch {
             if (offsetDist > time || (e.distanceX > (this.parent.element.offsetWidth / 2))) {
                 this.swapPanels(e.swipeDirection);
                 if (offsetDist > time && (e.distanceX > (this.parent.element.offsetWidth / 2))) {
-                    this.element.style.transitionDuration = ((offsetDist / time) / 10) + 's';
+                    this.element.style.transitionDuration = (((Browser.isDevice ? e.distanceX : offsetDist) / time) / 10) + 's';
                 }
                 this.confirmSwipe(e.swipeDirection);
             }
@@ -1819,6 +1819,7 @@ class ScheduleTouch {
         this.nextPanel = null;
         this.timeStampStart = null;
         this.element.style.transform = '';
+        this.element.style.transitionDuration = '';
         removeChildren(this.element);
         removeClass([this.element], TRANSLATE_CLASS);
     }
@@ -5424,8 +5425,8 @@ class EventBase {
         return filteredCollection;
     }
     sortByTime(appointmentsCollection) {
-        if (this.parent.eventSettings.sortComparer) {
-            appointmentsCollection = this.parent.eventSettings.sortComparer.call(this.parent, appointmentsCollection);
+        if (this.parent.eventSettings.sortComparer && (typeof (this.parent.eventSettings.sortComparer) === 'function' || typeof (this.parent.eventSettings.sortComparer) === 'string')) {
+            appointmentsCollection = this.customSorting(appointmentsCollection);
         }
         else {
             const fieldMappings = this.parent.eventFields;
@@ -5438,8 +5439,8 @@ class EventBase {
         return appointmentsCollection;
     }
     sortByDateTime(appointments) {
-        if (this.parent.eventSettings.sortComparer) {
-            appointments = this.parent.eventSettings.sortComparer.call(this.parent, appointments);
+        if (this.parent.eventSettings.sortComparer && (typeof (this.parent.eventSettings.sortComparer) === 'function' || typeof (this.parent.eventSettings.sortComparer) === 'string')) {
+            appointments = this.customSorting(appointments);
         }
         else {
             const fieldMapping = this.parent.eventFields;
@@ -5455,6 +5456,22 @@ class EventBase {
         }
         return appointments;
     }
+    customSorting(appointments) {
+        if (typeof (this.parent.eventSettings.sortComparer) === 'function') {
+            return this.parent.eventSettings.sortComparer.call(this.parent, appointments);
+        }
+        else if (typeof (this.parent.eventSettings.sortComparer) === 'string') {
+            const splits = this.parent.eventSettings.sortComparer.split('.');
+            let sortFn;
+            if (!isNullOrUndefined(window)) {
+                sortFn = window[splits[splits.length - 1]];
+            }
+            if (sortFn) {
+                return sortFn(appointments);
+            }
+        }
+        return appointments;
+    }
     getSmallestMissingNumber(array) {
         const large = Math.max(...array);
         for (let i = 0; i < large; i++) {
@@ -6372,6 +6389,14 @@ class EventBase {
         }
         return tr;
     }
+    getPageCoordinates(e) {
+        if (isNullOrUndefined(e)) {
+            return e;
+        }
+        const eventArgs = e.event;
+        return eventArgs && eventArgs.changedTouches ? eventArgs.changedTouches[0] : e.changedTouches ? e.changedTouches[0] :
+            eventArgs || e;
+    }
     unWireEvents() {
         const appElements = [].slice.call(this.parent.element.querySelectorAll('.' + APPOINTMENT_CLASS));
         for (const element of appElements) {
@@ -9129,7 +9154,7 @@ class QuickPopups {
         if (deleteIcon) {
             this.renderButton('e-flat e-round e-small', ICON + ' ' + DELETE_ICON_CLASS, deleteAction, deleteIcon, this.deleteClick);
         }
-        this.beforeQuickPopupOpen(target, e);
+        this.beforeQuickPopupOpen(target, this.parent.eventBase.getPageCoordinates(e));
     }
     isCellBlocked(args) {
         const tempObj = {};
@@ -9216,7 +9241,7 @@ class QuickPopups {
         this.quickPopup.content = quickCellPopup;
         this.quickPopup.relateTo = target;
         this.quickPopup.dataBind();
-        this.beforeQuickPopupOpen(target, args.event);
+        this.beforeQuickPopupOpen(target, this.parent.eventBase.getPageCoordinates(args.event));
     }
     isSameEventClick(events) {
         const isSameTarget = this.quickPopup.relateTo === closest(events.element, '.' + APPOINTMENT_CLASS);
@@ -9293,7 +9318,7 @@ class QuickPopups {
             this.quickPopup.relateTo = this.parent.isAdaptive ? document.body :
                 closest(events.element, '.' + APPOINTMENT_CLASS);
             this.quickPopup.dataBind();
-            this.beforeQuickPopupOpen(events.element, events.originalEvent);
+            this.beforeQuickPopupOpen(events.element, this.parent.eventBase.getPageCoordinates(events.originalEvent));
         }
     }
     getPopupHeader(headerType, headerData) {
@@ -9825,22 +9850,30 @@ class QuickPopups {
                             this.quickPopup.dataBind();
                             this.quickPopup.refreshPosition(null, true);
                         }
-                        if (this.quickPopup.position.X === 'center' && this.quickPopup.position.Y === 'center' && !isNullOrUndefined(originalEvent)) {
+                        if (this.quickPopup.position.X === 'center' && this.quickPopup.position.Y === 'center' && !isNullOrUndefined(originalEvent) &&
+                            originalEvent.clientX && originalEvent.clientY) {
+                            const clientX = originalEvent.clientX;
+                            const clientY = originalEvent.clientY;
+                            const targetRect = target.getBoundingClientRect();
+                            const offsetY = originalEvent.offsetY || Math.ceil(clientY - targetRect.y);
                             const previousOffset = this.quickPopup.offsetY;
-                            let collision = isCollide(target, this.quickPopup.element);
+                            let collision = isCollide(this.quickPopup.element, target);
                             const popupRect = this.quickPopup.element.getBoundingClientRect();
-                            if (collision.indexOf('top') > -1 || collision.indexOf('bottom') > -1) {
-                                if (popupRect.top <= originalEvent.clientY && originalEvent.clientY <= popupRect.top + popupRect.height) {
+                            const targetEle = document.elementFromPoint(clientX, clientY);
+                            if (collision.indexOf('top') > -1 || collision.indexOf('bottom') > -1 || closest(targetEle, '.' + POPUP_WRAPPER_CLASS)) {
+                                if (popupRect.top <= clientY &&
+                                    clientY <= popupRect.top + popupRect.height) {
                                     this.quickPopup.offsetY = previousOffset - popupRect.height - 10;
                                     this.quickPopup.dataBind();
                                     collision = isCollide(this.quickPopup.element, this.parent.element);
                                     if (collision.indexOf('top') > -1) {
-                                        this.quickPopup.offsetY = previousOffset + originalEvent.offsetY;
+                                        this.quickPopup.offsetY = previousOffset + offsetY + 10;
                                         this.quickPopup.dataBind();
                                     }
                                 }
                                 else if (isCollide(this.quickPopup.element, this.parent.element).indexOf('bottom') > -1) {
-                                    this.quickPopup.offsetY = previousOffset - originalEvent.offsetY - Math.ceil(popupRect.height) - 10;
+                                    this.quickPopup.offsetY =
+                                        previousOffset - offsetY - Math.ceil(popupRect.height) - 10;
                                     this.quickPopup.dataBind();
                                 }
                             }
@@ -12823,7 +12856,7 @@ class EventWindow {
     resourceSaveEvent(eventObj, action, currentAction) {
         const lastResourceData = this.parent.resourceBase.resourceCollection.slice(-1)[0];
         let resourceData = eventObj[lastResourceData.field];
-        resourceData = (resourceData instanceof Array) ? resourceData : [resourceData];
+        resourceData = (resourceData instanceof Array) ? resourceData.reverse() : [resourceData].reverse();
         const lastLevel = this.parent.resourceBase.lastResourceLevel;
         const eventList = [];
         for (let i = 0; i < resourceData.length; i++) {
@@ -18772,11 +18805,6 @@ class ActionBase {
         };
         return viewDimension;
     }
-    getPageCoordinates(e) {
-        const eventArgs = e.event;
-        return eventArgs && eventArgs.changedTouches ? eventArgs.changedTouches[0] : e.changedTouches ? e.changedTouches[0] :
-            eventArgs || e;
-    }
     getIndex(index) {
         const contentElements = [].slice.call(this.parent.getContentTable().querySelector('tr').children);
         const indexes = { minIndex: 0, maxIndex: contentElements.length - 1 };
@@ -18907,7 +18935,7 @@ class ActionBase {
         }
     }
     getCursorElement(e) {
-        const pages = this.getPageCoordinates(e);
+        const pages = this.parent.eventBase.getPageCoordinates(e);
         return document.elementFromPoint(pages.clientX, pages.clientY);
     }
     autoScroll() {
@@ -19181,7 +19209,7 @@ class Resize extends ActionBase {
                 this.actionObj.cellWidth = trRect.width / noOfDays;
                 this.actionObj.cellHeight = trRect.height;
             }
-            const pages = this.getPageCoordinates(e);
+            const pages = this.parent.eventBase.getPageCoordinates(e);
             this.actionObj.X = pages.pageX;
             this.actionObj.Y = pages.pageY;
             this.actionObj.groupIndex = parseInt(this.actionObj.element.getAttribute('data-group-index') || '0', 10);
@@ -19210,7 +19238,7 @@ class Resize extends ActionBase {
         if ((!isNullOrUndefined(e.target)) && e.target.classList.contains(DISABLE_DATES)) {
             return;
         }
-        const pages = this.getPageCoordinates(e);
+        const pages = this.parent.eventBase.getPageCoordinates(e);
         if (this.parent.currentView === 'Month' || this.parent.currentView === 'TimelineYear') {
             const doc = document.documentElement;
             const left = (window.pageXOffset || doc.scrollLeft) - (doc.clientLeft || 0);
@@ -19636,7 +19664,7 @@ class Resize extends ActionBase {
         return styles;
     }
     resizeValidation(e) {
-        const pages = this.getPageCoordinates(e);
+        const pages = this.parent.eventBase.getPageCoordinates(e);
         const viewDimension = this.getContentAreaDimension();
         const isTimeScale = this.parent.activeView.isTimelineView() && this.parent.activeViewOptions.timeScale.enable;
         let cellWidth = this.actionObj.cellWidth;
@@ -20433,7 +20461,7 @@ class DragAndDrop extends ActionBase {
             return;
         }
         const eventObj = extend({}, this.actionObj.event, null, true);
-        const eventArgs = this.getPageCoordinates(e);
+        const eventArgs = this.parent.eventBase.getPageCoordinates(e);
         this.actionObj.Y = this.actionObj.pageY = eventArgs.pageY;
         this.actionObj.X = this.actionObj.pageX = eventArgs.pageX;
         this.actionObj.target = e.target;
@@ -20574,7 +20602,8 @@ class DragAndDrop extends ActionBase {
             this.timelineEventModule.dateRender = this.parent.activeView.renderDates;
             this.timelineEventModule.cellWidth = this.actionObj.cellWidth;
             this.timelineEventModule.getSlotDates();
-            this.actionObj.cellWidth = this.isHeaderRows ? this.timelineEventModule.cellWidth : this.actionObj.cellWidth;
+            this.actionObj.cellWidth = this.isHeaderRows ? this.timelineEventModule.cellWidth :
+                this.parent.element.querySelector('.' + WORK_CELLS_CLASS).getBoundingClientRect().width;
             this.calculateTimelineTime(e);
         }
         else {
@@ -21320,7 +21349,7 @@ class DragAndDrop extends ActionBase {
         return 0;
     }
     getColumnIndex(offsetLeft) {
-        const index = Math.floor(offsetLeft / this.actionObj.cellWidth);
+        const index = Math.floor(offsetLeft / Math.trunc(this.actionObj.cellWidth));
         if (this.isHeaderRows) {
             return index;
         }