Skip to content

[Slider] Fix focus after click #20651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oliviertassinari merged 4 commits into from
Apr 20, 2020
Merged

[Slider] Fix focus after click #20651

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd642c4
[Slider] Fix keyboard interaction with marks variant
davidcalhoun Apr 19, 2020
c059d55
[Slider] tweak test naming
davidcalhoun Apr 19, 2020
0d621b5
[Slider] linting: run prettier
davidcalhoun Apr 19, 2020
82a05e6
test sould be failign without the patch
oliviertassinari Apr 19, 2020
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
2 changes: 1 addition & 1 deletion packages/material-ui/src/Slider/Slider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function focusThumb({ sliderRef, activeIndex, setActive }) {
!sliderRef.current.contains(document.activeElement) ||
Number(document.activeElement.getAttribute('data-index')) !== activeIndex
) {
sliderRef.current.querySelector(`[data-index="${activeIndex}"]`).focus();
sliderRef.current.querySelector(`[role="slider"][data-index="${activeIndex}"]`).focus();
}

if (setActive) {
Expand Down
22 changes: 22 additions & 0 deletions packages/material-ui/src/Slider/Slider.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,28 @@ describe('<Slider />', () => {
expect(thumb2.getAttribute('aria-valuenow')).to.equal('29');
});

it('should support keyboard with marks variant', () => {
const { getAllByRole } = render(
<Slider defaultValue={30} step={10} marks min={10} max={110} />,
);
const [thumb] = getAllByRole('slider');

thumb.focus();
fireEvent.keyDown(document.activeElement, {
key: 'ArrowRight',
});
expect(thumb.getAttribute('aria-valuenow')).to.equal('40');

thumb.focus();
fireEvent.keyDown(document.activeElement, {
key: 'ArrowLeft',
});
fireEvent.keyDown(document.activeElement, {
key: 'ArrowLeft',
});
expect(thumb.getAttribute('aria-valuenow')).to.equal('20');
});

it('should support mouse events', () => {
const handleChange = spy();
const { container } = render(<Slider defaultValue={[20, 30]} onChange={handleChange} />);
Expand Down