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
10 changes: 10 additions & 0 deletions apps/website/screens/components/slider/code/SliderCodePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,16 @@ const sections = [
<td>Reference to the component.</td>
<td>-</td>
</tr>
<tr>
<td>ariaLabel</td>
<td>
<TableCode>string</TableCode>
</td>
<td>
Specifies a string to be used as the name for the slider element when no <Code>label</Code> is provided.
</td>
<td>'Slider'</td>
</tr>
</tbody>
</DxcTable>
),
Expand Down
9 changes: 9 additions & 0 deletions packages/lib/src/slider/Slider.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ describe("Slider component tests", () => {
const sliderId = getByText("label").getAttribute("id");
expect(getByRole("slider").getAttribute("aria-labelledby")).toBe(sliderId);
expect(getByRole("slider").getAttribute("aria-orientation")).toBe("horizontal");
expect(getByRole("slider").getAttribute("aria-label")).toBeNull();
});

test("Renders with correct error aria label", () => {
const { getByRole } = render(
<DxcSlider ariaLabel="Example aria label" minValue={0} maxValue={100} showLimitsValues />
);
const slider = getByRole("slider");
expect(slider.getAttribute("aria-label")).toBe("Example aria label");
});

test("Slider renders with correct initial value when it is uncontrolled", () => {
Expand Down
12 changes: 8 additions & 4 deletions packages/lib/src/slider/Slider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ const DxcSlider = forwardRef<RefType, SliderPropsType>(
labelFormatCallback,
margin,
size = "fillParent",
ariaLabel = "Slider",
},
ref
): JSX.Element => {
Expand Down Expand Up @@ -319,9 +320,11 @@ const DxcSlider = forwardRef<RefType, SliderPropsType>(
return (
<ThemeProvider theme={colorsTheme.slider}>
<Container margin={margin} size={size} ref={ref}>
<Label id={labelId} disabled={disabled}>
{label}
</Label>
{label && (
<Label id={labelId} disabled={disabled}>
{label}
</Label>
)}
<HelperText disabled={disabled}>{helperText}</HelperText>
<SliderContainer>
{showLimitsValues && <MinLabelContainer disabled={disabled}>{minLabel}</MinLabelContainer>}
Expand All @@ -334,11 +337,12 @@ const DxcSlider = forwardRef<RefType, SliderPropsType>(
max={maxValue}
step={step}
disabled={disabled}
aria-labelledby={labelId}
aria-labelledby={label ? labelId : undefined}
aria-orientation="horizontal"
aria-valuemax={maxValue}
aria-valuemin={minValue}
aria-valuenow={value != null && value >= 0 ? value : innerValue}
aria-label={label ? undefined : ariaLabel}
onChange={handleSliderChange}
onMouseUp={handleSliderOnChangeCommitted}
onMouseDown={handleSliderDragging}
Expand Down
4 changes: 4 additions & 0 deletions packages/lib/src/slider/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ type Props = {
* Size of the component.
*/
size?: "medium" | "large" | "fillParent";
/**
* Specifies a string to be used as the name for the slider element when no `label` is provided.
*/
ariaLabel?: string;
};

/**
Expand Down
Loading