avoid null-refs when receiving an action before initial rendering

This commit is contained in:
Bruno Windels 2019-08-21 16:40:35 +02:00
parent 6df46cc319
commit 9f72268df7

View file

@ -240,7 +240,7 @@ export default class SendMessageComposer extends React.Component {
switch (payload.action) { switch (payload.action) {
case 'reply_to_event': case 'reply_to_event':
case 'focus_composer': case 'focus_composer':
this._editorRef.focus(); this._editorRef && this._editorRef.focus();
break; break;
case 'insert_mention': case 'insert_mention':
this._insertMention(payload.user_id); this._insertMention(payload.user_id);
@ -258,7 +258,7 @@ export default class SendMessageComposer extends React.Component {
const userPillPart = this.model.partCreator.userPill(displayName, userId); const userPillPart = this.model.partCreator.userPill(displayName, userId);
this.model.insertPartsAt([userPillPart], this._editorRef.getCaret()); this.model.insertPartsAt([userPillPart], this._editorRef.getCaret());
// refocus on composer, as we just clicked "Mention" // refocus on composer, as we just clicked "Mention"
this._editorRef.focus(); this._editorRef && this._editorRef.focus();
} }
_insertQuotedMessage(event) { _insertQuotedMessage(event) {
@ -269,7 +269,7 @@ export default class SendMessageComposer extends React.Component {
quoteParts.push(partCreator.newline()); quoteParts.push(partCreator.newline());
this.model.insertPartsAt(quoteParts, {offset: 0}); this.model.insertPartsAt(quoteParts, {offset: 0});
// refocus on composer, as we just clicked "Quote" // refocus on composer, as we just clicked "Quote"
this._editorRef.focus(); this._editorRef && this._editorRef.focus();
} }
render() { render() {