OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4696 from aaronraimist/empty-formatbar 

Don't show FormatBar if composer is empty
pull/21833/head
Travis Ralston 2020-06-05 11:27:00 -06:00 committed by GitHub
parent efa12b8c2f ed2eca52b2
commit 68e59a3655
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/rooms/BasicMessageComposer.js
View File

@ -359,6 +359,8 @@ export default class BasicMessageEditor extends React.Component {
} }
_onSelectionChange = () => { _onSelectionChange = () => {
const {isEmpty} = this.props.model;
this._refreshLastCaretIfNeeded(); this._refreshLastCaretIfNeeded();
const selection = document.getSelection(); const selection = document.getSelection();
if (this._hasTextSelected && selection.isCollapsed) { if (this._hasTextSelected && selection.isCollapsed) {
@ -366,7 +368,7 @@ export default class BasicMessageEditor extends React.Component {
if (this._formatBarRef) { if (this._formatBarRef) {
this._formatBarRef.hide(); this._formatBarRef.hide();
} }
} else if (!selection.isCollapsed) { } else if (!selection.isCollapsed && !isEmpty) {
this._hasTextSelected = true; this._hasTextSelected = true;
if (this._formatBarRef) { if (this._formatBarRef) {
const selectionRect = selection.getRangeAt(0).getBoundingClientRect(); const selectionRect = selection.getRangeAt(0).getBoundingClientRect();