@syncfusion/ej2-schedule 20.4.43 → 20.4.44

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

@@ -9129,7 +9129,7 @@ class QuickPopups {
         if (deleteIcon) {
             this.renderButton('e-flat e-round e-small', ICON + ' ' + DELETE_ICON_CLASS, deleteAction, deleteIcon, this.deleteClick);
         }
-        this.beforeQuickPopupOpen(target);
+        this.beforeQuickPopupOpen(target, e);
     }
     isCellBlocked(args) {
         const tempObj = {};
@@ -9216,7 +9216,7 @@ class QuickPopups {
         this.quickPopup.content = quickCellPopup;
         this.quickPopup.relateTo = target;
         this.quickPopup.dataBind();
-        this.beforeQuickPopupOpen(target);
+        this.beforeQuickPopupOpen(target, args.event);
     }
     isSameEventClick(events) {
         const isSameTarget = this.quickPopup.relateTo === closest(events.element, '.' + APPOINTMENT_CLASS);
@@ -9293,7 +9293,7 @@ class QuickPopups {
             this.quickPopup.relateTo = this.parent.isAdaptive ? document.body :
                 closest(events.element, '.' + APPOINTMENT_CLASS);
             this.quickPopup.dataBind();
-            this.beforeQuickPopupOpen(events.element);
+            this.beforeQuickPopupOpen(events.element, events.originalEvent);
         }
     }
     getPopupHeader(headerType, headerData) {
@@ -9567,15 +9567,16 @@ class QuickPopups {
                 this.morePopup.relateTo = closest(target, '.' + WORK_CELLS_CLASS);
             }
         }
-        this.parent.renderTemplates();
-        const eventProp = {
-            type: 'EventContainer', cancel: false,
-            element: this.morePopup.element, data: data
-        };
-        this.parent.trigger(popupOpen, eventProp, (popupArgs) => {
-            if (!popupArgs.cancel) {
-                this.morePopup.show();
-            }
+        this.parent.renderTemplates(() => {
+            const eventProp = {
+                type: 'EventContainer', cancel: false,
+                element: this.morePopup.element, data: data
+            };
+            this.parent.trigger(popupOpen, eventProp, (popupArgs) => {
+                if (!popupArgs.cancel) {
+                    this.morePopup.show();
+                }
+            });
         });
     }
     saveClick(event) {
@@ -9765,70 +9766,94 @@ class QuickPopups {
             }
         });
     }
-    beforeQuickPopupOpen(target) {
-        this.parent.renderTemplates();
-        const isEventPopup = this.quickPopup.element.querySelector('.' + EVENT_POPUP_CLASS);
-        const popupType = this.parent.isAdaptive ? isEventPopup ? 'ViewEventInfo' : 'EditEventInfo' : 'QuickInfo';
-        const eventProp = {
-            type: popupType, cancel: false, data: extend({}, this.getDataFromTarget(target), null, true),
-            target: target, element: this.quickPopup.element
-        };
-        this.parent.trigger(popupOpen, eventProp, (popupArgs) => {
-            if (popupArgs.cancel) {
-                this.quickPopupHide();
-                this.destroyPopupButtons('quickPopup');
-                if (popupArgs.element.classList.contains(POPUP_OPEN)) {
-                    this.quickPopupClose();
-                }
-                removeChildren(this.quickPopup.element);
-                this.isMultipleEventSelect = false;
-            }
-            else {
-                const display = this.quickPopup.element.style.display;
-                this.quickPopup.element.style.display = 'block';
-                if (this.parent.isAdaptive) {
-                    this.quickPopup.element.removeAttribute('style');
-                    this.quickPopup.element.style.display = 'block';
-                    this.quickPopup.element.style.height = formatUnit((popupType === 'EditEventInfo') ? 65 : window.innerHeight);
+    beforeQuickPopupOpen(target, originalEvent) {
+        this.parent.renderTemplates(() => {
+            const isEventPopup = this.quickPopup.element.querySelector('.' + EVENT_POPUP_CLASS);
+            const popupType = this.parent.isAdaptive ? isEventPopup ? 'ViewEventInfo' : 'EditEventInfo' : 'QuickInfo';
+            const eventProp = {
+                type: popupType, cancel: false, data: extend({}, this.getDataFromTarget(target), null, true),
+                target: target, element: this.quickPopup.element
+            };
+            this.parent.trigger(popupOpen, eventProp, (popupArgs) => {
+                if (popupArgs.cancel) {
+                    this.quickPopupHide();
+                    this.destroyPopupButtons('quickPopup');
+                    if (popupArgs.element.classList.contains(POPUP_OPEN)) {
+                        this.quickPopupClose();
+                    }
+                    removeChildren(this.quickPopup.element);
+                    this.isMultipleEventSelect = false;
                 }
                 else {
-                    const isVirtualScroll = this.parent.virtualScrollModule && this.parent.virtualScrollModule.isHorizontalScroll
-                        && !isNullOrUndefined(closest(target, '.' + CONTENT_TABLE_CLASS));
-                    const conTable = this.parent.element.querySelector('.' + CONTENT_WRAP_CLASS + ' table');
-                    this.quickPopup.offsetX = isVirtualScroll && !this.parent.enableRtl ? (getTranslateX(conTable) + 10) : 10;
-                    this.quickPopup.collision = { X: this.parent.enableRtl ? 'flip' : 'none', Y: 'fit' };
-                    this.quickPopup.position = { X: this.parent.enableRtl ? 'left' : 'right', Y: this.parent.enableRtl ? 'bottom' : 'top' };
-                    this.quickPopup.dataBind();
-                    this.quickPopup.refreshPosition(null, true);
-                    const collide = isCollide(this.quickPopup.element, this.parent.element);
-                    if (collide.indexOf(this.parent.enableRtl ? 'left' : 'right') > -1) {
-                        this.quickPopup.offsetX = -target.offsetWidth - 10 - this.quickPopup.element.offsetWidth;
-                        if (isVirtualScroll && !this.parent.enableRtl) {
-                            this.quickPopup.offsetX = getTranslateX(conTable) + this.quickPopup.offsetX;
-                        }
+                    const display = this.quickPopup.element.style.display;
+                    this.quickPopup.element.style.display = 'block';
+                    if (this.parent.isAdaptive) {
+                        this.quickPopup.element.removeAttribute('style');
+                        this.quickPopup.element.style.display = 'block';
+                        this.quickPopup.element.style.height = formatUnit((popupType === 'EditEventInfo') ? 65 : window.innerHeight);
+                    }
+                    else {
+                        const isVirtualScroll = this.parent.virtualScrollModule && this.parent.virtualScrollModule.isHorizontalScroll
+                            && !isNullOrUndefined(closest(target, '.' + CONTENT_TABLE_CLASS));
+                        const conTable = this.parent.element.querySelector('.' + CONTENT_WRAP_CLASS + ' table');
+                        this.quickPopup.offsetX = isVirtualScroll && !this.parent.enableRtl ? (getTranslateX(conTable) + 10) : 10;
+                        this.quickPopup.offsetY = this.parent.virtualScrollModule && !this.parent.virtualScrollModule.isHorizontalScroll ?
+                            this.quickPopup.offsetY : 0;
+                        this.quickPopup.collision = { X: this.parent.enableRtl ? 'flip' : 'none', Y: 'fit' };
+                        this.quickPopup.position = { X: this.parent.enableRtl ? 'left' : 'right', Y: this.parent.enableRtl ? 'bottom' : 'top' };
                         this.quickPopup.dataBind();
                         this.quickPopup.refreshPosition(null, true);
-                        const leftCollide = isCollide(this.quickPopup.element, this.parent.element);
-                        if (leftCollide.indexOf('left') > -1) {
-                            this.quickPopup.position = { X: 'center', Y: 'center' };
-                            this.quickPopup.collision = { X: 'fit', Y: 'fit' };
-                            this.quickPopup.offsetX = -(this.quickPopup.element.offsetWidth / 2);
+                        const collide = isCollide(this.quickPopup.element, this.parent.element);
+                        if (collide.indexOf(this.parent.enableRtl ? 'left' : 'right') > -1) {
+                            this.quickPopup.offsetX = -target.offsetWidth - 10 - this.quickPopup.element.offsetWidth;
+                            if (isVirtualScroll && !this.parent.enableRtl) {
+                                this.quickPopup.offsetX = getTranslateX(conTable) + this.quickPopup.offsetX;
+                            }
+                            this.quickPopup.dataBind();
+                            this.quickPopup.refreshPosition(null, true);
+                            const leftCollide = isCollide(this.quickPopup.element, this.parent.element);
+                            if (leftCollide.indexOf('left') > -1) {
+                                this.quickPopup.position = { X: 'center', Y: 'center' };
+                                this.quickPopup.collision = { X: 'fit', Y: 'fit' };
+                                this.quickPopup.offsetX = -(this.quickPopup.element.offsetWidth / 2);
+                                this.quickPopup.dataBind();
+                            }
+                        }
+                        if (this.parent.virtualScrollModule && !this.parent.virtualScrollModule.isHorizontalScroll && (collide.indexOf('top') > -1 || collide.indexOf('bottom') > -1)) {
+                            const translateY = getTranslateY(conTable);
+                            this.quickPopup.offsetY = translateY;
                             this.quickPopup.dataBind();
+                            this.quickPopup.refreshPosition(null, true);
+                        }
+                        if (this.quickPopup.position.X === 'center' && this.quickPopup.position.Y === 'center' && !isNullOrUndefined(originalEvent)) {
+                            const previousOffset = this.quickPopup.offsetY;
+                            let collision = isCollide(target, this.quickPopup.element);
+                            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) {
+                                    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.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.dataBind();
+                                }
+                            }
                         }
                     }
-                    if (this.parent.virtualScrollModule && !this.parent.virtualScrollModule.isHorizontalScroll && (collide.indexOf('top') > -1 || collide.indexOf('bottom') > -1)) {
-                        const translateY = getTranslateY(conTable);
-                        this.quickPopup.offsetY = translateY;
-                        this.quickPopup.dataBind();
+                    if (isEventPopup) {
+                        this.applyEventColor();
                     }
+                    this.quickPopup.element.style.display = display;
+                    this.quickPopup.dataBind();
+                    this.quickPopup.show();
                 }
-                if (isEventPopup) {
-                    this.applyEventColor();
-                }
-                this.quickPopup.element.style.display = display;
-                this.quickPopup.dataBind();
-                this.quickPopup.show();
-            }
+            });
         });
     }
     applyEventColor() {
@@ -11579,8 +11604,9 @@ class EventWindow {
             const templateId = this.parent.element.id + '_editorTemplate';
             const tempEle = [].slice.call(this.parent.getEditorTemplate()(args || {}, this.parent, 'editorTemplate', templateId, false));
             append(tempEle, form);
-            this.parent.renderTemplates();
-            this.applyFormValidation();
+            this.parent.renderTemplates(() => {
+                this.applyFormValidation();
+            });
         }
         else {
             form.appendChild(this.getDefaultEventWindowContent());
@@ -12511,7 +12537,9 @@ class EventWindow {
             }
         }
         if (this.recurrenceEditor && this.recurrenceEditor.value && this.recurrenceEditor.value !== '') {
-            alertType = this.recurrenceValidation(eventObj[this.fields.startTime], eventObj[this.fields.endTime], alert);
+            if (this.parent.currentAction !== 'EditOccurrence') {
+                alertType = this.recurrenceValidation(eventObj[this.fields.startTime], eventObj[this.fields.endTime], alert);
+            }
             let isShowAlert = true;
             if (alertType === 'seriesChangeAlert' && this.parent.uiStateValues.isIgnoreOccurrence) {
                 isShowAlert = false;
@@ -12734,53 +12762,58 @@ class EventWindow {
         if (isNullOrUndefined(index)) {
             return false;
         }
+        const currentStartTime = new Date(+currentData[this.fields.startTime]);
+        const currentEndTime = new Date(+currentData[this.fields.endTime]);
+        if (index !== recurColl.length - 1) {
+            var nextStartTime = new Date(+recurColl[index + 1][this.fields.startTime]);
+            var nextEndTime = new Date(+recurColl[index + 1][this.fields.endTime]);
+        }
+        const lastEndTime = new Date(+recurColl[recurColl.length - 1][this.fields.endTime]);
         if (index === 0) {
             if (!isNullOrUndefined(recurColl[index + 1])) {
-                if (!(resetTime(new Date(+recurColl[index + 1][this.fields.startTime])).getTime() >
-                    resetTime(new Date(+currentData[this.fields.endTime])).getTime()) &&
-                    (resetTime(new Date(+recurColl[recurColl.length - 1][this.fields.endTime])).getTime() >=
-                        resetTime(new Date(+currentData[this.fields.startTime])).getTime())) {
-                    this.parent.quickPopup.openRecurrenceValidationAlert('sameDayAlert');
+                if (!(nextStartTime.getTime() >= currentEndTime.getTime()) &&
+                    (resetTime(lastEndTime).getTime() >=
+                        resetTime(currentStartTime).getTime()) ||
+                    resetTime(lastEndTime).getTime() < resetTime(currentStartTime).getTime()) {
+                    this.parent.quickPopup.openRecurrenceValidationAlert('occurrenceAlert');
                     return true;
                 }
-                else if (resetTime(new Date(+recurColl[recurColl.length - 1][this.fields.endTime])).getTime() <
-                    resetTime(new Date(+currentData[this.fields.startTime])).getTime()) {
-                    this.parent.quickPopup.openRecurrenceValidationAlert('occurrenceAlert');
+                else if (!(resetTime(currentStartTime).getTime() <
+                    resetTime(nextStartTime).getTime())) {
+                    this.parent.quickPopup.openRecurrenceValidationAlert('sameDayAlert');
                     return true;
                 }
             }
             return false;
         }
         else {
+            const previousStartTime = new Date(+recurColl[index - 1][this.fields.startTime]);
+            const previousEndTime = new Date(+recurColl[index - 1][this.fields.endTime]);
             if (index === recurColl.length - 1) {
-                if (!(resetTime(new Date(+recurColl[index - 1][this.fields.endTime])).getTime() <
-                    resetTime(new Date(+currentData[this.fields.startTime])).getTime()) &&
-                    (resetTime(new Date(+recurColl[(recurColl.length - 1) - index][this.fields.startTime])).getTime() <=
-                        resetTime(new Date(+currentData[this.fields.endTime])).getTime())) {
-                    this.parent.quickPopup.openRecurrenceValidationAlert('sameDayAlert');
+                if (resetTime(new Date(+recurColl[(recurColl.length - 1) - index][this.fields.startTime])).getTime() >
+                    resetTime(currentStartTime).getTime()) {
+                    this.parent.quickPopup.openRecurrenceValidationAlert('occurrenceAlert');
                     return true;
                 }
-                else if (resetTime(new Date(+recurColl[(recurColl.length - 1) - index][this.fields.endTime])).getTime() >
-                    resetTime(new Date(+currentData[this.fields.startTime])).getTime()) {
-                    this.parent.quickPopup.openRecurrenceValidationAlert('occurrenceAlert');
+                else if (!((previousEndTime.getTime() <= currentStartTime.getTime()) &&
+                    (resetTime(currentStartTime).getTime() > resetTime(previousStartTime).getTime()))) {
+                    this.parent.quickPopup.openRecurrenceValidationAlert('sameDayAlert');
                     return true;
                 }
             }
-            else if (!(((resetTime(new Date(+recurColl[index - 1][this.fields.endTime])).getTime() <
-                resetTime(new Date(+currentData[this.fields.startTime])).getTime()) ||
-                (resetTime(new Date(+recurColl[0][this.fields.startTime])).getTime() >
-                    resetTime(new Date(+currentData[this.fields.startTime])).getTime())) &&
-                ((resetTime(new Date(+recurColl[index + 1][this.fields.startTime])).getTime() >
-                    resetTime(new Date(+currentData[this.fields.endTime])).getTime()) ||
-                    (resetTime(new Date(+recurColl[recurColl.length - 1][this.fields.endTime])).getTime() <
-                        resetTime(new Date(+currentData[this.fields.startTime])).getTime())))) {
+            else if (!(((resetTime(previousStartTime).getTime() < resetTime(currentStartTime).getTime()) ||
+                resetTime(new Date(+recurColl[0][this.fields.startTime])).getTime() >
+                    resetTime(currentStartTime).getTime()) &&
+                ((resetTime(nextStartTime).getTime() > resetTime(currentStartTime).getTime()) ||
+                    (lastEndTime.getTime() < currentStartTime.getTime())))) {
                 this.parent.quickPopup.openRecurrenceValidationAlert('sameDayAlert');
                 return true;
             }
-            else if ((resetTime(new Date(+recurColl[index + 1][this.fields.endTime])).getTime() <
-                resetTime(new Date(+currentData[this.fields.startTime])).getTime()) ||
-                (resetTime(new Date(+recurColl[index - 1][this.fields.startTime])).getTime() >
-                    resetTime(new Date(+currentData[this.fields.endTime])).getTime())) {
+            else if (!(previousEndTime.getTime() <= currentStartTime.getTime() && nextStartTime.getTime() >
+                currentEndTime.getTime()) || (resetTime(nextEndTime).getTime() <
+                resetTime(currentStartTime).getTime()) ||
+                (resetTime(previousStartTime).getTime() > resetTime(currentEndTime).getTime()) ||
+                !(resetTime(currentStartTime).getTime() < resetTime(nextStartTime).getTime())) {
                 this.parent.quickPopup.openRecurrenceValidationAlert('occurrenceAlert');
                 return true;
             }
@@ -15899,12 +15932,16 @@ let Schedule = class Schedule extends Component {
     /**
      * Method to render react templates
      *
+     * @param {Function} callBack - specifies the callBack method
      * @returns {void}
      * @private
      */
-    renderTemplates() {
+    renderTemplates(callback) {
         if (this.isReact) {
-            this.renderReactTemplates();
+            this.renderReactTemplates(callback);
+        }
+        else if (callback) {
+            callback();
         }
     }
     /**