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

[Select] Improve response, react to mouse down #17978

Merged
merged 7 commits into from
Nov 23, 2019
Merged

[Select] Improve response, react to mouse down #17978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d5c2db0
[select]swapped onClick with onMouseDown
SarthakC Oct 21, 2019
0b2fbcc
removed act where fireevent is used
SarthakC Nov 2, 2019
ecb84cf
Revert "removed act where fireevent is used"
SarthakC Nov 2, 2019
e7f419a
renamed handleClick to handleMouseDown
SarthakC Nov 2, 2019
06221ce
[refactored] firevent inside act
SarthakC Nov 2, 2019
58f66b9
fix two interaction issues
oliviertassinari Nov 21, 2019
5018f21
Sebastian review
oliviertassinari Nov 22, 2019
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
33 changes: 9 additions & 24 deletions packages/material-ui/src/Select/Select.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,25 +95,21 @@ describe('<Select />', () => {
const { getByRole, getAllByRole, queryByRole } = render(
<Select
oliviertassinari marked this conversation as resolved.
Show resolved Hide resolved
onBlur={handleBlur}
value=""
onMouseDown={event => {
// simulating certain platforms that focus on mousedown
if (event.defaultPrevented === false) {
event.currentTarget.focus();
}
}}
value=""
>
<MenuItem value="">none</MenuItem>
<MenuItem value={10}>Ten</MenuItem>
</Select>,
);
const trigger = getByRole('button');

// simulating user click
act(() => {
fireEvent.mouseDown(trigger);
trigger.click();
});
fireEvent.mouseDown(trigger);

expect(handleBlur.callCount).to.equal(0);
expect(getByRole('listbox')).to.be.ok;
Expand Down Expand Up @@ -196,9 +192,7 @@ describe('<Select />', () => {
it('should focus list if no selection', () => {
const { getByRole } = render(<Select value="" autoFocus />);

act(() => {
getByRole('button').click();
});
fireEvent.mouseDown(getByRole('button'));

// TODO not matching WAI-ARIA authoring practices. It should focus the first (or selected) item.
expect(getByRole('listbox')).to.have.focus;
Expand All @@ -224,7 +218,7 @@ describe('<Select />', () => {
<MenuItem value="2" />
</Select>,
);
getByRole('button').click();
fireEvent.mouseDown(getByRole('button'));
getAllByRole('option')[1].click();

expect(onChangeHandler.calledOnce).to.be.true;
Expand Down Expand Up @@ -514,7 +508,7 @@ describe('<Select />', () => {
</Select>,
);

fireEvent.click(getByRole('button'));
fireEvent.mouseDown(getByRole('button'));
act(() => {
clock.tick(99);
});
Expand Down Expand Up @@ -612,10 +606,7 @@ describe('<Select />', () => {
}
const { getByRole, queryByRole } = render(<ControlledWrapper />);

act(() => {
getByRole('button').click();
});

fireEvent.mouseDown(getByRole('button'));
expect(getByRole('listbox')).to.be.ok;

act(() => {
Expand Down Expand Up @@ -654,10 +645,7 @@ describe('<Select />', () => {
const button = getByRole('button');
stub(button, 'clientWidth').get(() => 14);

act(() => {
button.click();
});

fireEvent.mouseDown(button);
expect(getByTestId('paper').style).to.have.property('minWidth', '14px');
});

Expand All @@ -670,10 +658,7 @@ describe('<Select />', () => {
const button = getByRole('button');
stub(button, 'clientWidth').get(() => 14);

act(() => {
button.click();
});

fireEvent.mouseDown(button);
expect(getByTestId('paper').style).to.have.property('minWidth', '');
});
});
Expand Down Expand Up @@ -794,7 +779,7 @@ describe('<Select />', () => {
});
const { getByRole, getAllByRole } = render(<ControlledSelectInput onChange={onChange} />);

fireEvent.click(getByRole('button'));
fireEvent.mouseDown(getByRole('button'));
const options = getAllByRole('option');
fireEvent.click(options[2]);

Expand Down
8 changes: 6 additions & 2 deletions packages/material-ui/src/Select/SelectInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,11 @@ const SelectInput = React.forwardRef(function SelectInput(props, ref) {
}
};

const handleClick = event => {
const handleMouseDown = event => {
// Hijack the default focus behavior.
event.preventDefault();
displayNode.focus();

update(true, event);
};

Expand Down Expand Up @@ -322,7 +326,7 @@ const SelectInput = React.forwardRef(function SelectInput(props, ref) {
aria-labelledby={`${labelId || ''} ${buttonId || ''}`}
aria-haspopup="listbox"
onKeyDown={handleKeyDown}
onClick={disabled || readOnly ? null : handleClick}
onMouseDown={disabled || readOnly ? null : handleMouseDown}
onBlur={handleBlur}
onFocus={onFocus}
{...SelectDisplayProps}
Expand Down
6 changes: 2 additions & 4 deletions packages/material-ui/test/integration/Select.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ describe('<Select> integration', () => {
const trigger = getByRole('button');
// Let's open the select component
// in the browser user click also focuses
trigger.focus();
trigger.click();
fireEvent.mouseDown(trigger);

const options = getAllByRole('option');
expect(options[1]).to.have.focus;
Expand All @@ -81,8 +80,7 @@ describe('<Select> integration', () => {
expect(trigger).to.have.text('Ten');
// Let's open the select component
// in the browser user click also focuses
trigger.focus();
trigger.click();
fireEvent.mouseDown(trigger);

const options = getAllByRole('option');
expect(options[1]).to.have.focus;
Expand Down