fix: add disabled label styles (#2159)

* fix(DatePickerInput): add disabled label styles * fix(TimePicker): add disabled label styles
carbon-design-system · Apr 4, 2019 · fe9fd41 · fe9fd41
1 parent 4cb0509
commit fe9fd41
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/components/DatePickerInput/DatePickerInput.js b/src/components/DatePickerInput/DatePickerInput.js
@@ -42,6 +42,7 @@ export default class DatePickerInput extends Component {
     const {
       id,
       labelText,
+      disabled,
       invalid,
       invalidText,
       hideLabel,
@@ -59,12 +60,12 @@ export default class DatePickerInput extends Component {
     const datePickerInputProps = {
       id,
       onChange: evt => {
-        if (!other.disabled) {
+        if (!disabled) {
           onChange(evt);
         }
       },
       onClick: evt => {
-        if (!other.disabled) {
+        if (!disabled) {
           onClick(evt);
         }
       },
@@ -75,6 +76,7 @@ export default class DatePickerInput extends Component {
 
     const labelClasses = classNames(`${prefix}--label`, {
       [`${prefix}--visually-hidden`]: hideLabel,
+      [`${prefix}--label--disabled`]: disabled,
     });
 
     const datePickerIcon = (() => {
@@ -124,6 +126,7 @@ export default class DatePickerInput extends Component {
       <input
         {...other}
         {...datePickerInputProps}
+        disabled={disabled}
         ref={input => {
           this.input = input;
         }}
@@ -137,6 +140,7 @@ export default class DatePickerInput extends Component {
         }}
         {...other}
         {...datePickerInputProps}
+        disabled={disabled}
         className={`${prefix}--date-picker__input`}
       />
     );

diff --git a/src/components/TimePicker/TimePicker.js b/src/components/TimePicker/TimePicker.js
@@ -191,6 +191,7 @@ export default class TimePicker extends Component {
 
     const labelClasses = classNames(`${prefix}--label`, {
       [`${prefix}--visually-hidden`]: hideLabel,
+      [`${prefix}--label--disabled`]: other.disabled,
     });
 
     const label = labelText ? (