merge devel

src/views/info-view.jsx

@@ -480,7 +480,7 @@ class InfoView extends React.Component {
             tinode={this.props.tinode}
             topic={this.props.topic}
             onCredAdd={this.props.onCredAdd}
-            onTopicTagsUpdateRequest={this.props.onTopicTagsUpdateRequest}
+            onUpdateTagsRequest={this.props.onTopicTagsUpdateRequest}
             onCredConfirm={this.props.onCredConfirm}
             onCredDelete={this.props.onCredDelete}
             onUpdateTopicDesc={this.props.onTopicDescUpdateRequest}

src/views/sidepanel-view.jsx

@@ -182,7 +182,7 @@ class SidepanelView extends React.PureComponent {
             tinode={this.props.tinode}
             myUserId={this.props.myUserId}
             onUpdateTopicDesc={this.props.onUpdateAccountDesc}
-            onUpdateTags={this.props.onUpdateAccountTags}
+            onUpdateTagsRequest={this.props.onUpdateAccountTags}
             onCredAdd={this.props.onCredAdd}
             onCredDelete={this.props.onCredDelete}
             onCredConfirm={this.props.onCredConfirm}

src/views/tinode-web.jsx

@@ -1168,7 +1168,7 @@ class TinodeWeb extends React.Component {
     });
   }
 
-  handleUpdateAccountTagsRequest(tags) {
+  handleUpdateAccountTagsRequest(_, tags) {
     this.tinode.getMeTopic().setMeta({tags: tags})
       .catch(err => this.handleError(err.message, 'err'));
   }

src/widgets/send-message.jsx

@@ -90,6 +90,10 @@ class SendMessage extends React.PureComponent {
   componentDidMount() {
     if (this.messageEditArea) {
       this.messageEditArea.addEventListener('paste', this.handlePasteEvent, false);
+      if (window.getComputedStyle(this.messageEditArea).getPropertyValue('transition-property') == 'all') {
+        // Set focus on desktop, but not on mobile: focus causes soft keyboard to pop up.
+        this.messageEditArea.focus();
+      }
     }
 
     this.setState({quote: this.formatReply()});
@@ -103,7 +107,10 @@ class SendMessage extends React.PureComponent {
 
   componentDidUpdate(prevProps) {
     if (this.messageEditArea) {
-      this.messageEditArea.focus();
+      if (window.getComputedStyle(this.messageEditArea).getPropertyValue('transition-property') == 'all') {
+        // Set focus on desktop, but not on mobile: focus causes soft keyboard to pop up.
+        this.messageEditArea.focus();
+      }
     }
 
     if (prevProps.topicName != this.props.topicName) {
@@ -266,11 +273,10 @@ class SendMessage extends React.PureComponent {
                       onDeleted={_ => this.setState({audioRec: false})}
                       onFinished={this.handleAttachAudio}/>
                   </Suspense>) :
-                  <textarea id="sendMessage" placeholder={prompt}
+                  <textarea id="send-message-input" placeholder={prompt}
                     value={this.state.message} onChange={this.handleMessageTyping}
                     onKeyPress={this.handleKeyPress}
-                    ref={(ref) => {this.messageEditArea = ref;}}
-                    autoFocus />)}
+                    ref={ref => {this.messageEditArea = ref;}} />)}
               {this.state.message || !audioEnabled ?
                 <a href="#" onClick={this.handleSend} title={formatMessage(messages.icon_title_send)}>
                   <i className="material-icons">{sendIcon}</i>

src/widgets/topic-common.jsx

@@ -117,7 +117,7 @@ export default class TopicCommon extends React.Component {
   // Request server to change tags.
   handleTagsUpdated(tags) {
     if (!arrayEqual(this.state.tags.slice(0), tags.slice(0))) {
-      this.props.onTopicTagsUpdateRequest(this.props.topic, tags);
+      this.props.onUpdateTagsRequest(this.props.topic, tags);
     }
   }