Merge pull request #4732 from ryantanrk/fix/disabled-month-kb

fix: invalid time error when selecting excluded month with keyboard
Hacker0x01 · Apr 26, 2024 · 0cb6f84 · 0cb6f84
2 parents 69a8ea6 + 7f9fb19
commit 0cb6f84
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/src/month.jsx b/src/month.jsx
@@ -52,7 +52,7 @@ function getMonthColumnsLayout(
  return MONTH_COLUMNS_LAYOUT.THREE_COLUMNS;
 }
 
-export default class Month extends React.Component {
+class Month extends React.Component {
  static propTypes = {
  ariaLabelPrefix: PropTypes.string,
  chooseDayAriaLabelPrefix: PropTypes.string,
@@ -455,8 +455,10 @@ export default class Month extends React.Component {
  const monthsGrid = MONTH_COLUMNS[monthColumnsLayout].grid;
  switch (eventKey) {
  case "Enter":
- this.onMonthClick(event, month);
- setPreSelection(selected);
+ if (!this.isMonthDisabled(month)) {
+ this.onMonthClick(event, month);
+ setPreSelection(selected);
+ }
  break;
  case "ArrowRight":
  this.handleMonthNavigation(
@@ -839,3 +841,5 @@ export default class Month extends React.Component {
  );
  }
 }
+
+export default Month;
diff --git a/test/month_test.test.js b/test/month_test.test.js
@@ -1940,6 +1940,28 @@ describe("Month", () => {
  );
  });
 
+ it("should prevent selection of disabled month", () => {
+ const excludeDates = [utils.newDate("2015-08-01")];
+ let selected = utils.newDate("2015-07-01");
+ let day = utils.newDate("2015-08-01");
+
+ const monthComponent = renderMonth({
+ selected: selected,
+ day: day,
+ month: 7,
+ preSelection: excludeDates[0],
+ setPreSelection: () => {},
+ excludeDates: excludeDates,
+ });
+
+ fireEvent.keyDown(
+ monthComponent.querySelector(".react-datepicker__month-7"),
+ getKey("Enter"),
+ );
+
+ expect(selected).not.toBe(excludeDates[0]);
+ });
+
  it("should prevent navigation", () => {
  let preSelected = utils.newDate("2015-08-01");
  const setPreSelection = (param) => {