Scheduler - Add labelMode hidden to recurrence editor options (T1318550)

Author: aleksei-semikozov

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

@@ -1,6 +1,7 @@
 import {
   afterEach, beforeEach, describe, expect, it, jest,
 } from '@jest/globals';
+import $ from '@js/core/renderer';
 
 import fx from '../../../common/core/animation/fx';
 import { createScheduler } from '../__tests__/__mock__/create_scheduler';
@@ -757,6 +758,34 @@ describe('Appointment popup form', () => {
     it.todo('Popup should not contain recurrence editor, if recurrenceRuleExpr is \'\'');
     it.todo('Multiple showing appointment popup for recurrence appointments and after update options should work correct');
   });
+
+  it('recurrence editors with hidden outer label must have editorOptions.labelMode set to hidden (T1318550)', () => {
+    const $container = $('<div>').appendTo(document.body);
+    const editor = ($container as any).dxRecurrenceEditor({
+      value: 'FREQ=DAILY;COUNT=5',
+    }).dxRecurrenceEditor('instance');
+
+    const recurrenceForm = editor.getRecurrenceForm();
+    const formItems = recurrenceForm.option('items');
+
+    const collectItems = (items: any[]): any[] => items.flatMap(
+      (i: any) => (i.items ? collectItems(i.items) : [i]),
+    );
+    const allItems = collectItems(formItems);
+    const hiddenLabelEditors = allItems.filter(
+      (i: any) => i.label?.visible === false && i.editorOptions,
+    );
+
+    expect(hiddenLabelEditors.length).toBeGreaterThan(0);
+
+    const failing = hiddenLabelEditors
+      .filter((i: any) => i.editorOptions.labelMode !== 'hidden')
+      .map((i: any) => ({ dataField: i.dataField, labelMode: i.editorOptions.labelMode }));
+    expect(failing).toEqual([]);
+
+    editor.dispose();
+    $container.remove();
+  });
 });
 
 describe('Appointment Popup Content', () => {

packages/devextreme/js/__internal/scheduler/m_recurrence_editor.ts

@@ -365,6 +365,7 @@ class RecurrenceEditor extends Editor {
       dataField: 'bymonth',
       editorType: 'dxSelectBox',
       editorOptions: {
+        labelMode: 'hidden',
         stylingMode: getStylingModeFunc(),
         field: 'bymonth',
         items: months,
@@ -389,6 +390,7 @@ class RecurrenceEditor extends Editor {
       dataField: 'bymonthday',
       editorType: 'dxNumberBox',
       editorOptions: {
+        labelMode: 'hidden',
         stylingMode: getStylingModeFunc(),
         min: 1,
         max: 31,
@@ -422,6 +424,7 @@ class RecurrenceEditor extends Editor {
       dataField: 'repeatEnd',
       editorType: 'dxRadioGroup',
       editorOptions: {
+        labelMode: 'hidden',
         items: repeatEndTypes,
         value: repeatType,
         valueExpr: 'type',
@@ -565,6 +568,7 @@ class RecurrenceEditor extends Editor {
       label: { visible: false },
       editorType: 'dxNumberBox',
       editorOptions: {
+        labelMode: 'hidden',
         stylingMode: getStylingModeFunc(),
         field: 'count',
         format: `# ${messageLocalization.format('dxScheduler-recurrenceRepeatCount')}`,
@@ -613,6 +617,7 @@ class RecurrenceEditor extends Editor {
       cssClass: REPEAT_UNTIL_DATE_EDITOR,
       editorType: 'dxDateBox',
       editorOptions: {
+        labelMode: 'hidden',
         stylingMode: getStylingModeFunc(),
         field: 'until',
         value: until,