Skip to content

Scheduler: Editing form labels are incorrectly displayed #32276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aleksei-semikozov wants to merge 3 commits into
base: 25_1
Choose a base branch
from
Open

Scheduler: Editing form labels are incorrectly displayed #32276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6faa1bf
Scheduler: fix layout for different labelMode
aleksei-semikozov Jan 22, 2026
40139df
Update etalons
aleksei-semikozov Jan 22, 2026
50278cc
Merge branch '25_1' into Scheduler_T1318550
aleksei-semikozov Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified ...talons/form_recurrence-editor-first-opening_nested-expr (fluent.blue.light).png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...on/appointmentForm/etalons/recurrence-editor_after-hide (fluent.blue.light).png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ntmentForm/etalons/recurrence-editor_after-popup-reopen (fluent.blue.light).png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...yout/appointmentForm/etalons/allday-and-reccurence-form (fluent.blue.light).png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...pointmentForm/etalons/dx-number-boxes-not-integer-chars (fluent.blue.light).png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...etalons/form-after-change-allday-and-reccurence-options (fluent.blue.light).png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...common/layout/appointments/etalons/disabled-appointment (fluent.blue.light).png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...t/appointments/etalons/disabled-by-function-appointment (fluent.blue.light).png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .../common/layout/appointments/etalons/enabled-appointment (fluent.blue.light).png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ut/appointments/etalons/enabled-by-function-appointment (fluent.blue.light).png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions packages/devextreme-scss/scss/widgets/base/_recurrenceEditor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$recurrence-interval-number-box-margin-top: 25px;
$recurrence-interval-number-box-margin-bottom: 6px;
$recurrence-radio-group-item-padding: 10px;
$recurrence-button-group-item-padding: 8px;

Expand Down Expand Up @@ -26,7 +26,11 @@ $recurrence-button-group-item-padding: 8px;
}

.dx-recurrence-numberbox-interval-label {
margin-top: $recurrence-interval-number-box-margin-top;
margin-bottom: $recurrence-interval-number-box-margin-bottom;
}

.dx-recurrence-numberbox-interval-wrapper .dx-box-item:last-child .dx-box-item-content {
justify-content: flex-end;
}

.dx-recurrence-radiogroup-repeat-type {
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-scss/scss/widgets/fluent/recurrenceEditor/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $fluent-recurrence-radio-group-margin: 15px;

.dx-recurrence-numberbox-interval-label {
font-size: $fluent-base-font-size;
margin-top: $fluent-recurrence-interval-number-box-margin-top;
margin-bottom: $fluent-recurrence-interval-number-box-margin-bottom;
}

.dx-recurrence-button-group {
Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-scss/scss/widgets/fluent/recurrenceEditor/_sizes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

$fluent-recurrence-until-date-box-top-margin: null !default;
$fluent-recurrence-count-number-box-top-margin: null !default;
$fluent-recurrence-interval-number-box-margin-top: null !default;
$fluent-recurrence-interval-number-box-margin-bottom: null !default;

@if $size == "default" {
$fluent-recurrence-until-date-box-top-margin: 60px !default;
$fluent-recurrence-count-number-box-top-margin: 102px !default;
$fluent-recurrence-interval-number-box-margin-top: 30px !default;
$fluent-recurrence-interval-number-box-margin-bottom: 6px !default;
}

@else if $size == "compact" {
$fluent-recurrence-until-date-box-top-margin: 46px !default;
$fluent-recurrence-count-number-box-top-margin: 78px !default;
$fluent-recurrence-interval-number-box-margin-top: 22px !default;
$fluent-recurrence-interval-number-box-margin-bottom: 4px !default;
}
2 changes: 1 addition & 1 deletion packages/devextreme-scss/scss/widgets/generic/recurrenceEditor/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $generic-recurrence-number-box-margin-right: 11px;
}

.dx-recurrence-numberbox-interval-label {
margin-top: $generic-recurrence-interval-number-box-margin-top;
margin-bottom: $generic-recurrence-interval-number-box-margin-bottom;
}

.dx-recurrence-datebox-until-date {
Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-scss/scss/widgets/generic/recurrenceEditor/_sizes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

$generic-recurrence-until-date-box-top-margin: null !default;
$generic-recurrence-count-number-box-top-margin: null !default;
$generic-recurrence-interval-number-box-margin-top: null !default;
$generic-recurrence-interval-number-box-margin-bottom: null !default;

@if $size == "default" {
$generic-recurrence-until-date-box-top-margin: 30px !default;
$generic-recurrence-count-number-box-top-margin: 66px !default;
$generic-recurrence-interval-number-box-margin-top: 31px !default;
$generic-recurrence-interval-number-box-margin-bottom: 8px !default;
}

@else if $size == "compact" {
$generic-recurrence-until-date-box-top-margin: 28px !default;
$generic-recurrence-count-number-box-top-margin: 56px !default;
$generic-recurrence-interval-number-box-margin-top: 23px !default;
$generic-recurrence-interval-number-box-margin-bottom: 6px !default;
}
2 changes: 1 addition & 1 deletion packages/devextreme-scss/scss/widgets/material/recurrenceEditor/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $material-recurrence-radio-group-margin: 15px;

.dx-recurrence-numberbox-interval-label {
font-size: $material-base-font-size;
margin-top: $material-recurrence-interval-number-box-margin-top;
margin-bottom: $material-recurrence-interval-number-box-margin-bottom;
}

.dx-recurrence-button-group {
Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-scss/scss/widgets/material/recurrenceEditor/_sizes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

$material-recurrence-until-date-box-top-margin: null !default;
$material-recurrence-count-number-box-top-margin: null !default;
$material-recurrence-interval-number-box-margin-top: null !default;
$material-recurrence-interval-number-box-margin-bottom: null !default;

@if $size == "default" {
$material-recurrence-until-date-box-top-margin: 60px !default;
$material-recurrence-count-number-box-top-margin: 100px !default;
$material-recurrence-interval-number-box-margin-top: 55px !default;
$material-recurrence-interval-number-box-margin-bottom: 10px !default;
}

@else if $size == "compact" {
$material-recurrence-until-date-box-top-margin: 50px !default;
$material-recurrence-count-number-box-top-margin: 82px !default;
$material-recurrence-interval-number-box-margin-top: 33px !default;
$material-recurrence-interval-number-box-margin-bottom: 8px !default;
}
4 changes: 2 additions & 2 deletions packages/devextreme/js/__internal/scheduler/m_recurrence_editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ const REPEAT_ON_EDITOR = 'dx-recurrence-repeat-on';
const DAY_OF_MONTH = 'dx-recurrence-numberbox-day-of-month';
const MONTH_OF_YEAR = 'dx-recurrence-selectbox-month-of-year';

const recurrentEditorNumberBoxWidth = 90;
const recurrentEditorNumberBoxWidth = 150;
const repeatInputWidth = '100%';
const recurrentEditorSelectBoxWidth = 120;
const recurrentEditorSelectBoxWidth = 150;
const defaultRecurrenceTypeIndex = 1; // default daily recurrence

const frequenciesMessages = [
Expand Down
91 changes: 86 additions & 5 deletions packages/devextreme/playground/jquery.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,94 @@ <h1 style="position: fixed; left: 0; top: 0; clip: rect(1px, 1px, 1px, 1px);">Te
<select id="theme-selector" style="display: block;">
</select>
<br />
<div id="button"></div>
<div id="scheduler"></div>
Copy link
Contributor

@Tucchhaa Tucchhaa Jan 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please remove changes from jquery.html

<script>
const data = [
{
text: 'Website Re-Design Plan',
startDate: new Date('2021-04-26T16:30:00.000Z'),
endDate: new Date('2021-04-26T18:30:00.000Z'),
}, {
text: 'Book Flights to San Fran for Sales Trip',
startDate: new Date('2021-04-26T19:00:00.000Z'),
endDate: new Date('2021-04-26T20:00:00.000Z'),
allDay: true,
}, {
text: 'Install New Router in Dev Room',
startDate: new Date('2021-04-26T21:30:00.000Z'),
endDate: new Date('2021-04-26T22:30:00.000Z'),
}, {
text: 'Approve Personal Computer Upgrade Plan',
startDate: new Date('2021-04-27T17:00:00.000Z'),
endDate: new Date('2021-04-27T18:00:00.000Z'),
}, {
text: 'Final Budget Review',
startDate: new Date('2021-04-27T19:00:00.000Z'),
endDate: new Date('2021-04-27T20:35:00.000Z'),
}, {
text: 'New Brochures',
startDate: new Date('2021-04-27T21:30:00.000Z'),
endDate: new Date('2021-04-27T22:45:00.000Z'),
}, {
text: 'Install New Database',
startDate: new Date('2021-04-28T16:45:00.000Z'),
endDate: new Date('2021-04-28T18:15:00.000Z'),
}, {
text: 'Approve New Online Marketing Strategy',
startDate: new Date('2021-04-28T19:00:00.000Z'),
endDate: new Date('2021-04-28T21:00:00.000Z'),
}, {
text: 'Upgrade Personal Computers',
startDate: new Date('2021-04-28T22:15:00.000Z'),
endDate: new Date('2021-04-28T23:30:00.000Z'),
}, {
text: 'Customer Workshop',
startDate: new Date('2021-04-29T18:00:00.000Z'),
endDate: new Date('2021-04-29T19:00:00.000Z'),
allDay: true,
}, {
text: 'Prepare 2021 Marketing Plan',
startDate: new Date('2021-04-29T18:00:00.000Z'),
endDate: new Date('2021-04-29T20:30:00.000Z'),
}, {
text: 'Brochure Design Review',
startDate: new Date('2021-04-29T21:00:00.000Z'),
endDate: new Date('2021-04-29T22:30:00.000Z'),
}, {
text: 'Create Icons for Website',
startDate: new Date('2021-04-30T17:00:00.000Z'),
endDate: new Date('2021-04-30T18:30:00.000Z'),
}, {
text: 'Upgrade Server Hardware',
startDate: new Date('2021-04-30T21:30:00.000Z'),
endDate: new Date('2021-04-30T23:00:00.000Z'),
}, {
text: 'Submit New Website Design',
startDate: new Date('2021-04-30T23:30:00.000Z'),
endDate: new Date('2021-05-01T01:00:00.000Z'),
}, {
text: 'Launch New Website',
startDate: new Date('2021-04-30T19:20:00.000Z'),
endDate: new Date('2021-04-30T21:00:00.000Z'),
},
];

$(() => {
$("#button").dxButton({
text: 'Click me!',
onClick: () => { alert("clicked"); }
});
// DevExpress.ui.dxForm.defaultOptions({
// options: {
// labelMode: 'static'
// }
// });

$('#scheduler').dxScheduler({
timeZone: 'America/Los_Angeles',
dataSource: data,
views: ['day', 'week', 'workWeek', 'month','timelineDay', 'timelineWeek', 'timelineWorkWeek', 'timelineMonth'],
currentView: 'day',
currentDate: new Date(2021, 3, 29),
startDayHour: 9,
height: 730,
});
});
</script>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceEditor.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ module('Interval editor', () => {
assert.equal(getIntervalEditor(instance).option('useLargeSpinButtons'), false, 'Interval editor has right useLargeSpinButtons');
assert.equal(getIntervalEditor(instance).option('min'), 1, 'Interval editor has right min value');
assert.equal(getIntervalEditor(instance).option('value'), 1, 'Interval editor hase right value');
assert.equal(getIntervalEditor(instance).option('width'), 90, 'Interval editor has right width');
assert.equal(getIntervalEditor(instance).option('width'), 150, 'Interval editor has right width');
Copy link
Contributor

@Tucchhaa Tucchhaa Jan 23, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest to add a test for the user's case with setting labelMode to static by default, if it's possible. What do you think?

});

test('Interval editor should have right css class', async function(assert) {
Expand Down
Loading