Skip to content

Scheduler - Refactor "Repeat End" group in recurrence form #31726

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
wants to merge 2 commits into
base: 25_2
Choose a base branch
from
+147 −299
Open

Scheduler - Refactor "Repeat End" group in recurrence form #31726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7097174
implement & test
Tucchhaa Nov 28, 2025
8c888be
upload etalons & fix css lint
Tucchhaa Nov 28, 2025
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 .../etalons/scheduler__appointment__recurrence-form__daily (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/scheduler__appointment__recurrence-form__hourly (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/scheduler__appointment__recurrence-form__mobile (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 ...talons/scheduler__appointment__recurrence-form__monthly (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 ...alons/scheduler__appointment__recurrence-form__readonly (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/scheduler__appointment__recurrence-form__weekly (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 removed ...uler__appointment__recurrence-form__weekly__mon-wed-fri (fluent.blue.light).png
View file
Open in desktop
Binary file not shown.
Binary file removed ..._appointment__recurrence-form__weekly__mon-wed-fri (fluent.blue.light)_mask.png
View file
Open in desktop
Binary file not shown.
Binary file modified ...ons/scheduler__appointment__recurrence-form__with-icons (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/scheduler__appointment__recurrence-form__yearly (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.
38 changes: 2 additions & 36 deletions e2e/testcafe-devextreme/tests/scheduler/common/appointmentForm/recurrence-form.visual.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const SCHEDULER_SELECTOR = '#container';
t,
takeScreenshot,
`scheduler__appointment__recurrence-form__${frequency.toLowerCase()}.png`,
{ element: appointmentPopup.recurrence.group },
{ element: appointmentPopup.contentElement },
);

await t
Expand All @@ -45,40 +45,6 @@ const SCHEDULER_SELECTOR = '#container';
}));
});

test('firstDayOfWeek is applied to recurrence form', async (t) => {
Copy link
Contributor Author

@Tucchhaa Tucchhaa Nov 27, 2025

Choose a reason for hiding this comment

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

Removed this test because firstDayOfWeek is already tested in jest

const { takeScreenshot, compareResults } = createScreenshotsComparer(t);

const appointment = {
text: 'Weekly Appointment',
startDate: new Date('2024-01-01T10:00:00'),
endDate: new Date('2024-01-01T11:00:00'),
};

const scheduler = new Scheduler(SCHEDULER_SELECTOR);
const appointmentPopup = await scheduler.openAppointmentPopup(t, appointment, false);

await appointmentPopup.openRecurrenceForm(t, 'Weekly');
await appointmentPopup.selectRecurrenceWeekDays(t, [0, 2, 4]);
await appointmentPopup.setRecurrenceEnd(t, 'count', 15);

await testScreenshot(
t,
takeScreenshot,
'scheduler__appointment__recurrence-form__weekly__mon-wed-fri.png',
{ element: appointmentPopup.recurrence.group },
);

await t
.expect(compareResults.isValid())
.ok(compareResults.errorMessages());
}).before(async () => createWidget('dxScheduler', {
dataSource: [],
views: ['week'],
currentView: 'week',
currentDate: new Date(2024, 0, 1),
firstDayOfWeek: 1,
}));

test('recurrence form with icons', async (t) => {
const appointment = {
text: 'Appointment',
Expand Down Expand Up @@ -135,7 +101,7 @@ test('recurrence form readonly state', async (t) => {
t,
takeScreenshot,
'scheduler__appointment__recurrence-form__readonly.png',
{ element: appointmentPopup.recurrence.group },
{ element: appointmentPopup.contentElement },
);

await t
Expand Down
90 changes: 17 additions & 73 deletions packages/devextreme-scss/scss/widgets/base/scheduler/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ $agenda-appointment-text-color: null !default;
$agenda-appointment-title-font-size: null !default;

$scheduler-header-panel-table-cell-height: null !default;
$scheduler-days-of-week-button-size: null !default;
$scheduler-recurrence-end-item-height: null !default;
$scheduler-appointment-popup-repeat-end-item-height: null !default;
$scheduler-appointment-popup-repeat-end-item-vertical-margin: null !default;

// Agenda
$agenda-appointment-recurrence-icon-color: null !default;
Expand Down Expand Up @@ -547,88 +547,32 @@ $scheduler-appointment-form-label-padding: 20px;
}
}

.dx-scheduler-form-recurrence-end-group .dx-item {
.dx-texteditor-input-container .dx-texteditor-input {
padding-inline-end: 0;
}
}

/* Recurrence End section - Grid layout with equal heights */
/* Recurrence End Group */
.dx-scheduler-form-recurrence-end-group {
.dx-field-item-label {
display: flex;
align-items: center;
}

> .dx-box-item {
height: 100%;
margin: 0;
padding: 0;
}
}

// RadioGroup and Inputs columns
.dx-scheduler-form-recurrence-end-editors {
.dx-field-item-content {
height: 100%;
padding: 0;
}

.dx-radiogroup {
padding: 0;
height: 100%;
height: $scheduler-appointment-popup-repeat-end-item-height;
line-height: $scheduler-appointment-popup-repeat-end-item-height;
}

.dx-item.dx-radiobutton {
margin: 8px 0 0 0;
padding: 0;
height: $scheduler-recurrence-end-item-height !important; // stylelint-disable-line declaration-no-important

&:first-child {
margin-top: 0;
}
}

.dx-radiogroup-item {
align-items: center;
}

.dx-box-item-content {
height: 100%;
padding: 0;
.dx-radiobutton {
height: $scheduler-appointment-popup-repeat-end-item-height !important; // stylelint-disable-line declaration-no-important
}

.dx-box-item {
height: $scheduler-recurrence-end-item-height;
margin: 0;
padding: 0;

&:not(:first-child) {
margin-top: 8px;
}

.dx-box-item-content {
height: $scheduler-recurrence-end-item-height;
padding: 0;
.dx-scheduler-form-recurrence-end-editors {
.dx-texteditor-input-container input.dx-texteditor-input {
padding-inline-end: 0;
}
}

.dx-field-item,
.dx-empty-item {
height: $scheduler-recurrence-end-item-height;
margin: 0;
padding: 0 !important; // stylelint-disable-line declaration-no-important
margin: calc($scheduler-appointment-popup-repeat-end-item-vertical-margin / 2) 0;

.dx-field-item-content {
padding: 0 !important; // stylelint-disable-line declaration-no-important
height: $scheduler-recurrence-end-item-height;
.dx-item {
.dx-field-item, .dx-field-empty-item {
padding: 0;
margin: calc($scheduler-appointment-popup-repeat-end-item-vertical-margin / 2) 0;
height: $scheduler-appointment-popup-repeat-end-item-height;
}
}
}

.dx-texteditor,
.dx-numberbox {
height: $scheduler-recurrence-end-item-height;
}
}

/* Repeat editor settings button */
Expand Down
15 changes: 4 additions & 11 deletions packages/devextreme-scss/scss/widgets/fluent/scheduler/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
@use "sizes" as *;
@use "../sizes" as *;
@use "../form/sizes" as *;
@use "../radioGroup/sizes" as *;
@use "../toolbar/sizes" as *;
@use '../../base/scheduler/layout/header' as *;
@use "../../base/mixins" as *;
Expand Down Expand Up @@ -43,8 +44,8 @@
$agenda-appointment-text-color: $agenda-appointment-text-color,
$agenda-appointment-title-font-size: $agenda-appointment-title-font-size,

$scheduler-days-of-week-button-size: $fluent-scheduler-days-of-week-button-size,
$scheduler-recurrence-end-item-height: $fluent-scheduler-recurrence-end-item-height
$scheduler-appointment-popup-repeat-end-item-height: $fluent-scheduler-appointment-popup-repeat-end-item-height,
$scheduler-appointment-popup-repeat-end-item-vertical-margin: $fluent-radio-button-vertical-margin
);
@use "../button/colors" as *;
@use "../button/mixins" as *;
Expand Down Expand Up @@ -716,17 +717,9 @@ $fluent-scheduler-agenda-time-panel-cell-padding: 8px;
margin-top: $fluent-scheduler-appointment-popup-description-icon-margin-top;
}

.dx-scheduler-form-group-with-icon.dx-scheduler-form-recurrence-end-group:has(.dx-scheduler-form-icon:not(.dx-hidden)) .dx-field-item-label {
height: $fluent-scheduler-appointment-popup-recurrence-end-group-label-height;
}

.dx-scheduler-form-recurrence-end-group .dx-field-item-label {
margin-bottom: $fluent-scheduler-appointment-popup-recurrence-end-group-label-margin-bottom;
}

.dx-scheduler-days-of-week-buttons {
height: $fluent-toolbar-height;
gap: $fluent-scheduler-days-of-week-buttons-gap;
gap: $fluent-scheduler-appointment-popup-days-of-week-buttons-gap;
}

.dx-field-item:not(.dx-first-col) {
Expand Down
21 changes: 6 additions & 15 deletions packages/devextreme-scss/scss/widgets/fluent/scheduler/_sizes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,8 @@ $fluent-scheduler-appointment-popup-icon-padding-right: null !default;
$fluent-scheduler-appointment-popup-description-icon-margin-top: null !default;
$fluent-scheduler-appointment-popup-item-padding-horizontal: null !default;
$fluent-scheduler-appointment-popup-all-day-item-height: null !default;
$fluent-scheduler-appointment-popup-recurrence-end-group-label-margin-bottom: null !default;
$fluent-scheduler-appointment-popup-recurrence-end-group-label-height: null !default;
$fluent-scheduler-days-of-week-button-size: null !default;
$fluent-scheduler-days-of-week-buttons-gap: null !default;
$fluent-scheduler-recurrence-end-item-height: null !default;
$fluent-scheduler-appointment-popup-days-of-week-buttons-gap: null !default;
$fluent-scheduler-appointment-popup-repeat-end-item-height: null !default;

$fluent-scheduler-appointment-short-content-padding: null !default;
$fluent-scheduler-appointment-15min-height: null !default;
Expand Down Expand Up @@ -130,11 +127,8 @@ $header-panel-time-cell-padding: null !default;
$fluent-scheduler-appointment-popup-description-icon-margin-top: 24px !default;
$fluent-scheduler-appointment-popup-item-padding-horizontal: 6px !default;
$fluent-scheduler-appointment-popup-all-day-item-height: 40px !default;
$fluent-scheduler-appointment-popup-recurrence-end-group-label-margin-bottom: 16px !default;
$fluent-scheduler-appointment-popup-recurrence-end-group-label-height: 32px !default;
$fluent-scheduler-days-of-week-button-size: 32px !default;
$fluent-scheduler-days-of-week-buttons-gap: 12px !default;
$fluent-scheduler-recurrence-end-item-height: 32px !default;
$fluent-scheduler-appointment-popup-days-of-week-buttons-gap: 12px !default;
$fluent-scheduler-appointment-popup-repeat-end-item-height: 32px !default;

$agenda-appointment-title-font-size: 14px;

Expand Down Expand Up @@ -198,11 +192,8 @@ $header-panel-time-cell-padding: null !default;
$fluent-scheduler-appointment-popup-description-icon-margin-top: 18px !default;
$fluent-scheduler-appointment-popup-item-padding-horizontal: 4px !default;
$fluent-scheduler-appointment-popup-all-day-item-height: 30px !default;
$fluent-scheduler-appointment-popup-recurrence-end-group-label-margin-bottom: 12px !default;
$fluent-scheduler-appointment-popup-recurrence-end-group-label-height: 24px !default;
$fluent-scheduler-days-of-week-button-size: 22px !default;
$fluent-scheduler-days-of-week-buttons-gap: 8px !default;
$fluent-scheduler-recurrence-end-item-height: 22px !default;
$fluent-scheduler-appointment-popup-days-of-week-buttons-gap: 8px !default;
$fluent-scheduler-appointment-popup-repeat-end-item-height: 24px !default;

$agenda-appointment-title-font-size: 13px;

Expand Down
51 changes: 11 additions & 40 deletions packages/devextreme-scss/scss/widgets/generic/scheduler/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
$agenda-appointment-text-color: $agenda-appointment-text-color,
$agenda-appointment-title-font-size: $agenda-appointment-title-font-size,

$scheduler-days-of-week-button-size: $generic-scheduler-days-of-week-button-size,
$scheduler-recurrence-end-item-height: $generic-scheduler-recurrence-end-item-height
$scheduler-appointment-popup-repeat-end-item-height: $generic-scheduler-appointment-popup-repeat-end-item-height,
$scheduler-appointment-popup-repeat-end-item-vertical-margin: $generic-scheduler-appointment-popup-repeat-end-radio-margin-top
);
@use "../button/colors" as *;
@use "../tooltip/colors" as *;
Expand Down Expand Up @@ -289,49 +289,20 @@ $generic-scheduler-agenda-group-header-padding: $generic-scheduler-agenda-time-c

.dx-scheduler-days-of-week-buttons {
height: $generic-toolbar-height;
gap: $generic-scheduler-days-of-week-buttons-gap;
gap: $generic-scheduler-appointment-popup-days-of-week-buttons-gap;

.dx-button {
width: $generic-scheduler-days-of-week-button-size;
height: $generic-scheduler-days-of-week-button-size;
min-width: $generic-scheduler-days-of-week-button-size;
min-height: $generic-scheduler-days-of-week-button-size;
width: $generic-scheduler-appointment-popup-days-of-week-button-size;
height: $generic-scheduler-appointment-popup-days-of-week-button-size;
min-width: $generic-scheduler-appointment-popup-days-of-week-button-size;
min-height: $generic-scheduler-appointment-popup-days-of-week-button-size;
}
}

.dx-scheduler-form-group-with-icon.dx-scheduler-form-recurrence-end-group:has(.dx-scheduler-form-icon:not(.dx-hidden)) .dx-field-item-label {
height: $generic-scheduler-appointment-popup-recurrence-end-group-label-height;
}

.dx-scheduler-form-recurrence-end-group .dx-field-item-label {
margin-bottom: $generic-scheduler-appointment-popup-recurrence-end-group-label-margin-bottom;
}

.dx-scheduler-form-recurrence-end-editors {
.dx-item.dx-radiobutton {
height: $generic-scheduler-appointment-popup-recurrence-end-editors-item-height !important; // stylelint-disable-line declaration-no-important
}

.dx-box-item {
height: $generic-scheduler-appointment-popup-recurrence-end-editors-item-height;

.dx-box-item-content {
height: $generic-scheduler-appointment-popup-recurrence-end-editors-item-height;
}
}

.dx-field-item,
.dx-empty-item {
height: $generic-scheduler-appointment-popup-recurrence-end-editors-item-height;

.dx-field-item-content {
height: $generic-scheduler-appointment-popup-recurrence-end-editors-item-height;
}
}

.dx-texteditor,
.dx-numberbox {
height: $generic-scheduler-appointment-popup-recurrence-end-editors-item-height;
.dx-scheduler-form-recurrence-end-group .dx-radiogroup.dx-widget {
.dx-radiobutton {
margin-top: $generic-scheduler-appointment-popup-repeat-end-radio-margin-top;
margin-bottom: 0;
}
}

Expand Down
32 changes: 13 additions & 19 deletions packages/devextreme-scss/scss/widgets/generic/scheduler/_sizes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,10 @@ $generic-scheduler-appointment-popup-description-icon-margin-top: null !default;
$generic-scheduler-appointment-popup-item-padding-horizontal: null !default;
$generic-scheduler-appointment-popup-item-padding-top: null !default;
$generic-scheduler-appointment-popup-all-day-item-height: null !default;
$generic-scheduler-appointment-popup-recurrence-end-group-label-margin-bottom: null !default;
$generic-scheduler-appointment-popup-recurrence-end-editors-item-height: null !default;
$generic-scheduler-appointment-popup-recurrence-end-group-label-height: null !default;
$generic-scheduler-days-of-week-button-size: null !default;
$generic-scheduler-days-of-week-buttons-gap: null !default;
$generic-scheduler-recurrence-end-item-height: null !default;
$generic-scheduler-appointment-popup-days-of-week-button-size: null !default;
$generic-scheduler-appointment-popup-days-of-week-buttons-gap: null !default;
$generic-scheduler-appointment-popup-repeat-end-radio-margin-top: null !default;
$generic-scheduler-appointment-popup-repeat-end-item-height: null !default;

$generic-scheduler-appointment-short-content-padding: null !default;
$generic-scheduler-appointment-10min-height: null !default;
Expand Down Expand Up @@ -104,12 +102,10 @@ $generic-scheduler-group-header-agenda-font-size: 14px !default;
$generic-scheduler-appointment-popup-item-padding-horizontal: 5px !default;
$generic-scheduler-appointment-popup-item-padding-top: 20px !default;
$generic-scheduler-appointment-popup-all-day-item-height: 36px !default;
$generic-scheduler-appointment-popup-recurrence-end-group-label-margin-bottom: 12px !default;
$generic-scheduler-appointment-popup-recurrence-end-editors-item-height: 36px !default;
$generic-scheduler-appointment-popup-recurrence-end-group-label-height: 36px !default;
$generic-scheduler-days-of-week-button-size: 32px !default;
$generic-scheduler-days-of-week-buttons-gap: 10px !default;
$generic-scheduler-recurrence-end-item-height: 32px !default;
$generic-scheduler-appointment-popup-repeat-end-radio-margin-top: 10px !default;
$generic-scheduler-appointment-popup-days-of-week-button-size: 32px !default;
$generic-scheduler-appointment-popup-days-of-week-buttons-gap: 10px !default;
$generic-scheduler-appointment-popup-repeat-end-item-height: 36px !default;

$agenda-appointment-title-font-size: 16px;

Expand Down Expand Up @@ -168,18 +164,16 @@ $generic-scheduler-group-header-agenda-font-size: 14px !default;
$generic-scheduler-appointment-popup-toolbar-height: 39px !default;
$generic-scheduler-appointment-popup-toolbar-label-size: 18px !default;
$generic-scheduler-appointment-popup-icon-size: 14px !default;
$generic-scheduler-appointment-popup-icon-container-height: 24px !default;
$generic-scheduler-appointment-popup-icon-container-height: 26px !default;
$generic-scheduler-appointment-popup-icon-padding-right: 5px !default;
$generic-scheduler-appointment-popup-description-icon-margin-top: 18px !default;
$generic-scheduler-appointment-popup-item-padding-horizontal: 5px !default;
$generic-scheduler-appointment-popup-item-padding-top: 10px !default;
$generic-scheduler-appointment-popup-all-day-item-height: 24px !default;
$generic-scheduler-appointment-popup-recurrence-end-group-label-margin-bottom: 8px !default;
$generic-scheduler-appointment-popup-recurrence-end-editors-item-height: 26px !default;
$generic-scheduler-appointment-popup-recurrence-end-group-label-height: 24px !default;
$generic-scheduler-days-of-week-button-size: 24px !default;
$generic-scheduler-days-of-week-buttons-gap: 6px !default;
$generic-scheduler-recurrence-end-item-height: 32px !default;
$generic-scheduler-appointment-popup-repeat-end-radio-margin-top: 6px !default;
$generic-scheduler-appointment-popup-days-of-week-button-size: 24px !default;
$generic-scheduler-appointment-popup-days-of-week-buttons-gap: 6px !default;
$generic-scheduler-appointment-popup-repeat-end-item-height: 26px !default;

$agenda-appointment-title-font-size: 16px;

Expand Down
Loading
Loading