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

Add aria attributes to dummy input #3090

Merged
merged 6 commits into from
Oct 4, 2019
Merged

Add aria attributes to dummy input #3090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6f626b6
added aria attributes to dummy input
Oct 2, 2018
c42acab
moved aria attributes
Oct 2, 2018
2d792b3
Merge branch 'master' into pr/akiselev/3090
emmatown Oct 4, 2019
9e2b759
Update real-suns-rescue.md
emmatown Oct 4, 2019
bad8942
Prettier
emmatown Oct 4, 2019
910b944
Fix flow
emmatown Oct 4, 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
5 changes: 5 additions & 0 deletions .changeset/real-suns-rescue.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'react-select': patch
---

Add aria attributes to dummy input
29 changes: 18 additions & 11 deletions packages/react-select/src/Select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,13 +918,19 @@ export default class Select extends Component<Props, State> {
this.openMenu('first');
}
} else {
//$FlowFixMe
if (event.target.tagName !== 'INPUT' && event.target.tagName !== 'TEXTAREA') {
if (
// $FlowFixMe
event.target.tagName !== 'INPUT' &&
event.target.tagName !== 'TEXTAREA'
) {
this.onMenuClose();
}
}
//$FlowFixMe
if (event.target.tagName !== 'INPUT' && event.target.tagName !== 'TEXTAREA') {
if (
// $FlowFixMe
event.target.tagName !== 'INPUT' &&
event.target.tagName !== 'TEXTAREA'
) {
event.preventDefault();
}
};
Expand Down Expand Up @@ -1397,6 +1403,13 @@ export default class Select extends Component<Props, State> {

const id = inputId || this.getElementId('input');

// aria attributes makes the JSX "noisy", separated for clarity
const ariaAttributes = {
'aria-autocomplete': 'list',
'aria-label': this.props['aria-label'],
'aria-labelledby': this.props['aria-labelledby'],
};

if (!isSearchable) {
// use a dummy input to maintain focus/blur functionality
return (
Expand All @@ -1410,17 +1423,11 @@ export default class Select extends Component<Props, State> {
disabled={isDisabled}
tabIndex={tabIndex}
value=""
{...ariaAttributes}
/>
);
}

// aria attributes makes the JSX "noisy", separated for clarity
const ariaAttributes = {
'aria-autocomplete': 'list',
'aria-label': this.props['aria-label'],
'aria-labelledby': this.props['aria-labelledby'],
};

const { cx, theme, selectProps } = this.commonProps;

return (
Expand Down