-
-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6127 from vector-im/luke/feature-tag-panel-tile-c…
…ontext-menu Add context menu to TagPanel
- Loading branch information
Showing
5 changed files
with
142 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| Copyright 2018 New Vector Ltd | ||
| 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 PropTypes from 'prop-types'; | ||
| import { _t } from 'matrix-react-sdk/lib/languageHandler'; | ||
| import dis from 'matrix-react-sdk/lib/dispatcher'; | ||
| import TagOrderActions from 'matrix-react-sdk/lib/actions/TagOrderActions'; | ||
| import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg'; | ||
|
|
||
| export default class TagTileContextMenu extends React.Component { | ||
| static propTypes = { | ||
| tag: PropTypes.string.isRequired, | ||
| /* callback called when the menu is dismissed */ | ||
| onFinished: PropTypes.func.isRequired, | ||
| }; | ||
|
|
||
| constructor() { | ||
| super(); | ||
|
|
||
| this._onViewCommunityClick = this._onViewCommunityClick.bind(this); | ||
| this._onRemoveClick = this._onRemoveClick.bind(this); | ||
| } | ||
|
|
||
| _onViewCommunityClick() { | ||
| dis.dispatch({ | ||
| action: 'view_group', | ||
| group_id: this.props.tag, | ||
| }); | ||
| this.props.onFinished(); | ||
| } | ||
|
|
||
| _onRemoveClick() { | ||
| dis.dispatch(TagOrderActions.removeTag( | ||
| // XXX: Context menus don't have a MatrixClient context | ||
| MatrixClientPeg.get(), | ||
| this.props.tag, | ||
| )); | ||
| this.props.onFinished(); | ||
| } | ||
|
|
||
| render() { | ||
| return <div> | ||
| <div className="mx_TagTileContextMenu_item" onClick={this._onViewCommunityClick} > | ||
| <img className="mx_TagTileContextMenu_item_icon" src="img/icons-groups.svg" width="15" height="15" /> | ||
| { _t('View Community') } | ||
| </div> | ||
| <hr className="mx_TagTileContextMenu_separator" /> | ||
| <div className="mx_TagTileContextMenu_item" onClick={this._onRemoveClick} > | ||
| <img className="mx_TagTileContextMenu_item_icon" src="img/icon_context_delete.svg" width="15" height="15" /> | ||
| { _t('Remove') } | ||
| </div> | ||
| </div>; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
src/skins/vector/css/vector-web/views/context_menus/_TagTileContextMenu.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| Copyright 2018 New Vector Ltd | ||
| 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. | ||
| */ | ||
|
|
||
| .mx_TagTileContextMenu_item { | ||
| padding-top: 8px; | ||
| padding-right: 20px; | ||
| padding-bottom: 8px; | ||
| cursor: pointer; | ||
| white-space: nowrap; | ||
| display: flex; | ||
| align-items: center; | ||
| line-height: 16px; | ||
| } | ||
|
|
||
|
|
||
| .mx_TagTileContextMenu_item_icon { | ||
| padding-right: 8px; | ||
| padding-left: 4px; | ||
| display: inline-block | ||
| } | ||
|
|
||
| .mx_TagTileContextMenu_separator { | ||
| margin-top: 0; | ||
| margin-bottom: 0; | ||
| border-bottom-style: none; | ||
| border-left-style: none; | ||
| border-right-style: none; | ||
| border-top-style: solid; | ||
| border-top-width: 1px; | ||
| border-color: $menu-border-color; | ||
| } |