Skip to content

Scheduler: fix keyboard navigation in appointment form #32215

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

Draft
sjbur wants to merge 2 commits into
base: 26_1
Choose a base branch
from
+23 −8
Draft

Scheduler: fix keyboard navigation in appointment form #32215

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
79721ea
css: add focus state to settings button in appointment form
sjbur Jan 15, 2026
4067781
fix: fix accessability bugs
sjbur Jan 15, 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
14 changes: 12 additions & 2 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 @@ -39,6 +39,8 @@ $scheduler-appointment-popup-repeat-end-item-vertical-margin: null !default;
// Agenda
$agenda-appointment-recurrence-icon-color: null !default;

$button-normal-text-active-bg: null !default;

@use "./layout/header" as *;
@use "./mixins" as *;
@use "../mixins" as *;
Expand Down Expand Up @@ -477,27 +479,31 @@ $scheduler-appointment-form-label-padding: 20px;

.dx-scheduler-form-main-group {
width: 100%;
transition: transform 0.3s ease-in-out;
transition: all 0.3s ease-in-out;
transform: translateX(0);
position: relative;

&.dx-scheduler-form-main-group-hidden {
transform: translateX(-110%);
position: absolute;
top: 0;
visibility: hidden;
opacity: 0;
}
}

.dx-scheduler-form-recurrence-group {
width: 100%;
transition: transform 0.3s ease-in-out;
transition: all 0.3s ease-in-out;
transform: translateX(0);
position: relative;

&.dx-scheduler-form-recurrence-group-hidden {
transform: translateX(110%);
position: absolute;
top: 0;
visibility: hidden;
opacity: 0;
}
}

Expand Down Expand Up @@ -582,6 +588,10 @@ $scheduler-appointment-form-label-padding: 20px;
.dx-icon {
color: $scheduler-workspace-accent-color;
}

&.dx-state-focused {
background-color: $button-normal-text-active-bg;
}
}

.dx-scheduler-form-repeat-editor .dx-selectbox.dx-state-readonly .dx-scheduler-form-recurrence-settings-button {
Expand Down
4 changes: 3 additions & 1 deletion 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 @@ -10,6 +10,7 @@
@use '../../base/scheduler/layout/header' as *;
@use "../../base/mixins" as *;
@use "../../base/icon_fonts" as *;
@use "../button/colors" as *;
@use "../../base/scheduler" as baseScheduler with (
$scheduler-tooltip-appointment-text-color: $scheduler-tooltip-appointment-text-color,
$scheduler-appointment-overlay-bg: $scheduler-appointment-overlay-bg,
Expand Down Expand Up @@ -46,7 +47,8 @@

$scheduler-appointment-popup-icon-margin-top: $fluent-scheduler-appointment-popup-icon-margin-top,
$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
$scheduler-appointment-popup-repeat-end-item-vertical-margin: $fluent-radio-button-vertical-margin,
$button-normal-text-active-bg: $button-normal-text-active-bg
);
@use "../button/colors" as *;
@use "../button/mixins" as *;
Expand Down
5 changes: 3 additions & 2 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 @@ -8,6 +8,7 @@
@use '../../base/scheduler/layout/header' as *;
@use "../../base/mixins" as *;
@use "../../base/icon_fonts" as *;
@use "../button/colors" as *;
@use "../../base/scheduler" as baseScheduler with (
$scheduler-tooltip-appointment-text-color: $scheduler-tooltip-appointment-text-color,
$scheduler-appointment-overlay-bg: $scheduler-appointment-overlay-bg,
Expand Down Expand Up @@ -43,9 +44,9 @@

$scheduler-appointment-popup-icon-margin-top: $generic-scheduler-appointment-popup-icon-margin-top,
$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
$scheduler-appointment-popup-repeat-end-item-vertical-margin: $generic-scheduler-appointment-popup-repeat-end-radio-margin-top,
$button-normal-text-active-bg: $button-normal-text-bg-active
);
@use "../button/colors" as *;
@use "../tooltip/colors" as *;
@use "../typography/sizes" as *;

Expand Down
5 changes: 3 additions & 2 deletions packages/devextreme-scss/scss/widgets/material/scheduler/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
@use '../../base/scheduler/layout/header' as *;
@use "../../base/mixins" as *;
@use "../../base/icon_fonts" as *;
@use "../button/colors" as *;
@use "../../base/scheduler" as baseScheduler with (
$scheduler-tooltip-appointment-text-color: $scheduler-tooltip-appointment-text-color,
$scheduler-appointment-overlay-bg: $scheduler-appointment-overlay-bg,
Expand Down Expand Up @@ -44,9 +45,9 @@

$scheduler-appointment-popup-icon-margin-top: $material-scheduler-appointment-popup-icon-margin-top,
$scheduler-appointment-popup-repeat-end-item-height: $material-scheduler-appointment-popup-repeat-end-item-height,
$scheduler-appointment-popup-repeat-end-item-vertical-margin: $material-radio-button-vertical-margin
$scheduler-appointment-popup-repeat-end-item-vertical-margin: $material-radio-button-vertical-margin,
$button-normal-text-active-bg: $button-normal-text-active-bg
);
@use "../button/colors" as *;
@use "../button/mixins" as *;
@use "../tooltip/colors" as *;

Expand Down
3 changes: 2 additions & 1 deletion packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { TextEditorButton } from '@js/common';
import { name as CLICK_EVENT_NAME } from '@js/common/core/events/click';
import messageLocalization from '@js/common/core/localization/message';
import { DataSource } from '@js/common/data';
import type { dxElementWrapper } from '@js/core/renderer';
Expand Down Expand Up @@ -677,7 +678,7 @@ export class AppointmentForm {
this.dxForm.updateData(recurrenceRuleExpr, recurrenceRule.toString());
}

if (e.value !== repeatNeverValue && e.event) {
if (e.value !== repeatNeverValue && e.event?.type === CLICK_EVENT_NAME) {
this.showRecurrenceGroup();
}

Expand Down
Loading