Skip to content
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

fix(datepicker): focus trap in FireFox #17969

Merged
merged 5 commits into from
Nov 6, 2024
Merged

fix(datepicker): focus trap in FireFox #17969

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac68abb
fix(datepicker): focus trap in FireFox
2nikhiltom Nov 5, 2024
2c64af3
Merge branch 'main' into 17663_datepicker_focus
2nikhiltom Nov 5, 2024
057423e
Merge branch 'main' into 17663_datepicker_focus
2nikhiltom Nov 5, 2024
8973952
Merge branch 'main' into 17663_datepicker_focus
2nikhiltom Nov 5, 2024
2f551e0
Merge branch 'main' into 17663_datepicker_focus
2nikhiltom Nov 6, 2024
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
8 changes: 0 additions & 8 deletions packages/react/src/components/DatePicker/DatePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,9 +880,6 @@ const DatePicker = React.forwardRef(function DatePicker(
const closeCalendar = (event) => {
calendarRef.current.close();
// Remove focus from endDate calendar input
if (document.activeElement instanceof HTMLElement) {
document.activeElement.blur();
}
onCalendarClose(
calendarRef.current.selectedDates,
'',
Expand Down Expand Up @@ -918,12 +915,7 @@ const DatePicker = React.forwardRef(function DatePicker(
document.activeElement === endInputField.current &&
calendarRef.current.isOpen
) {
event.preventDefault();
calendarRef.current.close();
// Remove focus from endDate calendar input
document.activeElement instanceof HTMLElement && // this is to fix the TS warning
document?.activeElement?.blur();

onCalendarClose(
calendarRef.current.selectedDates,
'',
Expand Down
Loading