Merge branch 'develop' into luke/fix-group-avatar-update

src/components/structures/TagPanel.js

@@ -84,7 +84,7 @@ const TagPanel = React.createClass({
         }
     },
 
-    onClick(e) {
+    onMouseDown(e) {
         dis.dispatch({action: 'deselect_tags'});
     },
 
@@ -128,7 +128,9 @@ const TagPanel = React.createClass({
             <GeminiScrollbar
                 className="mx_TagPanel_scroller"
                 autoshow={true}
-                onClick={this.onClick}
+                // XXX: Use onMouseDown as a workaround for https://github.com/atlassian/react-beautiful-dnd/issues/273
+                // instead of onClick. Otherwise we experience https://github.com/vector-im/riot-web/issues/6253
+                onMouseDown={this.onMouseDown}
             >
                 <Droppable
                     droppableId="tag-panel-droppable"

src/components/structures/UserSettings.js

@@ -79,6 +79,7 @@ const SIMPLE_SETTINGS = [
     { id: "Pill.shouldHidePillAvatar" },
     { id: "TextualBody.disableBigEmoji" },
     { id: "VideoView.flipVideoHorizontally" },
+    { id: "TagPanel.disableTagPanel" },
 ];
 
 // These settings must be defined in SettingsStore

src/components/views/groups/GroupTile.js

@@ -59,7 +59,7 @@ const GroupTile = React.createClass({
         });
     },
 
-    onClick: function(e) {
+    onMouseDown: function(e) {
         e.preventDefault();
         dis.dispatch({
             action: 'view_group',
@@ -79,7 +79,9 @@ const GroupTile = React.createClass({
         const httpUrl = profile.avatarUrl ? this.context.matrixClient.mxcUrlToHttp(
             profile.avatarUrl, avatarHeight, avatarHeight, "crop",
         ) : null;
-        return <AccessibleButton className="mx_GroupTile" onClick={this.onClick}>
+        // XXX: Use onMouseDown as a workaround for https://github.com/atlassian/react-beautiful-dnd/issues/273
+        // instead of onClick. Otherwise we experience https://github.com/vector-im/riot-web/issues/6156
+        return <AccessibleButton className="mx_GroupTile" onMouseDown={this.onMouseDown}>
             <Droppable droppableId="my-groups-droppable" type="draggable-TagTile">
                 { (droppableProvided, droppableSnapshot) => (
                     <div ref={droppableProvided.innerRef}>

src/i18n/strings/en_EN.json

@@ -203,6 +203,7 @@
     "Don't send typing notifications": "Don't send typing notifications",
     "Automatically replace plain text Emoji": "Automatically replace plain text Emoji",
     "Mirror local video feed": "Mirror local video feed",
+    "Disable Community Filter Panel": "Disable Community Filter Panel",
     "Disable Peer-to-Peer for 1:1 calls": "Disable Peer-to-Peer for 1:1 calls",
     "Opt out of analytics": "Opt out of analytics",
     "Never send encrypted messages to unverified devices from this device": "Never send encrypted messages to unverified devices from this device",
@@ -431,6 +432,13 @@
     "(warning: cannot be disabled again!)": "(warning: cannot be disabled again!)",
     "Encryption is enabled in this room": "Encryption is enabled in this room",
     "Encryption is not enabled in this room": "Encryption is not enabled in this room",
+    "The default role for new room members is": "The default role for new room members is",
+    "To send messages, you must be a": "To send messages, you must be a",
+    "To invite users into the room, you must be a": "To invite users into the room, you must be a",
+    "To configure the room, you must be a": "To configure the room, you must be a",
+    "To kick users, you must be a": "To kick users, you must be a",
+    "To ban users, you must be a": "To ban users, you must be a",
+    "To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
     "Privileged Users": "Privileged Users",
     "%(user)s is a": "%(user)s is a",
     "No users have specific privileges in this room": "No users have specific privileges in this room",
@@ -442,6 +450,7 @@
     "To link to a room it must have <a>an address</a>.": "To link to a room it must have <a>an address</a>.",
     "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
     "Click here to fix": "Click here to fix",
+    "To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
     "Who can access this room?": "Who can access this room?",
     "Only people who have been invited": "Only people who have been invited",
     "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
@@ -453,14 +462,6 @@
     "Members only (since they were invited)": "Members only (since they were invited)",
     "Members only (since they joined)": "Members only (since they joined)",
     "Permissions": "Permissions",
-    "The default role for new room members is": "The default role for new room members is",
-    "To send messages, you must be a": "To send messages, you must be a",
-    "To invite users into the room, you must be a": "To invite users into the room, you must be a",
-    "To configure the room, you must be a": "To configure the room, you must be a",
-    "To kick users, you must be a": "To kick users, you must be a",
-    "To ban users, you must be a": "To ban users, you must be a",
-    "To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
-    "To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
     "Advanced": "Advanced",
     "This room's internal ID is": "This room's internal ID is",
     "Add a topic": "Add a topic",

src/settings/Settings.js

@@ -188,6 +188,11 @@ export const SETTINGS = {
         displayName: _td('Mirror local video feed'),
         default: false,
     },
+    "TagPanel.disableTagPanel": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Disable Community Filter Panel'),
+        default: false,
+    },
     "theme": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         default: "light",