mirror of
https://github.com/element-hq/element-web
synced 2024-10-26 04:35:55 +03:00
Merge pull request #411 from matrix-org/dbkr/fix_messagecomposer_style
Only show Autocomplete if autocomplete is enabled
This commit is contained in:
commit
109184aab7
1 changed files with 12 additions and 7 deletions
|
@ -231,15 +231,20 @@ export default class MessageComposer extends React.Component {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let autoComplete;
|
||||||
|
if (UserSettingsStore.isFeatureEnabled('rich_text_editor')) {
|
||||||
|
autoComplete = <div className="mx_MessageComposer_autocomplete_wrapper">
|
||||||
|
<Autocomplete
|
||||||
|
ref="autocomplete"
|
||||||
|
onConfirm={this._onAutocompleteConfirm}
|
||||||
|
query={this.state.autocompleteQuery}
|
||||||
|
selection={this.state.selection} />
|
||||||
|
</div>;
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="mx_MessageComposer mx_fadable" style={{ opacity: this.props.opacity }}>
|
<div className="mx_MessageComposer mx_fadable" style={{ opacity: this.props.opacity }}>
|
||||||
<div className="mx_MessageComposer_autocomplete_wrapper">
|
{autoComplete}
|
||||||
<Autocomplete
|
|
||||||
ref="autocomplete"
|
|
||||||
onConfirm={this._onAutocompleteConfirm}
|
|
||||||
query={this.state.autocompleteQuery}
|
|
||||||
selection={this.state.selection} />
|
|
||||||
</div>
|
|
||||||
<div className="mx_MessageComposer_wrapper">
|
<div className="mx_MessageComposer_wrapper">
|
||||||
<div className="mx_MessageComposer_row">
|
<div className="mx_MessageComposer_row">
|
||||||
{controls}
|
{controls}
|
||||||
|
|
Loading…
Reference in a new issue