@hmcts/ccd-case-ui-toolkit 7.3.0-exui-3066 → 7.3.0-exui-3066-2

package/fesm2022/hmcts-ccd-case-ui-toolkit.mjs

@@ -637,7 +637,11 @@ class DateInputComponent {
                 ].join(':');
                 const localDateTimeString = `${date}T${time}.000`;
                 // convert from local time to UTC for storage
-                const localMoment = moment(localDateTimeString);
+                const localMoment = moment(localDateTimeString, 'YYYY-MM-DDTHH:mm:ss.SSS', true);
+                // if invalid, return the raw string for validation to catch
+                if (!localMoment.isValid()) {
+                    return localDateTimeString;
+                }
                 const utcMoment = localMoment.utc();
                 // return in the expected format
                 return utcMoment.format('YYYY-MM-DDTHH:mm:ss.000');
@@ -29327,7 +29331,6 @@ class DatetimePickerComponent extends AbstractFormFieldComponent {
     ngOnInit() {
         this.dateTimeEntryFormat = this.formatTranslationService.showOnlyDates(this.caseField.dateTimeEntryFormat);
         this.configureDatePicker(this.dateTimeEntryFormat);
-        const existingControl = (this.parent || this.formGroup)?.controls?.[this.caseField.id];
         // for when navigating back to an existing form
         this.dateControl = (this.caseField.isMandatory ?
             this.registerControl(new FormControl(this.caseField.value || '', [Validators.required]))
@@ -29483,23 +29486,21 @@ class DatetimePickerComponent extends AbstractFormFieldComponent {
                 this.inputElement.nativeElement.value = keepErrorText;
             }
         }
-        else {
+        else if (this.localDisplayControl.value) {
             // input is empty - check if we need to sync from control values
-            if (this.localDisplayControl.value) {
-                // control has a value but input doesn't - this happens when navigating back
-                // manually sync the control value to the input element
-                const controlValue = this.localDisplayControl.value;
-                const parsedMoment = moment(controlValue, this.momentFormat);
-                if (parsedMoment.isValid()) {
-                    const formattedValue = parsedMoment.format(this.dateTimeEntryFormat);
-                    this.inputElement.nativeElement.value = formattedValue;
-                }
-            }
-            else if (!this.dateControl.value) {
-                this.localDisplayControl.setValue('');
-                this.dateControl.setValue('');
+            // control has a value but input doesn't - this happens when navigating back
+            // manually sync the control value to the input element
+            const controlValue = this.localDisplayControl.value;
+            const parsedMoment = moment(controlValue, this.momentFormat);
+            if (parsedMoment.isValid()) {
+                const formattedValue = parsedMoment.format(this.dateTimeEntryFormat);
+                this.inputElement.nativeElement.value = formattedValue;
             }
         }
+        else if (!this.dateControl.value) {
+            this.localDisplayControl.setValue('');
+            this.dateControl.setValue('');
+        }
     }
     static ɵfac = function DatetimePickerComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || DatetimePickerComponent)(i0.ɵɵdirectiveInject(FormatTranslatorService), i0.ɵɵdirectiveInject(NGX_MAT_DATE_FORMATS)); };
     static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: DatetimePickerComponent, selectors: [["ccd-datetime-picker"]], viewQuery: function DatetimePickerComponent_Query(rf, ctx) { if (rf & 1) {