Skip to content

feat(menu): add md-menu standalone component #855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 14, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/components/button/_button-base.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

@import 'variables';
@import 'elevation';
@import 'button-mixins';

// TODO(jelbourn): This goes away.
@import 'default-theme';
Expand Down Expand Up @@ -34,12 +35,7 @@ $md-mini-fab-padding: 8px !default;
position: relative;

// Reset browser <button> styles.
background: transparent;
text-align: center;
cursor: pointer;
user-select: none;
outline: none;
border: none;
@include md-button-reset();

// Make anchors render like buttons.
display: inline-block;
Expand All @@ -52,6 +48,7 @@ $md-mini-fab-padding: 8px !default;
font-family: $md-font-family;
font-weight: 500;
color: currentColor;
text-align: center;

// Sizing.
margin: $md-button-margin;
Expand Down
4 changes: 4 additions & 0 deletions src/components/menu/menu.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<div class="md-menu">
<ng-content></ng-content>
</div>

53 changes: 53 additions & 0 deletions src/components/menu/menu.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
// TODO(kara): update vars for desktop when MD team responds

@import 'variables';
@import 'elevation';
@import 'default-theme';
@import 'button-mixins';
@import 'list-shared';

// menu width must be a multiple of 56px
$md-menu-overlay-min-width: 112px !default; // 56 * 2
$md-menu-overlay-max-width: 280px !default; // 56 * 5

$md-menu-item-height: 48px !default;
$md-menu-font-size: 16px !default;
$md-menu-side-padding: 16px !default;

.md-menu {
@include md-elevation(2);
min-width: $md-menu-overlay-min-width;
max-width: $md-menu-overlay-max-width;

// max height must be 100% of the viewport height + one row height
max-height: calc(100vh + 48px);
overflow: scroll;
-webkit-overflow-scrolling: touch; // for momentum scroll on mobile

background: md-color($md-background, 'background');
}

[md-menu-item] {
@include md-button-reset();
@include md-truncate-line();

display: block;
width: 100%;
height: $md-menu-item-height;
padding: 0 $md-menu-side-padding;

font-size: $md-menu-font-size;
font-family: $md-font-family;
text-align: start;
color: md-color($md-foreground, 'text');

&[disabled] {
color: md-color($md-foreground, 'disabled');
cursor: default;
}

&:hover:not([disabled]) {
background: md-color($md-background, 'hover');
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you swap the hover and disabled styles, I think you won't need the :not since the disabled style will take precedence by coming later.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even if they are different properties? One is for the color and the other for the background

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind, I thought they were for the same property.

}

14 changes: 11 additions & 3 deletions src/components/menu/menu.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
import {Component, ViewEncapsulation} from '@angular/core';
import {Component, Directive, ViewEncapsulation} from '@angular/core';

@Component({
moduleId: module.id,
selector: 'md-menu',
host: {'role': 'menu'},
templateUrl: 'menu.html',
styleUrls: ['menu.css'],
encapsulation: ViewEncapsulation.None
encapsulation: ViewEncapsulation.None,
exportAs: 'mdMenu'
})
export class MdMenu {}

export const MD_MENU_DIRECTIVES = [MdMenu];
@Directive({
selector: '[md-menu-item]',
host: {'role': 'menuitem'}
})
export class MdMenuItem {}

export const MD_MENU_DIRECTIVES = [MdMenu, MdMenuItem];

11 changes: 11 additions & 0 deletions src/core/style/_button-mixins.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/**
* This mixin overrides default button styles like the gray background,
* the border, and the outline.
*/
@mixin md-button-reset {
background: transparent;
cursor: pointer;
user-select: none;
outline: none;
border: none;
}
14 changes: 11 additions & 3 deletions src/core/style/_list-shared.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
/**
* This mixin will ensure that lines that overflow the container will
* hide the overflow and truncate neatly with an ellipsis.
*/
@mixin md-truncate-line() {
white-space: nowrap;
overflow-x: hidden;
text-overflow: ellipsis;
}

/**
* This mixin provides all md-line styles, changing secondary font size
* based on whether the list is in dense mode.
*/
@mixin md-line-base($secondary-font-size) {
[md-line] {
@include md-truncate-line();
display: block;
white-space: nowrap;
overflow-x: hidden;
text-overflow: ellipsis;
box-sizing: border-box;

// all lines but the top line should have smaller text
Expand Down
6 changes: 5 additions & 1 deletion src/demo-app/menu/menu-demo.html
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
menu
<md-menu>
<button md-menu-item>Refresh</button>
<button md-menu-item>Settings</button>
<button md-menu-item disabled>Help</button>
</md-menu>
2 changes: 1 addition & 1 deletion stylelint-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

"unit-case": "lower",
"unit-no-unknown": true,
"unit-whitelist": ["px", "%", "deg", "ms", "em"],
"unit-whitelist": ["px", "%", "deg", "ms", "em", "vh"],

"value-list-comma-space-after": "always-single-line",
"value-list-comma-space-before": "never",
Expand Down