mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-26 12:45:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2018-02-19 09:59:25 +00:00
commit 4c4b813aa1
1 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/components/structures/TagPanel.js
View file

@ -17,6 +17,7 @@ limitations under the License.
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { MatrixClient } from 'matrix-js-sdk'; import { MatrixClient } from 'matrix-js-sdk';
import GeminiScrollbar from 'react-gemini-scrollbar';
import TagOrderStore from '../../stores/TagOrderStore'; import TagOrderStore from '../../stores/TagOrderStore';
import GroupActions from '../../actions/GroupActions'; import GroupActions from '../../actions/GroupActions';
@ -83,8 +84,6 @@ const TagPanel = React.createClass({
}, },
onClick(e) { onClick(e) {
// Ignore clicks on children
if (e.target !== e.currentTarget) return;
dis.dispatch({action: 'deselect_tags'}); dis.dispatch({action: 'deselect_tags'});
}, },
@ -93,9 +92,14 @@ const TagPanel = React.createClass({
dis.dispatch({action: 'view_create_group'}); dis.dispatch({action: 'view_create_group'});
}, },
onLogoClick(ev) {
dis.dispatch({action: 'deselect_tags'});
},
render() { render() {
const GroupsButton = sdk.getComponent('elements.GroupsButton'); const GroupsButton = sdk.getComponent('elements.GroupsButton');
const DNDTagTile = sdk.getComponent('elements.DNDTagTile'); const DNDTagTile = sdk.getComponent('elements.DNDTagTile');
const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
const tags = this.state.orderedTags.map((tag, index) => { const tags = this.state.orderedTags.map((tag, index) => {
return <DNDTagTile return <DNDTagTile
@ -106,6 +110,15 @@ const TagPanel = React.createClass({
/>; />;
}); });
return <div className="mx_TagPanel"> return <div className="mx_TagPanel">
<AccessibleButton className="mx_TagPanel_logo" onClick={this.onLogoClick}>
<img src="img/logos/riot-logo.svg" />
</AccessibleButton>
<div className="mx_TagPanel_divider" />
<GeminiScrollbar
className="mx_TagPanel_scroller"
autoShow={true}
onClick={this.onClick}
>
<Droppable <Droppable
droppableId="tag-panel-droppable" droppableId="tag-panel-droppable"
type="draggable-TagTile" type="draggable-TagTile"
@ -114,17 +127,14 @@ const TagPanel = React.createClass({
<div <div
className="mx_TagPanel_tagTileContainer" className="mx_TagPanel_tagTileContainer"
ref={provided.innerRef} ref={provided.innerRef}
// react-beautiful-dnd has a bug that emits a click to the parent
// of draggables upon dropping
// https://github.com/atlassian/react-beautiful-dnd/issues/273
// so we use onMouseDown here as a workaround.
onMouseDown={this.onClick}
> >
{ tags } { tags }
{ provided.placeholder } { provided.placeholder }
</div> </div>
) } ) }
</Droppable> </Droppable>
</GeminiScrollbar>
<div className="mx_TagPanel_divider" />
<div className="mx_TagPanel_createGroupButton"> <div className="mx_TagPanel_createGroupButton">
<GroupsButton tooltip={true} /> <GroupsButton tooltip={true} />
</div> </div>