@syncfusion/ej2-calendars 33.2.3 → 33.2.5

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

@@ -6016,10 +6016,13 @@ let DateRangePicker = class DateRangePicker extends CalendarBase {
             Input.setCssClass(cssNewClass, [this.popupWrapper], cssOldClass);
         }
     }
+    isValidPreset() {
+        return !isNullOrUndefined(this.presets[0]) && !isUndefined(this.presets[0].start && this.presets[0].end && this.presets[0].label);
+    }
     processPresets() {
         this.presetsItem = [];
         let i = 0;
-        if (!isNullOrUndefined(this.presets[0]) && !isUndefined(this.presets[0].start && this.presets[0].end && this.presets[0].label)) {
+        if (this.isValidPreset()) {
             for (const range of this.presets) {
                 const id = range.label.replace(/\s+/g, '') + '_' + (++i);
                 if (typeof range.end === 'string') {
@@ -6337,7 +6340,8 @@ let DateRangePicker = class DateRangePicker extends CalendarBase {
         this.popupWrapper.setAttribute('role', 'dialog');
         this.adjustLongHeaderWidth();
         const isPreset = (!this.isCustomRange || this.isMobile);
-        if (!isUndefined(this.presets[0].start && this.presets[0].end && this.presets[0].label) && isPreset) {
+        if (this.isValidPreset()
+            && isPreset) {
             this.isCustomWindow = false;
             this.createPresets();
             this.listRippleEffect();
@@ -8317,7 +8321,7 @@ let DateRangePicker = class DateRangePicker extends CalendarBase {
         EventHandler.add(cancelBtn, 'click', this.cancelFunction, this);
         this.popupWrapper.appendChild(controlContainer);
         if (!this.isMobile) {
-            if (!isUndefined(this.presets[0].start && this.presets[0].end && this.presets[0].label)) {
+            if (this.isValidPreset()) {
                 this.createPresets();
                 this.listRippleEffect();
                 addClass([controlContainer], RANGEBORDER);
@@ -8421,6 +8425,9 @@ let DateRangePicker = class DateRangePicker extends CalendarBase {
                 });
             }
         }
+        if (this.isRangeIconClicked && this.openOnFocus) {
+            this.isRangeIconClicked = false;
+        }
     }
     onMouseClick(event, item) {
         if (event.type === 'touchstart') {
@@ -8557,7 +8564,7 @@ let DateRangePicker = class DateRangePicker extends CalendarBase {
         }
     }
     createPresets() {
-        if (!isUndefined(this.presets[0].start && this.presets[0].end && this.presets[0].label)) {
+        if (this.isValidPreset()) {
             this.presetElement = this.createElement('div', { className: PRESETS, attrs: { 'tabindex': '0' } });
             const listTag = ListBase.createList(this.createElement, this.presetsItem, null, true);
             attributes(listTag, { 'role': 'listbox', 'aria-hidden': 'false', 'id': this.element.id + '_options', 'tabindex': '0', 'aria-label': 'daterangepicker-preset' });
@@ -8626,14 +8633,12 @@ let DateRangePicker = class DateRangePicker extends CalendarBase {
             relateTo: this.isMobile && this.isCustomWindow ? document.body :
                 (!isNullOrUndefined(this.targetElement) ? this.targetElement : this.inputWrapper.container),
             position: (this.isMobile ?
-                (!isUndefined(this.presets[0].start && this.presets[0].end && this.presets[0].label) && !this.isCustomWindow ?
-                    { X: 'left', Y: 'bottom' } : { X: 'center', Y: 'center' }) :
+                (this.isValidPreset() && !this.isCustomWindow ? { X: 'left', Y: 'bottom' } : { X: 'center', Y: 'center' }) :
                 this.enableRtl ? { X: 'left', Y: 'bottom' } : { X: 'right', Y: 'bottom' }),
             offsetX: this.isMobile || this.enableRtl ? 0 : -popupWidth,
             offsetY: OFFSETVALUE$1,
             collision: this.isMobile ?
-                (!isUndefined(this.presets[0].start && this.presets[0].end && this.presets[0].label) && !this.isCustomWindow ?
-                    { X: 'fit' } : { X: 'fit', Y: 'fit' }) : { X: 'fit', Y: 'flip' },
+                (this.isValidPreset() && !this.isCustomWindow ? { X: 'fit' } : { X: 'fit', Y: 'fit' }) : { X: 'fit', Y: 'flip' },
             targetType: this.isMobile && this.isCustomWindow ? 'container' : 'relative',
             enableRtl: this.enableRtl,
             zIndex: this.zIndex,
@@ -8708,7 +8713,7 @@ let DateRangePicker = class DateRangePicker extends CalendarBase {
                 if (this.isRangeIconClicked) {
                     this.inputWrapper.container.children[1].focus();
                 }
-                if (!isUndefined(this.presets[0].start && this.presets[0].end && this.presets[0].label)) {
+                if (this.isValidPreset()) {
                     this.unWireListEvents();
                 }
                 if (this.applyButton) {
@@ -9711,7 +9716,7 @@ let DateRangePicker = class DateRangePicker extends CalendarBase {
                         this.openEventArgs.appendTo.appendChild(this.popupWrapper);
                         this.showPopup(element, event);
                         const isPreset = (!this.isCustomRange || (this.isMobile && this.isCustomRange));
-                        if (!isUndefined(this.presets[0].start && this.presets[0].end && this.presets[0].label) && isPreset) {
+                        if (this.isValidPreset() && isPreset) {
                             this.setScrollPosition();
                         }
                         this.checkMinMaxDays();
@@ -9724,8 +9729,7 @@ let DateRangePicker = class DateRangePicker extends CalendarBase {
                         super.setOverlayIndex(this.mobileRangePopupWrap, this.popupObj.element, this.modal, this.isMobile || Browser.isDevice);
                         if (!isNullOrUndefined(this.mobileRangePopupWrap) && !isNullOrUndefined(this.popupObj)
                             && !isNullOrUndefined(this.popupObj.element) && isNullOrUndefined(this.modal) &&
-                            !isUndefined(this.presets[0].start && this.presets[0].end && this.presets[0].label) && isPreset
-                            && (this.isMobile || Browser.isDevice) && !this.isCustomWindow) {
+                            this.isValidPreset() && isPreset && (this.isMobile || Browser.isDevice) && !this.isCustomWindow) {
                             const index = parseInt(this.popupObj.element.style.zIndex, 10) ?
                                 parseInt(this.popupObj.element.style.zIndex, 10) : 1000;
                             this.mobileRangePopupWrap.style.zIndex = index.toString();