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

fix: autocomplete to use tab instead of return #382

Merged
merged 1 commit into from
Aug 3, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions src/components/views/rooms/MessageComposer.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export default class MessageComposer extends React.Component {
this.onInputContentChanged = this.onInputContentChanged.bind(this);
this.onUpArrow = this.onUpArrow.bind(this);
this.onDownArrow = this.onDownArrow.bind(this);
this.onTab = this.onTab.bind(this);
this._tryComplete = this._tryComplete.bind(this);
this._onAutocompleteConfirm = this._onAutocompleteConfirm.bind(this);

Expand Down Expand Up @@ -143,12 +142,6 @@ export default class MessageComposer extends React.Component {
return this.refs.autocomplete.onDownArrow();
}

onTab() {
// FIXME Autocomplete doesn't have an onTab - what is this supposed to do?
// return this.refs.autocomplete.onTab();
return false;
}

_tryComplete(): boolean {
if (this.refs.autocomplete) {
return this.refs.autocomplete.onConfirm();
Expand Down Expand Up @@ -223,7 +216,6 @@ export default class MessageComposer extends React.Component {
tryComplete={this._tryComplete}
onUpArrow={this.onUpArrow}
onDownArrow={this.onDownArrow}
onTab={this.onTab}
tabComplete={this.props.tabComplete} // used for old messagecomposerinput/tabcomplete
onContentChanged={this.onInputContentChanged} />,
uploadButton,
Expand Down
13 changes: 4 additions & 9 deletions src/components/views/rooms/MessageComposerInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -422,12 +422,6 @@ export default class MessageComposerInput extends React.Component {
if (ev.shiftKey) {
return false;
}

if(this.props.tryComplete) {
if(this.props.tryComplete()) {
return true;
}
}

const contentState = this.state.editorState.getCurrentContent();
if (!contentState.hasText()) {
Expand Down Expand Up @@ -519,8 +513,8 @@ export default class MessageComposerInput extends React.Component {
}

onTab(e) {
if (this.props.onTab) {
if (this.props.onTab()) {
if (this.props.tryComplete) {
if (this.props.tryComplete()) {
e.preventDefault();
}
}
Expand Down Expand Up @@ -585,5 +579,6 @@ MessageComposerInput.propTypes = {

onDownArrow: React.PropTypes.func,

onTab: React.PropTypes.func
// attempts to confirm currently selected completion, returns whether actually confirmed
tryComplete: React.PropTypes.func,
};