Merge branch 'master' into develop

CHANGELOG.md

@@ -1,3 +1,16 @@
+Changes in [1.0.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.0.3) (2019-03-06)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.0.2...v1.0.3)
+
+ * Don't duplicate direct chats from other tags
+   [\#2762](https://github.com/matrix-org/matrix-react-sdk/pull/2762)
+ * Include tag name when warning about rooms running off lists
+   [\#2761](https://github.com/matrix-org/matrix-react-sdk/pull/2761)
+ * Always insert rooms into lists when they get lost
+   [\#2760](https://github.com/matrix-org/matrix-react-sdk/pull/2760)
+ * Fix the ctrl+k shortcut
+   [\#2759](https://github.com/matrix-org/matrix-react-sdk/pull/2759)
+
 Changes in [1.0.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.0.2) (2019-03-06)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.0.2-rc.4...v1.0.2)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

src/components/structures/LeftPanel.js

@@ -213,6 +213,7 @@ const LeftPanel = React.createClass({
         );
 
         const searchBox = (<SearchBox
+            enableRoomSearchFocus={true}
             placeholder={ _t('Filter room names') }
             onSearch={ this.onSearch }
             onCleared={ this.onSearchCleared }

src/components/structures/SearchBox.js

@@ -30,6 +30,17 @@ module.exports = React.createClass({
         onCleared: PropTypes.func,
         className: PropTypes.string,
         placeholder: PropTypes.string.isRequired,
+
+        // If true, the search box will focus and clear itself
+        // on room search focus action (it would be nicer to take
+        // this functionality out, but not obvious how that would work)
+        enableRoomSearchFocus: PropTypes.bool,
+    },
+
+    getDefaultProps: function() {
+        return {
+            enableRoomSearchFocus: false,
+        };
     },
 
     getInitialState: function() {
@@ -47,6 +58,8 @@ module.exports = React.createClass({
     },
 
     onAction: function(payload) {
+        if (!this.props.enableRoomSearchFocus) return;
+
         switch (payload.action) {
             case 'view_room':
                 if (this.refs.search && payload.clear_search) {