OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

clean up new code

pull/21833/head
Michael Telatynski 2019-12-16 10:03:40 +00:00
parent 224ee05b62
commit 9c4eb1d649
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/views/elements/Dropdown.js
View File

@ -178,7 +178,7 @@ export default class Dropdown extends React.Component {
} }
} }
_onMenuOptionClick(dropdownKey) { _close() {
this.setState({ this.setState({
expanded: false, expanded: false,
}); });
@ -186,6 +186,10 @@ export default class Dropdown extends React.Component {
if (this._button.current) { if (this._button.current) {
this._button.current.focus(); this._button.current.focus();
} }
}
_onMenuOptionClick(dropdownKey) {
this._close();
this.props.onOptionChange(dropdownKey); this.props.onOptionChange(dropdownKey);
} }
@ -203,13 +207,7 @@ export default class Dropdown extends React.Component {
this.props.onOptionChange(this.state.highlightedOption); this.props.onOptionChange(this.state.highlightedOption);
// fallthrough // fallthrough
case Key.ESCAPE: case Key.ESCAPE:
this.setState({ this._close();
expanded: false,
});
// their focus was on the input, its getting unmounted, move it to the button
if (this._button.current) {
this._button.current.focus();
}
break; break;
case Key.ARROW_DOWN: case Key.ARROW_DOWN:
this.setState({ this.setState({