Extract doubled code into a method

opf · Dec 19, 2024 · a56d1a2 · a56d1a2
1 parent 1337b74
commit a56d1a2
Showing 1 changed file with 15 additions and 23 deletions.
diff --git a/...c/app/shared/components/datepicker/wp-modal-date-picker/wp-modal-date-picker.component.ts b/...c/app/shared/components/datepicker/wp-modal-date-picker/wp-modal-date-picker.component.ts
@@ -144,34 +144,13 @@ export class OpWpModalDatePickerComponent extends UntilDestroyedMixin implements
           this.ensureHoveredSelection(instance.calendarContainer);
         },
         onChange: (dates:Date[], _datestr, instance) => {
-          // Todo: Make code better
           if (this.fieldName === 'due_date') {
             this.dueDate = dates[0];
-
-            if (this.dueDateFieldId) {
-              const dueDateField = document.getElementById(this.dueDateFieldId) as HTMLInputElement;
-              dueDateField.value = this.timezoneService.formattedISODate(this.dueDate);
-              dueDateField.dispatchEvent(new Event('input'));
-            }
-
-            // Toggle the active field
-            if (this.startDateFieldId) {
-              document.getElementById(this.startDateFieldId)?.focus();
-            }
+            this.setDateFieldAndFocus(this.dueDate, this.dueDateFieldId, this.startDateFieldId);
             this.fieldName = 'start_date';
           } else {
             this.startDate = dates[0];
-
-            if (this.startDateFieldId) {
-              const dueDateField = document.getElementById(this.startDateFieldId) as HTMLInputElement;
-              dueDateField.value = this.timezoneService.formattedISODate(this.startDate);
-              dueDateField.dispatchEvent(new Event('input'));
-            }
-
-            // Toggle the active field
-            if (this.dueDateFieldId) {
-              document.getElementById(this.dueDateFieldId)?.focus();
-            }
+            this.setDateFieldAndFocus(this.startDate, this.startDateFieldId, this.dueDateFieldId);
             this.fieldName = 'due_date';
           }
 
@@ -218,4 +197,17 @@ export class OpWpModalDatePickerComponent extends UntilDestroyedMixin implements
       )
       .subscribe(() => calendarContainer.classList.add('flatpickr-container-suppress-hover'));
   }
+
+  private setDateFieldAndFocus(date:Date, fieldId:string | null, nextFieldId:string | null):void {
+    if (fieldId) {
+      const field = document.getElementById(fieldId) as HTMLInputElement;
+      field.value = this.timezoneService.formattedISODate(date);
+      field.dispatchEvent(new Event('input'));
+    }
+
+    // Toggle focus to the next field
+    if (nextFieldId) {
+      document.getElementById(nextFieldId)?.focus();
+    }
+  }
 }