Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,7 @@ export default class DatePicker extends Component<
if (eventKey === KeyType.Escape) {
event.preventDefault();
this.sendFocusBackToInput();
this.setOpen(false);
}
};

Expand Down
35 changes: 35 additions & 0 deletions src/test/datepicker_test.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4387,4 +4387,39 @@ describe("DatePicker", () => {
expect(input.value).toBe(DATE_VALUE);
});
});

describe("Close on ESC Key", () => {
it("should close DatePicker on ESC key press", () => {
const { container } = render(<DatePicker />);
const input = safeQuerySelector(container, "input");

fireEvent.click(input);
const calendar = safeQuerySelector(container, ".react-datepicker");

fireEvent.keyDown(calendar, getKey(KeyType.Escape));

const calendarAfterEsc = container.querySelector(".react-datepicker");
expect(calendarAfterEsc).toBeFalsy();
});

it("should close DatePicker on ESC key press - even when the focus is at Calendar header buttons", () => {
const { container } = render(<DatePicker />);
const input = safeQuerySelector(container, "input");

fireEvent.click(input);
const calendar = safeQuerySelector(container, ".react-datepicker");
const nextMontButton = safeQuerySelector(
calendar,
"button.react-datepicker__navigation--next",
);

fireEvent.click(nextMontButton);
fireEvent.click(nextMontButton);

fireEvent.keyDown(nextMontButton, getKey(KeyType.Escape));

const calendarAfterEsc = container.querySelector(".react-datepicker");
expect(calendarAfterEsc).toBeFalsy();
});
});
});
Loading