imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #384 from aviraldg/fix-composer-up-down

Browse source 
fix: allow up/down normally for no completions
This commit is contained in:
David Baker 2016-08-03 13:55:13 +01:00 • committed by GitHub
commit efdcc6da98
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/rooms/Autocomplete.js
View file

@ -64,6 +64,9 @@ export default class Autocomplete extends React.Component {
onUpArrow(): boolean { onUpArrow(): boolean {
let completionCount = this.countCompletions(), let completionCount = this.countCompletions(),
selectionOffset = (completionCount + this.state.selectionOffset - 1) % completionCount; selectionOffset = (completionCount + this.state.selectionOffset - 1) % completionCount;
if (!completionCount) {
return false;
}
this.setSelection(selectionOffset); this.setSelection(selectionOffset);
return true; return true;
} }
@ -72,6 +75,9 @@ export default class Autocomplete extends React.Component {
onDownArrow(): boolean { onDownArrow(): boolean {
let completionCount = this.countCompletions(), let completionCount = this.countCompletions(),
selectionOffset = (this.state.selectionOffset + 1) % completionCount; selectionOffset = (this.state.selectionOffset + 1) % completionCount;
if (!completionCount) {
return false;
}
this.setSelection(selectionOffset); this.setSelection(selectionOffset);
return true; return true;
} }

8
src/components/views/rooms/MessageComposerInput.js
View file

@ -497,20 +497,16 @@ export default class MessageComposerInput extends React.Component {
} }
onUpArrow(e) { onUpArrow(e) {
if(this.props.onUpArrow) { if (this.props.onUpArrow && this.props.onUpArrow()) {
if(this.props.onUpArrow()) {
e.preventDefault(); e.preventDefault();
} }
} }
}
onDownArrow(e) { onDownArrow(e) {
if(this.props.onDownArrow) { if (this.props.onDownArrow && this.props.onDownArrow()) {
if(this.props.onDownArrow()) {
e.preventDefault(); e.preventDefault();
} }
} }
}
onTab(e) { onTab(e) {
if (this.props.tryComplete) { if (this.props.tryComplete) {