fix(date-picker): add check for calendar before setting (#18448)

* fix: add check for calendar before setting

* fix: add another calendar check

Author: annawen1

packages/web-components/src/components/date-picker/date-picker.ts

@@ -389,26 +389,27 @@ class CDSDatePicker extends HostListenerMixin(FormMixin(LitElement)) {
       value,
     } = this;
 
-    if (dateFormat) {
-      this._setCalendar('dateFormat', calendar);
-    }
+    if (calendar) {
+      if (dateFormat) {
+        this._setCalendar('dateFormat', calendar);
+      }
 
-    if (minDate || maxDate) {
-      this._setCalendar('date', calendar);
-    }
+      if (minDate || maxDate) {
+        this._setCalendar('date', calendar);
+      }
 
-    if (open) {
-      this._setCalendar('open', calendar);
-    }
+      if (open) {
+        this._setCalendar('open', calendar);
+      }
 
-    if (disabled || readonly) {
-      this._setCalendar('disabled', calendar);
-    }
-    if (value) {
-      this._setCalendar('value', calendar);
+      if (disabled || readonly) {
+        this._setCalendar('disabled', calendar);
+      }
+      if (value) {
+        this._setCalendar('value', calendar);
+      }
     }
-
-    return this.calendar;
+    return calendar;
   }
 
   /**
@@ -519,24 +520,29 @@ class CDSDatePicker extends HostListenerMixin(FormMixin(LitElement)) {
 
   updated(changedProperties) {
     const { calendar } = this;
-    if (calendar && changedProperties.has('dateFormat')) {
-      this._setCalendar('dateFormat', calendar);
-    }
-    if (changedProperties.has('minDate') || changedProperties.has('maxDate')) {
-      this._setCalendar('date', calendar);
-    }
+    if (calendar) {
+      if (changedProperties.has('dateFormat')) {
+        this._setCalendar('dateFormat', calendar);
+      }
+      if (
+        changedProperties.has('minDate') ||
+        changedProperties.has('maxDate')
+      ) {
+        this._setCalendar('date', calendar);
+      }
 
-    if (changedProperties.has('open') && calendar) {
-      this._setCalendar('open', calendar);
-    }
-    if (
-      changedProperties.has('disabled') ||
-      changedProperties.has('readonly')
-    ) {
-      this._setCalendar('disabled', calendar);
-    }
-    if (changedProperties.has('value')) {
-      this._setCalendar('value', calendar);
+      if (changedProperties.has('open')) {
+        this._setCalendar('open', calendar);
+      }
+      if (
+        changedProperties.has('disabled') ||
+        changedProperties.has('readonly')
+      ) {
+        this._setCalendar('disabled', calendar);
+      }
+      if (changedProperties.has('value')) {
+        this._setCalendar('value', calendar);
+      }
     }
   }