fix recurrence form state

Author: Tucchhaa

packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts

@@ -280,6 +280,13 @@ export class AppointmentForm {
           this.updateDateEditorsValues();
         }
 
+        if (isRecurrenceRuleChanged || startDateExpr === dataField) {
+          this._recurrenceForm.updateRecurrenceFormValues(
+            this.recurrenceRuleRaw,
+            this.startDate,
+          );
+        }
+
         if (isRecurrenceRuleChanged) {
           this.updateRepeatEditorValue();
         }
@@ -663,8 +670,14 @@ export class AppointmentForm {
             onValueChanged: (e): void => {
               if (e.value === repeatNeverValue) {
                 this.dxForm.updateData(recurrenceRuleExpr, '');
-                this._recurrenceForm.recurrenceRule = new RecurrenceRule('', this.startDate);
-              } else if (e.event) {
+              } else {
+                const currentRecurrenceRule = this._recurrenceForm.recurrenceRule.toString() ?? '';
+                const recurrenceRule = new RecurrenceRule(currentRecurrenceRule, this.startDate);
+                recurrenceRule.frequency = e.value;
+                this.dxForm.updateData(recurrenceRuleExpr, recurrenceRule.toString());
+              }
+
+              if (e.value !== repeatNeverValue && e.event) {
                 this.showRecurrenceGroup();
               }
 
@@ -847,14 +860,6 @@ export class AppointmentForm {
     this._$recurrenceGroup?.removeClass(CLASSES.recurrenceHidden);
     this._$recurrenceGroup?.removeAttr('tabindex');
 
-    const repeatEditorValue = this.dxForm.getEditor(REPEAT_EDITOR_NAME)?.option('value');
-
-    this._recurrenceForm.updateRecurrenceFormValues(
-      repeatEditorValue,
-      this.recurrenceRuleRaw,
-      this.startDate,
-    );
-
     this._popup.updateToolbarForRecurrenceGroup();
   }
 
@@ -873,7 +878,6 @@ export class AppointmentForm {
     this._$recurrenceGroup?.attr('tabindex', '-1');
 
     this._popup.updateToolbarForMainGroup();
-    this.updateRepeatEditorValue();
   }
 
   saveRecurrenceValue(): void {
@@ -932,18 +936,12 @@ export class AppointmentForm {
 
     if (this.recurrenceRuleRaw === null) {
       repeatEditor.option('value', repeatNeverValue);
-      this._recurrenceForm.recurrenceRule = new RecurrenceRule('', this.startDate);
     } else {
       const recurrenceRule = new RecurrenceRule(this.recurrenceRuleRaw, this.startDate);
       const { frequency } = recurrenceRule;
       const value = frequency ?? repeatNeverValue;
 
       repeatEditor.option('value', value);
-      this._recurrenceForm.updateRecurrenceFormValues(
-        value === repeatNeverValue ? '' : value,
-        this.recurrenceRuleRaw,
-        this.startDate,
-      );
     }
   }
 

packages/devextreme/js/__internal/scheduler/appointment_popup/m_recurrence_form.ts

@@ -540,18 +540,16 @@ export class RecurrenceForm {
   }
 
   updateRecurrenceFormValues(
-    repeatEditorValue: string,
     recurrenceRuleRaw: string | null,
     startDate: Date | null,
   ): void {
     this.recurrenceRule = this.createRecurrenceRule(
-      repeatEditorValue,
       recurrenceRuleRaw,
       startDate,
     );
 
     this.dxForm.getEditor(EDITOR_NAMES.recurrenceStartDateEditor)?.option('value', this.recurrenceRule.startDate);
-    this.dxForm.getEditor(EDITOR_NAMES.recurrencePeriodEditor)?.option('value', repeatEditorValue);
+    this.dxForm.getEditor(EDITOR_NAMES.recurrencePeriodEditor)?.option('value', this.recurrenceRule.frequency);
     this.dxForm.getEditor(EDITOR_NAMES.recurrenceCountEditor)?.option('value', this.recurrenceRule.interval);
     this.dxForm.getEditor(EDITOR_NAMES.recurrenceRepeatEndEditor)?.option('value', this.recurrenceRule.repeatEnd);
     this.dxForm.getEditor(EDITOR_NAMES.recurrenceEndUntilEditor)?.option('value', this.recurrenceRule.until);
@@ -562,22 +560,17 @@ export class RecurrenceForm {
   }
 
   private createRecurrenceRule(
-    repeatEditorValue: string,
     recurrenceRuleRaw: string | null,
     startDate: Date | null,
   ): RecurrenceRule {
     const recurrenceRule = new RecurrenceRule(recurrenceRuleRaw ?? '', startDate);
-    const { frequency } = recurrenceRule;
 
-    if (frequency !== repeatEditorValue) {
-      const newRecurrenceRule = new RecurrenceRule(`freq=${repeatEditorValue};`, startDate);
+    if (recurrenceRule.byDay.length === 0) {
       const defaultByDay = [
         weekDays[startDate?.getDay() ?? this.scheduler.getFirstDayOfWeek()],
       ];
 
-      newRecurrenceRule.byDay = defaultByDay;
-
-      return newRecurrenceRule;
+      recurrenceRule.byDay = defaultByDay;
     }
 
     return recurrenceRule;