ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-14 04:19:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

leap: ensure selected is always an array

Browse Source 
Fixes #3462.
This commit is contained in:
Matilde Park 2020-09-09 21:20:59 -04:00
parent a2adf7359d
commit 1f6f1fcd53
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/interface/src/views/components/leap/Omnibox.js
View File

@ -58,7 +58,7 @@ export class Omnibox extends Component {
control(evt) {
if (evt.key === 'Escape') {
if (this.state.query.length > 0) {
this.setState({ query: '', results: this.initialResults() });
this.setState({ query: '', results: this.initialResults(), selected: [] });
} else if (this.props.show) {
this.props.api.local.setOmnibox();
}
@ -78,8 +78,10 @@ export class Omnibox extends Component {
if (evt.key === 'Enter') {
evt.preventDefault();
if (this.state.selected !== []) {
if (this.state.selected.length > 0) {
this.navigate(this.state.selected[0], this.state.selected[1]);
} else if (Array.from(this.state.results.values()).flat().length === 0) {
return;
} else {
this.navigate(
Array.from(this.state.results.values()).flat()[0].app,
@ -90,7 +92,7 @@ export class Omnibox extends Component {
handleClickOutside(evt) {
if (this.props.show && !this.omniBox.contains(evt.target)) {
this.setState({ results: this.initialResults(), query: '' }, () => {
this.setState({ results: this.initialResults(), query: '', selected: [] }, () => {
this.props.api.local.setOmnibox();
});
}
@ -158,9 +160,9 @@ export class Omnibox extends Component {
);
});
const flattenedResultLinks = Array.from(results.values()).flat().map(result => result.link);
const flattenedResultLinks = Array.from(results.values()).flat().map(result => [result.app, result.link]);
if (!flattenedResultLinks.includes(selected)) {
selected = flattenedResultLinks[0];
selected = flattenedResultLinks[0] || [];
}
this.setState({ results, selected });