Skip to content

Commit

Permalink
Merge branch 'main' into multi-select-controlled
Browse files Browse the repository at this point in the history
  • Loading branch information
dakahn authored Dec 9, 2021
2 parents 6ae8427 + a69b00e commit 9674c32
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions packages/react/src/components/Slider/Slider.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';
import { settings } from 'carbon-components';
import throttle from 'lodash.throttle';
import * as FeatureFlags from '@carbon/feature-flags';

import * as keys from '../../internal/keyboard/keys';
import { matches } from '../../internal/keyboard/match';
Expand Down Expand Up @@ -168,7 +169,9 @@ export default class Slider extends PureComponent {
minLabel: '',
maxLabel: '',
inputType: 'number',
ariaLabelInput: 'Slider number input',
ariaLabelInput: FeatureFlags.enabled('enable-v11-release')
? undefined
: 'Slider number input',
light: false,
};

Expand Down Expand Up @@ -600,7 +603,10 @@ export default class Slider extends PureComponent {
? classNames(`${prefix}--form-item`, className)
: `${prefix}--form-item`
}>
<label htmlFor={id} className={labelClasses} id={labelId}>
<label
htmlFor={`${id}-input-for-slider`}
className={labelClasses}
id={labelId}>
{labelText}
</label>
<div className={`${prefix}--slider-container`}>
Expand Down Expand Up @@ -651,7 +657,7 @@ export default class Slider extends PureComponent {
name={name}
className={inputClasses}
value={value}
aria-label={ariaLabelInput}
aria-label={ariaLabelInput ? ariaLabelInput : null}
disabled={disabled}
required={required}
min={min}
Expand Down

0 comments on commit 9674c32

Please sign in to comment.