Skip to content
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

Jump to bottom

[Slider] Improve RTL support #20851

Merged
merged 4 commits into from
May 2, 2020
Merged

[Slider] Improve RTL support #20851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
daa9795
Add test case
Apr 29, 2020
8fd2b89
[Slider] Handle RTL on keyboard
Apr 30, 2020
d169f16
increaseKey and decreaseKey
Apr 30, 2020
6b5bf53
remove dead logic
oliviertassinari May 2, 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
10 changes: 7 additions & 3 deletions packages/material-ui/src/Slider/Slider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,13 +425,17 @@ const Slider = React.forwardRef(function Slider(props, ref) {
setOpen(-1);
});

const isRtl = theme.direction === 'rtl';

const handleKeyDown = useEventCallback((event) => {
const index = Number(event.currentTarget.getAttribute('data-index'));
const value = values[index];
const tenPercents = (max - min) / 10;
const marksValues = marks.map((mark) => mark.value);
const marksIndex = marksValues.indexOf(value);
let newValue;
const increaseKey = isRtl ? 'ArrowLeft' : 'ArrowRight';
const decreaseKey = isRtl ? 'ArrowRight' : 'ArrowLeft';

switch (event.key) {
case 'Home':
Expand All @@ -450,15 +454,15 @@ const Slider = React.forwardRef(function Slider(props, ref) {
newValue = value - tenPercents;
}
break;
case 'ArrowRight':
case increaseKey:
case 'ArrowUp':
if (step) {
newValue = value + step;
} else {
newValue = marksValues[marksIndex + 1] || marksValues[marksValues.length - 1];
}
break;
case 'ArrowLeft':
case decreaseKey:
case 'ArrowDown':
if (step) {
newValue = value - step;
Expand Down Expand Up @@ -503,7 +507,7 @@ const Slider = React.forwardRef(function Slider(props, ref) {

const previousIndex = React.useRef();
let axis = orientation;
if (theme.direction === 'rtl' && orientation === 'horizontal') {
if (isRtl && orientation === 'horizontal') {
axis += '-reverse';
}

Expand Down
52 changes: 19 additions & 33 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 @@ -129,39 +129,6 @@ describe('<Slider />', () => {
});
});

// TODO: use fireEvent for all the events.
// describe.skip('when mouse reenters window', () => {
// it('should update if mouse is still clicked', () => {
// const handleChange = spy();
// const { container } = render(<Slider onChange={handleChange} value={50} />);

// fireEvent.mouseDown(container.firstChild);
// document.body.dispatchEvent(new window.MouseEvent('mouseleave'));
// const mouseEnter = new window.Event('mouseenter');
// mouseEnter.buttons = 1;
// document.body.dispatchEvent(mouseEnter);
// expect(handleChange.callCount).to.equal(1);

// document.body.dispatchEvent(new window.MouseEvent('mousemove'));
// expect(handleChange.callCount).to.equal(2);
// });

// it('should not update if mouse is not clicked', () => {
// const handleChange = spy();
// const { container } = render(<Slider onChange={handleChange} value={50} />);

// fireEvent.mouseDown(container.firstChild);
// document.body.dispatchEvent(new window.MouseEvent('mouseleave'));
// const mouseEnter = new window.Event('mouseenter');
// mouseEnter.buttons = 0;
// document.body.dispatchEvent(mouseEnter);
// expect(handleChange.callCount).to.equal(1);

// document.body.dispatchEvent(new window.MouseEvent('mousemove'));
// expect(handleChange.callCount).to.equal(1);
// });
// });

describe('range', () => {
it('should support keyboard', () => {
const { getAllByRole } = render(<Slider defaultValue={[20, 30]} />);
Expand Down Expand Up @@ -391,6 +358,25 @@ describe('<Slider />', () => {
fireEvent.keyDown(document.activeElement, moveLeftEvent);
expect(thumb).to.have.attribute('aria-valuenow', '-3e-8');
});

it('should handle RTL', () => {
const { getByRole } = render(
<ThemeProvider
theme={createMuiTheme({
direction: 'rtl',
})}
>
<Slider defaultValue={30} />
</ThemeProvider>,
);
const thumb = getByRole('slider');
thumb.focus();

fireEvent.keyDown(document.activeElement, moveLeftEvent);
expect(thumb).to.have.attribute('aria-valuenow', '31');
fireEvent.keyDown(document.activeElement, moveRightEvent);
expect(thumb).to.have.attribute('aria-valuenow', '30');
});
});

describe('prop: valueLabelDisplay', () => {
Expand Down