{explanation}
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 4f8a051e62..3acec417f2 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -29,6 +29,8 @@ import { Droppable } from 'react-beautiful-dnd';
import classNames from 'classnames';
import MatrixClientContext from "../../contexts/MatrixClientContext";
import AutoHideScrollbar from "./AutoHideScrollbar";
+import SettingsStore from "../../settings/SettingsStore";
+import UserTagTile from "../views/elements/UserTagTile";
const TagPanel = createReactClass({
displayName: 'TagPanel',
@@ -102,6 +104,17 @@ const TagPanel = createReactClass({
dis.dispatch({action: 'deselect_tags'});
},
+ renderGlobalIcon() {
+ if (!SettingsStore.getValue("feature_communities_v2_prototypes")) return null;
+
+ return (
+
+
+
+
+ );
+ },
+
render() {
const DNDTagTile = sdk.getComponent('elements.DNDTagTile');
const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
@@ -137,7 +150,6 @@ const TagPanel = createReactClass({
{ clearButton }
-
+ { this.renderGlobalIcon() }
{ tags }
{
- dis.dispatch({
- action: 'view_group',
- group_id: result.group_id,
- group_is_new: true,
- });
+ if (result.room_id) {
+ dis.dispatch({
+ action: 'view_room',
+ room_id: result.room_id,
+ });
+ } else {
+ dis.dispatch({
+ action: 'view_group',
+ group_id: result.group_id,
+ group_is_new: true,
+ });
+ }
this.props.onFinished(true);
}).catch((e) => {
this.setState({createError: e});
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 6a12c87024..49b336a577 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -47,6 +47,7 @@ export default createReactClass({
contextMenuButtonRef: PropTypes.object,
openMenu: PropTypes.func,
menuDisplayed: PropTypes.bool,
+ selected: PropTypes.bool,
},
statics: {
diff --git a/src/components/views/elements/UserTagTile.tsx b/src/components/views/elements/UserTagTile.tsx
new file mode 100644
index 0000000000..c652423753
--- /dev/null
+++ b/src/components/views/elements/UserTagTile.tsx
@@ -0,0 +1,99 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import defaultDispatcher from "../../../dispatcher/dispatcher";
+import { OwnProfileStore } from "../../../stores/OwnProfileStore";
+import { UPDATE_EVENT } from "../../../stores/AsyncStore";
+import * as fbEmitter from "fbemitter";
+import TagOrderStore from "../../../stores/TagOrderStore";
+import AccessibleTooltipButton from "./AccessibleTooltipButton";
+import BaseAvatar from "../avatars/BaseAvatar";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import classNames from "classnames";
+
+interface IProps{}
+
+interface IState {
+ selected: boolean;
+}
+
+export default class UserTagTile extends React.PureComponent {
+ private tagStoreRef: fbEmitter.EventSubscription;
+
+ constructor(props: IProps) {
+ super(props);
+
+ this.state = {
+ selected: TagOrderStore.getSelectedTags().length === 0,
+ };
+ }
+
+ public componentDidMount() {
+ OwnProfileStore.instance.on(UPDATE_EVENT, this.onProfileUpdate);
+ this.tagStoreRef = TagOrderStore.addListener(this.onTagStoreUpdate);
+ }
+
+ public componentWillUnmount() {
+ OwnProfileStore.instance.off(UPDATE_EVENT, this.onProfileUpdate);
+ }
+
+ private onProfileUpdate = () => {
+ this.forceUpdate();
+ };
+
+ private onTagStoreUpdate = () => {
+ const selected = TagOrderStore.getSelectedTags().length === 0;
+ this.setState({selected});
+ };
+
+ private onTileClick = (ev) => {
+ ev.preventDefault();
+ ev.stopPropagation();
+
+ // Deselect all tags
+ defaultDispatcher.dispatch({action: "deselect_tags"});
+ };
+
+ public render() {
+ // XXX: We reuse TagTile classes for ease of demonstration - we should probably generify
+ // TagTile instead if we continue to use this component.
+ const avatarHeight = 36;
+ const name = OwnProfileStore.instance.displayName || MatrixClientPeg.get().getUserId();
+ const className = classNames({
+ mx_TagTile: true,
+ mx_TagTile_selected: this.state.selected,
+ mx_TagTile_large: true,
+ });
+ return (
+
+
+
+
+
+ );
+ }
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9bc13df30d..d0627efcc4 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2064,6 +2064,7 @@
"Find a room…": "Find a room…",
"Find a room… (e.g. %(exampleRoom)s)": "Find a room… (e.g. %(exampleRoom)s)",
"If you can't find the room you're looking for, ask for an invite or Create a new room.": "If you can't find the room you're looking for, ask for an invite or Create a new room.",
+ "Explore rooms in %(communityName)s": "Explore rooms in %(communityName)s",
"Clear filter": "Clear filter",
"Search rooms": "Search rooms",
"You can't send any messages until you review and agree to our terms and conditions.": "You can't send any messages until you review and agree to our terms and conditions.",