Skip to content

accessibility: Keep focus in calendar when changing views #943

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
epignosisx wants to merge 1 commit into
base: main
Choose a base branch
from
Open

accessibility: Keep focus in calendar when changing views #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions packages/react-calendar/src/Calendar.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,9 @@ describe('Calendar', () => {
'.react-calendar__navigation__label',
) as HTMLButtonElement;

expect(document.activeElement).toBe(
container.querySelector('.react-calendar__viewContainer'),
);
expect(label).toHaveAccessibleName('2011 – 2020');
});

Expand Down
14 changes: 13 additions & 1 deletion packages/react-calendar/src/Calendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';

import { forwardRef, useCallback, useImperativeHandle, useState } from 'react';
import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react';
import clsx from 'clsx';

import Navigation from './Calendar/Navigation.js';
Expand Down Expand Up @@ -669,6 +669,8 @@ const Calendar = forwardRef(function Calendar(props: CalendarProps, ref) {
: null,
);
const [viewState, setViewState] = useState<View | undefined>(defaultView);
const contentRef = useRef<HTMLDivElement | null>(null);
const setContentFocus = useRef(false);

const activeStartDate =
activeStartDateProps ||
Expand Down Expand Up @@ -800,6 +802,7 @@ const Calendar = forwardRef(function Calendar(props: CalendarProps, ref) {

setActiveStartDateState(nextActiveStartDate);
setViewState(nextView);
setContentFocus.current = true;

const args: OnArgs = {
action: 'drillDown',
Expand Down Expand Up @@ -1003,6 +1006,13 @@ const Calendar = forwardRef(function Calendar(props: CalendarProps, ref) {
[activeStartDate, drillDown, drillUp, onChange, setActiveStartDate, value, view],
);

useEffect(() => {
if (setContentFocus.current) {
setContentFocus.current = false;
contentRef.current?.focus();
}
});

function renderContent(next?: boolean) {
const currentActiveStartDate = next
? getBeginNext(view, activeStartDate)
Expand Down Expand Up @@ -1125,6 +1135,8 @@ const Calendar = forwardRef(function Calendar(props: CalendarProps, ref) {
className={`${baseClassName}__viewContainer`}
onBlur={selectRange ? onMouseLeave : undefined}
onMouseLeave={selectRange ? onMouseLeave : undefined}
tabIndex={-1}
ref={contentRef}
>
{renderContent()}
{showDoubleView ? renderContent(true) : null}
Expand Down