Merge pull request #2239 from matrix-org/bwindels/topleftmenu1

Redesign: 1st go at top left menu & restyling context menus

res/css/_components.scss

@@ -18,7 +18,7 @@
 @import "./structures/_RoomView.scss";
 @import "./structures/_SearchBox.scss";
 @import "./structures/_TagPanel.scss";
-@import "./structures/_TopLeftMenu.scss";
+@import "./structures/_TopLeftMenuButton.scss";
 @import "./structures/_UploadBar.scss";
 @import "./structures/_UserSettings.scss";
 @import "./structures/_ViewSource.scss";
@@ -27,6 +27,7 @@
 @import "./views/context_menus/_MessageContextMenu.scss";
 @import "./views/context_menus/_RoomTileContextMenu.scss";
 @import "./views/context_menus/_TagTileContextMenu.scss";
+@import "./views/context_menus/_TopLeftMenu.scss";
 @import "./views/dialogs/_BugReportDialog.scss";
 @import "./views/dialogs/_ChangelogDialog.scss";
 @import "./views/dialogs/_ChatCreateOrReuseChatDialog.scss";

res/css/structures/_ContextualMenu.scss

@@ -30,12 +30,11 @@ limitations under the License.
 }
 
 .mx_ContextualMenu {
-    border: solid 1px $menu-border-color;
+    border-radius: 2px;
-    border-radius: 4px;
+    box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.21);
     background-color: $menu-bg-color;
     color: $primary-fg-color;
     position: absolute;
-    padding: 6px;
 	font-size: 14px;
     z-index: 5001;
 }
@@ -44,6 +43,10 @@ limitations under the License.
     right: 8px;
 }
 
+.mx_ContextualMenu_noChevron {
+    border-radius: unset !important;
+}
+
 .mx_ContextualMenu_chevron_right {
     position: absolute;
     right: -8px;
@@ -51,7 +54,7 @@ limitations under the License.
     width: 0;
     height: 0;
     border-top: 8px solid transparent;
-    border-left: 8px solid $menu-border-color;
+    border-left: 8px solid $menu-bg-color;
     border-bottom: 8px solid transparent;
 }
 
@@ -78,7 +81,7 @@ limitations under the License.
     width: 0;
     height: 0;
     border-top: 8px solid transparent;
-    border-right: 8px solid $menu-border-color;
+    border-right: 8px solid $menu-bg-color;
     border-bottom: 8px solid transparent;
 }
 
@@ -105,7 +108,7 @@ limitations under the License.
     width: 0;
     height: 0;
     border-left: 8px solid transparent;
-    border-bottom: 8px solid $menu-border-color;
+    border-bottom: 8px solid $menu-bg-color;
     border-right: 8px solid transparent;
 }
 
@@ -132,7 +135,7 @@ limitations under the License.
     width: 0;
     height: 0;
     border-left: 8px solid transparent;
-    border-top: 8px solid $menu-border-color;
+    border-top: 8px solid $menu-bg-color;
     border-right: 8px solid transparent;
 }
 

res/css/structures/_TopLeftMenuButton.scss

@@ -14,28 +14,31 @@ 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;
     background-color: $primary-bg-color;
     display: flex;
+    align-items: center;
+    min-width: 0;
+    padding: 0 7px;
+    overflow: hidden;
 }
 
-.mx_TopLeftMenu_avatar {
+.mx_TopLeftMenuButton .mx_BaseAvatar {
-    position: relative; // to get avatar in the right place
+    margin: 0 7px;
-    margin-left: 15px;
-    margin-right: 15px;
-    margin-top: 14px;
 }
 
-.mx_TopLeftMenu_name {
+.mx_TopLeftMenuButton_name {
-    margin-top: 15px;
+    margin: 0 7px;
-    margin-right: 9px;   
     font-size: 18px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
     font-weight: 600;
 }
 
-.mx_TopLeftMenu_chevron {
+.mx_TopLeftMenuButton_chevron {
-    margin-top: 24px;
+    margin: 0 7px;
 }

res/css/views/context_menus/_MessageContextMenu.scss

@@ -14,6 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_MessageContextMenu {
+    padding: 6px;
+}
+
 .mx_MessageContextMenu_field {
     padding: 3px 6px 3px 6px;
     cursor: pointer;

res/css/views/context_menus/_RoomTileContextMenu.scss

@@ -14,6 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_RoomTileContextMenu {
+    padding: 6px;
+}
+
 .mx_RoomTileContextMenu_tag_field, .mx_RoomTileContextMenu_leave {
     padding-top: 8px;
     padding-right: 20px;

res/css/views/context_menus/_TopLeftMenu.scss

@@ -0,0 +1,39 @@
+/*
+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_TopLeftMenu {
+    min-width: 180px;
+
+    .mx_TopLeftMenu_section:not(:last-child) {
+        border-bottom: 1px solid $menu-border-color;
+    }
+
+    .mx_TopLeftMenu_section {
+        list-style: none;
+        margin: 5px 0;
+        padding: 0;
+
+        li {
+            white-space: nowrap;
+            padding: 5px 20px;
+        }
+
+        li:hover {
+            background-color: $menu-selected-color;
+        }
+    }
+
+}

res/css/views/rooms/_RoomTooltip.scss

@@ -21,7 +21,7 @@ limitations under the License.
     width: 0;
     height: 0;
     border-top: 8px solid transparent;
-    border-right: 8px solid $menu-border-color;
+    border-right: 8px solid $menu-bg-color;
     border-bottom: 8px solid transparent;
 }
 
@@ -40,8 +40,8 @@ limitations under the License.
 .mx_RoomTooltip {
     display: none;
     position: fixed;
-    border: 1px solid $menu-border-color;
     border-radius: 5px;
+    box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.21);
     background-color: $primary-bg-color;
     z-index: 2000;
     padding: 5px;

res/themes/dark/css/_dark.scss

@@ -1,6 +1,6 @@
 
 // typical text (dark-on-white in light skin)
-$primary-fg-color: #dddddd;
+$primary-fg-color: #212121;
 $primary-bg-color: #2d2d2d;
 
 // used for focusing form controls
@@ -72,9 +72,11 @@ $input-fg-color: $primary-fg-color;
 // context menus
 $menu-border-color: rgba(187, 187, 187, 0.5);
 $menu-bg-color: #373737;
+$menu-selected-color: #f5f8fa;
 
 $avatar-initial-color: #2d2d2d;
 $avatar-bg-color: #ffffff;
+$menu-selected-color: #f5f8fa;
 
 $h3-color: $primary-fg-color;
 

res/themes/dharma/css/_dharma.scss

@@ -76,8 +76,9 @@ $input-underline-color: rgba(151, 151, 151, 0.5);
 $input-fg-color: rgba(74, 74, 74, 0.9);
 
 // context menus
-$menu-border-color: rgba(187, 187, 187, 0.5);
+$menu-border-color: #ebedf8;
-$menu-bg-color: #f6f6f6;
+$menu-bg-color: #fff;
+$menu-selected-color: #f5f8fa;
 
 $avatar-initial-color: #ffffff;
 $avatar-bg-color: #ffffff;

res/themes/light/css/_base.scss

@@ -77,6 +77,7 @@ $input-fg-color: rgba(74, 74, 74, 0.9);
 // context menus
 $menu-border-color: rgba(187, 187, 187, 0.5);
 $menu-bg-color: #f6f6f6;
+$menu-selected-color: #f5f8fa;
 
 $avatar-initial-color: #ffffff;
 $avatar-bg-color: #ffffff;

src/components/structures/ContextualMenu.js

@@ -49,7 +49,7 @@ export default class ContextualMenu extends React.Component {
         menuHeight: PropTypes.number,
         chevronOffset: PropTypes.number,
         menuColour: PropTypes.string,
-        chevronFace: PropTypes.string, // top, bottom, left, right
+        chevronFace: PropTypes.string, // top, bottom, left, right or none
         // Function to be called on menu close
         onFinished: PropTypes.func,
         menuPaddingTop: PropTypes.number,
@@ -113,7 +113,6 @@ export default class ContextualMenu extends React.Component {
     render() {
         const position = {};
         let chevronFace = null;
-
         const props = this.props;
 
         if (props.top) {
@@ -137,6 +136,8 @@ export default class ContextualMenu extends React.Component {
         if (props.chevronFace) {
             chevronFace = props.chevronFace;
         }
+        const hasChevron = chevronFace && chevronFace !== "none";
+
         if (chevronFace === 'top' || chevronFace === 'bottom') {
             chevronOffset.left = props.chevronOffset;
         } else {
@@ -174,11 +175,12 @@ export default class ContextualMenu extends React.Component {
             `;
         }
 
-        const chevron = <div style={chevronOffset} className={"mx_ContextualMenu_chevron_" + chevronFace} />;
+        const chevron = hasChevron ? <div style={chevronOffset} className={"mx_ContextualMenu_chevron_" + chevronFace} /> : undefined;
         const className = 'mx_ContextualMenu_wrapper';
 
         const menuClasses = classNames({
             'mx_ContextualMenu': true,
+            'mx_ContextualMenu_noChevron': chevronFace === 'none',
             'mx_ContextualMenu_left': chevronFace === 'left',
             'mx_ContextualMenu_right': chevronFace === 'right',
             'mx_ContextualMenu_top': chevronFace === 'top',

src/components/structures/LeftPanel.js

@@ -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');

src/components/structures/TopLeftMenu.js

@@ -1,51 +0,0 @@
-/*
-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';
-
-class TopLeftMenu extends React.Component {
-
-    static propTypes = {
-        collapsed: PropTypes.bool.isRequired,
-    };
-
-    static displayName = 'TopLeftMenu';
-
-    render() {
-        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-        const avatarHeight = 28;
-        const name = "My stuff";
-
-        return (
-            <div className="mx_TopLeftMenu">
-                <BaseAvatar
-                    className="mx_TopLeftMenu_avatar"
-                    name={name}
-                    width={avatarHeight}
-                    height={avatarHeight}
-                />
-                <div className="mx_TopLeftMenu_name">
-                    { name }
-                </div>
-                <img className="mx_TopLeftMenu_chevron" src="img/topleft-chevron.svg" width="11" height="6" />
-            </div>
-        );
-    }
-}
-
-module.exports = TopLeftMenu;

src/components/structures/TopLeftMenuButton.js

@@ -0,0 +1,116 @@
+/*
+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 * as ContextualMenu from './ContextualMenu';
+import {TopLeftMenu} from './TopLeftMenu';
+import AccessibleButton from '../views/elements/AccessibleButton';
+import BaseAvatar from '../views/avatars/BaseAvatar';
+import MatrixClientPeg from '../../MatrixClientPeg';
+import Avatar from '../../Avatar';
+
+const AVATAR_SIZE = 28;
+
+export default class TopLeftMenuButton extends React.Component {
+
+    static propTypes = {
+        collapsed: PropTypes.bool.isRequired,
+    };
+
+    static displayName = 'TopLeftMenuButton';
+
+    constructor() {
+        super();
+        this.state = {
+            menuDisplayed: false,
+            profileInfo: null,
+        };
+
+        this.onToggleMenu = this.onToggleMenu.bind(this);
+    }
+
+    async _getProfileInfo() {
+        const cli = MatrixClientPeg.get();
+        const userId = cli.getUserId();
+        const profileInfo = await cli.getProfileInfo(userId);
+        const avatarUrl = Avatar.avatarUrlForUser(
+            {avatarUrl: profileInfo.avatar_url},
+            AVATAR_SIZE, AVATAR_SIZE, "crop");
+
+        return {
+            userId,
+            name: profileInfo.displayname,
+            avatarUrl,
+        };
+    }
+
+    async componentDidMount() {
+        try {
+            const profileInfo = await this._getProfileInfo();
+            this.setState({profileInfo});
+        } catch(ex) {
+            console.log("could not fetch profile");
+            console.error(ex);
+        }
+    }
+
+    render() {
+        const fallbackUserId = MatrixClientPeg.get().getUserId();
+        const profileInfo = this.state.profileInfo;
+        const name = profileInfo ? profileInfo.name : fallbackUserId;
+        let nameElement;
+        if (!this.props.collapsed) {
+            nameElement = <div className="mx_TopLeftMenuButton_name">
+                { name }
+            </div>;
+        }
+
+        return (
+            <AccessibleButton className="mx_TopLeftMenuButton" onClick={this.onToggleMenu}>
+                <BaseAvatar
+                    idName={fallbackUserId}
+                    name={name}
+                    url={profileInfo && profileInfo.avatarUrl}
+                    width={AVATAR_SIZE}
+                    height={AVATAR_SIZE}
+                    resizeMethod="crop"
+                />
+                { nameElement }
+                <img className="mx_TopLeftMenuButton_chevron" src="img/topleft-chevron.svg" width="11" height="6" />
+            </AccessibleButton>
+        );
+    }
+
+    onToggleMenu(e) {
+        e.preventDefault();
+        e.stopPropagation();
+
+        const elementRect = e.currentTarget.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 });
+    }
+}

src/components/views/context_menus/MessageContextMenu.js

@@ -333,7 +333,7 @@ module.exports = React.createClass({
         }
 
         return (
-            <div>
+            <div className="mx_MessageContextMenu">
                 { resendButton }
                 { redactButton }
                 { cancelButton }

src/components/views/context_menus/RoomTileContextMenu.js

@@ -243,7 +243,7 @@ module.exports = React.createClass({
         });
 
         return (
-            <div>
+            <div className="mx_RoomTileContextMenu">
                 <div className="mx_RoomTileContextMenu_notif_picker" >
                     <img src="img/notif-slider.svg" width="20" height="107" />
                 </div>

src/components/views/context_menus/TopLeftMenu.js

@@ -0,0 +1,53 @@
+/*
+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 dis from '../../../dispatcher';
+import { _t } from '../../../languageHandler';
+
+export class TopLeftMenu extends React.Component {
+
+    constructor() {
+        super();
+        this.openSettings = this.openSettings.bind(this);
+        this.signOut = this.signOut.bind(this);
+    }
+
+    render() {
+        return <div className="mx_TopLeftMenu">
+            <ul className="mx_TopLeftMenu_section">
+                <li onClick={this.openSettings}>{_t("Settings")}</li>
+            </ul>
+            <ul className="mx_TopLeftMenu_section">
+                <li onClick={this.signOut}>{_t("Sign out")}</li>
+            </ul>
+        </div>;
+    }
+
+    openSettings() {
+        dis.dispatch({action: 'view_user_settings'});
+        this.closeMenu();
+    }
+
+    signOut() {
+        dis.dispatch({action: 'logout'});
+        this.closeMenu();
+    }
+
+    closeMenu() {
+        if (this.props.onFinished) this.props.onFinished();
+    }
+}