@syncfusion/ej2-calendars 21.2.6 → 21.2.9

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

@@ -1583,10 +1583,10 @@ let CalendarBase = class CalendarBase extends Component {
      * @returns {string}
      */
     currentView() {
-        if (this.contentElement.classList.contains(YEAR)) {
+        if (!isNullOrUndefined(this.contentElement) && this.contentElement.classList.contains(YEAR)) {
             return 'Year';
         }
-        else if (this.contentElement.classList.contains(DECADE)) {
+        else if (!isNullOrUndefined(this.contentElement) && this.contentElement.classList.contains(DECADE)) {
             return 'Decade';
         }
         else {
@@ -9783,9 +9783,11 @@ let TimePicker = class TimePicker extends Component {
     }
     validateDisable() {
         this.setMinMax(this.initMin, this.initMax);
-        this.popupCreation();
-        this.popupObj.destroy();
-        this.popupWrapper = this.popupObj = null;
+        if (!isNullOrUndefined(this.value)) {
+            this.popupCreation();
+            this.popupObj.destroy();
+            this.popupWrapper = this.popupObj = null;
+        }
         if ((!isNaN(+this.value) && this.value !== null)) {
             if (!this.valueIsDisable(this.value)) {
                 //disable value given in value property so reset the date based on current date
@@ -10510,6 +10512,11 @@ let TimePicker = class TimePicker extends Component {
                 case 'end':
                 case 'up':
                 case 'down':
+                    if (!this.isPopupOpen()) {
+                        this.popupCreation();
+                        this.popupObj.destroy();
+                        this.popupObj = this.popupWrapper = null;
+                    }
                     if (this.enableMask && !this.readonly && !this.isPopupOpen()) {
                         event.preventDefault();
                         this.notify('keyDownHandler', {