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

fix: onFocus and onClick in Picklist triggered when it should not #2528

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

fix: onFocus and onClick in Picklist triggered when it should not #2528

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
22321d0
fix: onFocus and onClick in Picklist triggered when it should not
Nov 4, 2022
8bcd692
fix: onFocus and onClick in Picklist triggered when it should not
Nov 4, 2022
d82e06f
add test
Nov 7, 2022
9c1fc68
Merge branch 'master' of https://github.com/nexxtway/react-rainbow in…
Dec 12, 2022
0b0a92c
fix: onFocus and onClick in Picklist triggered when it should not
Dec 13, 2022
ad65d5a
fix: onFocus and onClick in Picklist triggered when it should not
Dec 15, 2022
4e6f651
fix: onFocus and onClick in Picklist triggered when it should not
Dec 15, 2022
eabf37f
Merge branch 'master' into fix-onfocus-on-picklist-component
LeandroTorresSicilia Dec 22, 2022
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
9 changes: 6 additions & 3 deletions src/components/Picklist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ class Picklist extends Component {
this.setState({
isOpen: false,
});
this.focus();
}

handleInputClick(event) {
Expand All @@ -167,9 +168,12 @@ class Picklist extends Component {
}

handleFocus() {
const { isOpen } = this.state;
const { onFocus, value } = this.props;
const eventValue = value || null;
onFocus(eventValue);
if (!isOpen) {
const eventValue = value || null;
onFocus(eventValue);
}
}

handleBlur() {
Expand All @@ -185,7 +189,6 @@ class Picklist extends Component {
const { label, name, icon, value } = option;
this.closeMenu();
setTimeout(() => {
this.focus();
return onChange({ label, name, icon, value });
}, 0);
}
Expand Down