Add right-click context menu to GroupInviteTile.js

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2019-12-10 00:14:36 +00:00
parent 5c92f8ab25
commit 44adda3547
1 changed files with 32 additions and 21 deletions

View File

@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import React, {createRef} from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import createReactClass from 'create-react-class'; import createReactClass from 'create-react-class';
import { MatrixClient } from 'matrix-js-sdk'; import { MatrixClient } from 'matrix-js-sdk';
@ -27,6 +27,7 @@ import classNames from 'classnames';
import MatrixClientPeg from "../../../MatrixClientPeg"; import MatrixClientPeg from "../../../MatrixClientPeg";
import {ContextMenu, ContextMenuButton, toRightOf} from "../../structures/ContextMenu"; import {ContextMenu, ContextMenuButton, toRightOf} from "../../structures/ContextMenu";
// XXX this class copies a lot from RoomTile.js
export default createReactClass({ export default createReactClass({
displayName: 'GroupInviteTile', displayName: 'GroupInviteTile',
@ -47,10 +48,6 @@ export default createReactClass({
}); });
}, },
componentDidMount: function() {
this._contextMenuButton = createRef();
},
onClick: function(e) { onClick: function(e) {
dis.dispatch({ dis.dispatch({
action: 'view_group', action: 'view_group',
@ -74,16 +71,12 @@ export default createReactClass({
}); });
}, },
openMenu: function(e) { _showContextMenu: function(boundingClientRect) {
// Only allow non-guests to access the context menu // Only allow non-guests to access the context menu
if (MatrixClientPeg.get().isGuest()) return; if (MatrixClientPeg.get().isGuest()) return;
// Prevent the GroupInviteTile onClick event firing as well
e.stopPropagation();
e.preventDefault();
const state = { const state = {
menuDisplayed: true, contextMenuPosition: boundingClientRect,
}; };
// If the badge is clicked, then no longer show tooltip // If the badge is clicked, then no longer show tooltip
@ -94,9 +87,28 @@ export default createReactClass({
this.setState(state); this.setState(state);
}, },
onContextMenuButtonClick: function(e) {
// Prevent the RoomTile onClick event firing as well
e.stopPropagation();
e.preventDefault();
this._showContextMenu(e.target.getBoundingClientRect());
},
onContextMenu: function(e) {
// Prevent the native context menu
e.preventDefault();
this._showContextMenu({
right: e.clientX,
top: e.clientY,
height: 0,
});
},
closeMenu: function() { closeMenu: function() {
this.setState({ this.setState({
menuDisplayed: false, contextMenuPosition: null,
}); });
}, },
@ -110,15 +122,16 @@ export default createReactClass({
const av = <BaseAvatar name={groupName} width={24} height={24} url={httpAvatarUrl} />; const av = <BaseAvatar name={groupName} width={24} height={24} url={httpAvatarUrl} />;
const isMenuDisplayed = Boolean(this.state.contextMenuPosition);
const nameClasses = classNames('mx_RoomTile_name mx_RoomTile_invite mx_RoomTile_badgeShown', { const nameClasses = classNames('mx_RoomTile_name mx_RoomTile_invite mx_RoomTile_badgeShown', {
'mx_RoomTile_badgeShown': this.state.badgeHover || this.state.menuDisplayed, 'mx_RoomTile_badgeShown': this.state.badgeHover || isMenuDisplayed,
}); });
const label = <div title={this.props.group.groupId} className={nameClasses} dir="auto"> const label = <div title={this.props.group.groupId} className={nameClasses} dir="auto">
{ groupName } { groupName }
</div>; </div>;
const badgeEllipsis = this.state.badgeHover || this.state.menuDisplayed; const badgeEllipsis = this.state.badgeHover || isMenuDisplayed;
const badgeClasses = classNames('mx_RoomTile_badge mx_RoomTile_highlight', { const badgeClasses = classNames('mx_RoomTile_badge mx_RoomTile_highlight', {
'mx_RoomTile_badgeButton': badgeEllipsis, 'mx_RoomTile_badgeButton': badgeEllipsis,
}); });
@ -127,10 +140,9 @@ export default createReactClass({
const badge = ( const badge = (
<ContextMenuButton <ContextMenuButton
className={badgeClasses} className={badgeClasses}
inputRef={this._contextMenuButton} onClick={this.onContextMenuButtonClick}
onClick={this.openMenu}
label={_t("Options")} label={_t("Options")}
isExpanded={this.state.menuDisplayed} isExpanded={isMenuDisplayed}
> >
{ badgeContent } { badgeContent }
</ContextMenuButton> </ContextMenuButton>
@ -143,17 +155,16 @@ export default createReactClass({
} }
const classes = classNames('mx_RoomTile mx_RoomTile_highlight', { const classes = classNames('mx_RoomTile mx_RoomTile_highlight', {
'mx_RoomTile_menuDisplayed': this.state.menuDisplayed, 'mx_RoomTile_menuDisplayed': isMenuDisplayed,
'mx_RoomTile_selected': this.state.selected, 'mx_RoomTile_selected': this.state.selected,
'mx_GroupInviteTile': true, 'mx_GroupInviteTile': true,
}); });
let contextMenu; let contextMenu;
if (this.state.menuDisplayed) { if (isMenuDisplayed) {
const elementRect = this._contextMenuButton.current.getBoundingClientRect();
const GroupInviteTileContextMenu = sdk.getComponent('context_menus.GroupInviteTileContextMenu'); const GroupInviteTileContextMenu = sdk.getComponent('context_menus.GroupInviteTileContextMenu');
contextMenu = ( contextMenu = (
<ContextMenu {...toRightOf(elementRect)} onFinished={this.closeMenu}> <ContextMenu {...toRightOf(this.state.contextMenuPosition)} onFinished={this.closeMenu}>
<GroupInviteTileContextMenu group={this.props.group} onFinished={this.closeMenu} /> <GroupInviteTileContextMenu group={this.props.group} onFinished={this.closeMenu} />
</ContextMenu> </ContextMenu>
); );