rename TopLeftMenu to TopLeftMenuButton
so the former can be the actual menu
This commit is contained in:
parent
0992408930
commit
5f1cf07543
3 changed files with 84 additions and 7 deletions
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
|||
limitations under the License.
|
||||
*/
|
||||
|
||||
.mx_TopLeftMenu {
|
||||
.mx_TopLeftMenuButton {
|
||||
height: 52px;
|
||||
border-bottom: 1px solid $panel-divider-color;
|
||||
color: $topleftmenu-color;
|
||||
|
@ -22,20 +22,20 @@ limitations under the License.
|
|||
display: flex;
|
||||
}
|
||||
|
||||
.mx_TopLeftMenu_avatar {
|
||||
.mx_TopLeftMenuButton_avatar {
|
||||
position: relative; // to get avatar in the right place
|
||||
margin-left: 15px;
|
||||
margin-right: 15px;
|
||||
margin-top: 14px;
|
||||
}
|
||||
|
||||
.mx_TopLeftMenu_name {
|
||||
.mx_TopLeftMenuButton_name {
|
||||
margin-top: 15px;
|
||||
margin-right: 9px;
|
||||
margin-right: 9px;
|
||||
font-size: 18px;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.mx_TopLeftMenu_chevron {
|
||||
.mx_TopLeftMenuButton_chevron {
|
||||
margin-top: 24px;
|
||||
}
|
|
@ -178,11 +178,11 @@ var LeftPanel = React.createClass({
|
|||
render: function() {
|
||||
const RoomList = sdk.getComponent('rooms.RoomList');
|
||||
const TagPanel = sdk.getComponent('structures.TagPanel');
|
||||
const TopLeftMenu = sdk.getComponent('structures.TopLeftMenu');
|
||||
const TopLeftMenuButton = sdk.getComponent('structures.TopLeftMenuButton');
|
||||
const BottomLeftMenu = sdk.getComponent('structures.BottomLeftMenu');
|
||||
const CallPreview = sdk.getComponent('voip.CallPreview');
|
||||
|
||||
let topBox = <TopLeftMenu collapsed={ this.props.collapsed }/>;
|
||||
let topBox = <TopLeftMenuButton collapsed={ this.props.collapsed }/>;
|
||||
/*
|
||||
if (this.context.matrixClient.isGuest()) {
|
||||
const LoginBox = sdk.getComponent('structures.LoginBox');
|
||||
|
|
77
src/components/structures/TopLeftMenuButton.js
Normal file
77
src/components/structures/TopLeftMenuButton.js
Normal file
|
@ -0,0 +1,77 @@
|
|||
/*
|
||||
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 sdk from '../../index';
|
||||
import * as ContextualMenu from './ContextualMenu';
|
||||
import {TopLeftMenu} from './TopLeftMenu';
|
||||
|
||||
export class TopLeftMenuButton extends React.Component {
|
||||
|
||||
static propTypes = {
|
||||
collapsed: PropTypes.bool.isRequired,
|
||||
};
|
||||
|
||||
static displayName = 'TopLeftMenuButton';
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
this.state = {
|
||||
menuDisplayed: false,
|
||||
};
|
||||
}
|
||||
|
||||
render() {
|
||||
const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
|
||||
const avatarHeight = 28;
|
||||
const name = "My stuff";
|
||||
|
||||
return (
|
||||
<div className="mx_TopLeftMenuButton">
|
||||
<BaseAvatar
|
||||
className="mx_TopLeftMenuButton_avatar"
|
||||
name={name}
|
||||
width={avatarHeight}
|
||||
height={avatarHeight}
|
||||
/>
|
||||
<div className="mx_TopLeftMenuButton_name" onClick={this.onToggleMenu}>
|
||||
{ name }
|
||||
</div>
|
||||
<img className="mx_TopLeftMenuButton_chevron" src="img/topleft-chevron.svg" width="11" height="6" />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
onToggleMenu(e) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
|
||||
const elementRect = e.target.parentElement.getBoundingClientRect();
|
||||
const x = elementRect.left;
|
||||
const y = elementRect.top + elementRect.height;
|
||||
|
||||
ContextualMenu.createMenu(TopLeftMenu, {
|
||||
chevronFace: "none",
|
||||
left: x,
|
||||
top: y,
|
||||
onFinished: () => {
|
||||
this.setState({ menuDisplayed: false });
|
||||
},
|
||||
});
|
||||
this.setState({ menuDisplayed: true });
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue