PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2018-07-16 20:29:26 +00:00
commit 6ae7c577cd
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -498,8 +498,12 @@ export default class MessageComposerInput extends React.Component {
} }
} }
// when selection changes hide the autocomplete // when in autocomplete mode and selection changes hide the autocomplete.
if (!rangeEquals(this.state.editorState.selection, editorState.selection)) { // Selection changes when we enter text so use a heuristic to compare documents without doing it recursively
if (this.autocomplete.state.completionList.length >= 0 && !this.autocomplete.state.hide &&
this.state.editorState.document.text !== editorState.document.text &&
!rangeEquals(this.state.editorState.selection, editorState.selection))
{
this.autocomplete.hide(); this.autocomplete.hide();
} }
@ -1541,7 +1545,8 @@ export default class MessageComposerInput extends React.Component {
onFocus={this.onFocus} onFocus={this.onFocus}
renderNode={this.renderNode} renderNode={this.renderNode}
renderMark={this.renderMark} renderMark={this.renderMark}
spellCheck={true} // disable spell check for the placeholder because browsers don't like "unencrypted"
spellCheck={!this.state.editorState.document.isEmpty}
/> />
</div> </div>
</div> </div>