Skip to content
Open
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
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import { ReactElement, useRef } from "react";
import { ReactElement, useMemo, useRef } from "react";
import { SliderContainerProps } from "../../typings/SliderProps";

import { createHandleRender } from "../utils/createHandleRender";
import { getStyleProp, isVertical, maxProp, minProp, stepProp } from "../utils/prop-utils";
import { useMarks } from "../utils/useMarks";
import { useNumber } from "../utils/useNumber";
import { getSliderLabel } from "../utils/helpers";
import { useOnChangeDebounced } from "../utils/useOnChangeDebounced";

import { Slider as SliderComponent } from "./Slider";

export function Container(props: SliderContainerProps): ReactElement {
Expand Down Expand Up @@ -43,6 +46,10 @@ function InnerContainer(props: InnerContainerProps): ReactElement {
min: props.min,
max: props.max
});
// Label generated by systemProperty has the format: {widgetId}-label
const ariaLabelledByForHandle = `${props.id}-label`;
const sliderLabel = getSliderLabel(props.id);
const hasLabel = useMemo(() => Boolean(sliderLabel), [sliderLabel]);

return (
<SliderComponent
Expand All @@ -59,6 +66,7 @@ function InnerContainer(props: InnerContainerProps): ReactElement {
step={props.step}
onChange={onChange}
marks={marks}
ariaLabelledByForHandle={hasLabel ? ariaLabelledByForHandle : undefined}
handleRender={handleRender}
ref={sliderRef}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ describe("Slider", () => {
const defaultSliderProps: SliderProps = {
min: -100,
max: 100,
step: 10
step: 10,
ariaLabelledByForHandle: "test-slider"
};

function renderSlider(props?: Partial<SliderProps>): ReturnType<typeof render> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ exports[`Slider renders horizontal Slider correctly 1`] = `
/>
<div
aria-disabled="false"
aria-labelledby="test-slider"
aria-orientation="horizontal"
aria-valuemax="100"
aria-valuemin="-100"
Expand Down Expand Up @@ -75,6 +76,7 @@ exports[`Slider renders markers correctly 1`] = `
</div>
<div
aria-disabled="false"
aria-labelledby="test-slider"
aria-orientation="horizontal"
aria-valuemax="100"
aria-valuemin="-100"
Expand Down Expand Up @@ -143,6 +145,7 @@ exports[`Slider renders vertical Slider correctly 1`] = `
/>
<div
aria-disabled="false"
aria-labelledby="test-slider"
aria-orientation="vertical"
aria-valuemax="100"
aria-valuemin="-100"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const getSliderLabel = (sliderId: string): Element | null => document.querySelector(`label[for="${sliderId}"]`);