Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Fix force completion and hide rooms with no alias
Browse files Browse the repository at this point in the history
  • Loading branch information
aviraldg committed Sep 13, 2016
1 parent 9a991a4 commit 79e5e6f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/autocomplete/RoomProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default class RoomProvider extends AutocompleteProvider {
),
range,
};
}).slice(0, 4);
}).filter(completion => !!completion.completion && completion.completion.length > 0).slice(0, 4);
}
return completions;
}
Expand Down
8 changes: 6 additions & 2 deletions src/components/views/rooms/Autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import flatMap from 'lodash/flatMap';
import isEqual from 'lodash/isEqual';
import sdk from '../../../index';
import type {Completion, SelectionRange} from '../../../autocomplete/Autocompleter';
import Q from 'q';

import {getCompletions} from '../../../autocomplete/Autocompleter';

Expand Down Expand Up @@ -140,12 +141,15 @@ export default class Autocomplete extends React.Component {
}

forceComplete() {
const done = Q.defer();
this.setState({
forceComplete: true,
}, () => {
this.complete(this.props.query, this.props.selection);
setTimeout(() => this.onDownArrow(), 50); // FIXME HACK
this.complete(this.props.query, this.props.selection).then(() => {
done.resolve();
});
});
return done.promise;
}

/** called from MessageComposerInput
Expand Down
4 changes: 3 additions & 1 deletion src/components/views/rooms/MessageComposerInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,9 @@ export default class MessageComposerInput extends React.Component {
e.preventDefault(); // we *never* want tab's default to happen, but we do want up/down sometimes
const didTab = await (e.shiftKey ? this.onUpArrow : this.onDownArrow)(e);
if (!didTab && this.autocomplete) {
this.autocomplete.forceComplete();
this.autocomplete.forceComplete().then(() => {
this.onDownArrow(e);
});
}
}

Expand Down

0 comments on commit 79e5e6f

Please sign in to comment.