Merge pull request #4392 from Rafatcb/disable-clear-button

Disable clear button when the component is disabled
Hacker0x01 · Nov 26, 2023 · a92d5e7 · a92d5e7
2 parents 13c1136 + d857179
commit a92d5e7
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 15 deletions.
diff --git a/src/index.jsx b/src/index.jsx
@@ -360,10 +360,10 @@ export default class DatePicker extends React.Component {
     this.props.openToDate
       ? this.props.openToDate
       : this.props.selectsEnd && this.props.startDate
-      ? this.props.startDate
-      : this.props.selectsStart && this.props.endDate
-      ? this.props.endDate
-      : newDate();
+        ? this.props.startDate
+        : this.props.selectsStart && this.props.endDate
+          ? this.props.endDate
+          : newDate();
 
   // Convert the date from string format to standard Date format
   modifyHolidays = () =>
@@ -384,8 +384,8 @@ export default class DatePicker extends React.Component {
       minDate && isBefore(defaultPreSelection, startOfDay(minDate))
         ? minDate
         : maxDate && isAfter(defaultPreSelection, endOfDay(maxDate))
-        ? maxDate
-        : defaultPreSelection;
+          ? maxDate
+          : defaultPreSelection;
     return {
       open: this.props.startOpen || false,
       preventFocus: false,
@@ -1175,14 +1175,14 @@ export default class DatePicker extends React.Component {
       typeof this.props.value === "string"
         ? this.props.value
         : typeof this.state.inputValue === "string"
-        ? this.state.inputValue
-        : this.props.selectsRange
-        ? safeDateRangeFormat(
-            this.props.startDate,
-            this.props.endDate,
-            this.props,
-          )
-        : safeDateFormat(this.props.selected, this.props);
+          ? this.state.inputValue
+          : this.props.selectsRange
+            ? safeDateRangeFormat(
+                this.props.startDate,
+                this.props.endDate,
+                this.props,
+              )
+            : safeDateFormat(this.props.selected, this.props);
 
     return React.cloneElement(customInput, {
       [customInputRef]: (input) => {
@@ -1216,6 +1216,7 @@ export default class DatePicker extends React.Component {
   renderClearButton = () => {
     const {
       isClearable,
+      disabled,
       selected,
       startDate,
       endDate,
@@ -1230,7 +1231,12 @@ export default class DatePicker extends React.Component {
       return (
         <button
           type="button"
-          className={`react-datepicker__close-icon ${clearButtonClassName}`.trim()}
+          className={classnames(
+            "react-datepicker__close-icon",
+            clearButtonClassName,
+            { "react-datepicker__close-icon--disabled": disabled },
+          )}
+          disabled={disabled}
           aria-label={ariaLabelClose}
           onClick={this.onClearClick}
           title={clearButtonTitle}

diff --git a/src/stylesheets/datepicker.scss b/src/stylesheets/datepicker.scss
@@ -663,6 +663,15 @@
     vertical-align: middle;
     content: "\00d7";
   }
+
+  &--disabled {
+    cursor: default;
+
+    &::after {
+      cursor: default;
+      background-color: $datepicker__muted-color;
+    }
+  }
 }
 
 .react-datepicker__today-button {

diff --git a/test/datepicker_test.test.js b/test/datepicker_test.test.js
@@ -500,6 +500,23 @@ describe("DatePicker", () => {
     expect(datePicker.state.inputValue).toBeNull();
   });
 
+  it("should disable the clear button when the component is disabled", () => {
+    const onChange = jest.fn();
+    const { getByLabelText } = render(
+      <DatePicker
+        ariaLabelClose="clear"
+        disabled
+        selected={utils.newDate("2023-11-25")}
+        isClearable
+        onChange={onChange}
+      />,
+    );
+    const clearButton = getByLabelText("clear");
+    expect(clearButton).toHaveProperty("disabled", true);
+    fireEvent.click(clearButton);
+    expect(onChange).not.toHaveBeenCalled();
+  });
+
   it("should return focus to input when clear button is used", (done) => {
     var div = document.createElement("div");
     document.body.appendChild(div);