Skip to content

Commit 8bfb6c5

Browse files
committed
feat(menu): Added ability to show the menu overlay around the menu trigger
1 parent ed3ffe0 commit 8bfb6c5

File tree

6 files changed

+74
-10
lines changed

6 files changed

+74
-10
lines changed

src/demo-app/menu/menu-demo.html

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,54 @@
6262
</md-menu>
6363
</div>
6464
</div>
65+
66+
<div class="demo-menu">
67+
<div class="menu-section">
68+
<p>overlap-trigger: false</p>
69+
70+
<md-toolbar>
71+
<button md-icon-button [md-menu-trigger-for]="menuOverlay">
72+
<md-icon>more_vert</md-icon>
73+
</button>
74+
</md-toolbar>
75+
76+
<md-menu overlap-trigger="false" #menuOverlay="mdMenu">
77+
<button md-menu-item *ngFor="let item of items" [disabled]="item.disabled">
78+
{{ item.text }}
79+
</button>
80+
</md-menu>
81+
</div>
82+
<div class="menu-section">
83+
<p>
84+
Position x: before, overlap-trigger: false
85+
</p>
86+
<md-toolbar class="end-icon">
87+
<button md-icon-button [md-menu-trigger-for]="posXMenuOverlay">
88+
<md-icon>more_vert</md-icon>
89+
</button>
90+
</md-toolbar>
91+
92+
<md-menu x-position="before" overlap-trigger="false" #posXMenuOverlay="mdMenu" class="before">
93+
<button md-menu-item *ngFor="let item of iconItems" [disabled]="item.disabled">
94+
<md-icon>{{ item.icon }}</md-icon>
95+
{{ item.text }}
96+
</button>
97+
</md-menu>
98+
</div>
99+
<div class="menu-section">
100+
<p>
101+
Position y: above, overlap-trigger: false
102+
</p>
103+
<md-toolbar>
104+
<button md-icon-button [md-menu-trigger-for]="posYMenuOverlay">
105+
<md-icon>more_vert</md-icon>
106+
</button>
107+
</md-toolbar>
108+
109+
<md-menu y-position="above" overlap-trigger="false" #posYMenuOverlay="mdMenu">
110+
<button md-menu-item *ngFor="let item of items" [disabled]="item.disabled">
111+
{{ item.text }}
112+
</button>
113+
</md-menu>
114+
</div>
115+
</div>

src/lib/menu/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ Output:
115115
### Customizing menu position
116116

117117
By default, the menu will display after and below its trigger. You can change this display position
118-
using the `x-position` (`before | after`) and `y-position` (`above | below`) attributes.
118+
using the `x-position` (`before | after`) and `y-position` (`above | below`) attributes. The menu
119+
can be positioned over the menu button or outside using `overlap-trigger` (`true | false`).
119120

120121
*my-comp.html*
121122
```html
@@ -148,6 +149,7 @@ also adds `aria-hasPopup="true"` to the trigger element.
148149
| --- | --- | --- |
149150
| `x-position` | `before | after` | The horizontal position of the menu in relation to the trigger. Defaults to `after`. |
150151
| `y-position` | `above | below` | The vertical position of the menu in relation to the trigger. Defaults to `below`. |
152+
| `overlap-trigger` | `true | false` | Whether to have the menu show on top of the menu trigger or outside. Defaults to `true`. |
151153

152154
### Trigger Programmatic API
153155

src/lib/menu/menu-directive.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ export class MdMenu implements AfterContentInit, MdMenuPanel, OnDestroy {
5454
@ContentChildren(MdMenuItem) items: QueryList<MdMenuItem>;
5555

5656
constructor(@Attribute('x-position') posX: MenuPositionX,
57-
@Attribute('y-position') posY: MenuPositionY) {
57+
@Attribute('y-position') posY: MenuPositionY,
58+
@Attribute('overlap-trigger') public overlapTrigger = true) {
5859
if (posX) { this._setPositionX(posX); }
5960
if (posY) { this._setPositionY(posY); }
6061
this.setPositionClasses(this.positionX, this.positionY);

src/lib/menu/menu-panel.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {MenuPositionX, MenuPositionY} from './menu-positions';
44
export interface MdMenuPanel {
55
positionX: MenuPositionX;
66
positionY: MenuPositionY;
7+
overlapTrigger: boolean;
78
templateRef: TemplateRef<any>;
89
close: EventEmitter<void>;
910
focusFirstItem: () => void;

src/lib/menu/menu-trigger.ts

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -230,21 +230,29 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
230230
const [posX, fallbackX]: HorizontalConnectionPos[] =
231231
this.menu.positionX === 'before' ? ['end', 'start'] : ['start', 'end'];
232232

233-
const [posY, fallbackY]: VerticalConnectionPos[] =
233+
const [overlayY, fallbackOverlayY]: VerticalConnectionPos[] =
234234
this.menu.positionY === 'above' ? ['bottom', 'top'] : ['top', 'bottom'];
235235

236+
let originY = overlayY;
237+
let fallbackOriginY = fallbackOverlayY;
238+
239+
if (this.menu.overlapTrigger) {
240+
originY = overlayY === 'top' ? 'bottom' : 'top';
241+
fallbackOriginY = fallbackOverlayY === 'top' ? 'bottom' : 'top';
242+
}
243+
236244
return this._overlay.position()
237245
.connectedTo(this._element,
238-
{originX: posX, originY: posY}, {overlayX: posX, overlayY: posY})
246+
{originX: posX, originY: originY}, {overlayX: posX, overlayY: overlayY})
239247
.withFallbackPosition(
240-
{originX: fallbackX, originY: posY},
241-
{overlayX: fallbackX, overlayY: posY})
248+
{originX: fallbackX, originY: originY},
249+
{overlayX: fallbackX, overlayY: overlayY})
242250
.withFallbackPosition(
243-
{originX: posX, originY: fallbackY},
244-
{overlayX: posX, overlayY: fallbackY})
251+
{originX: posX, originY: fallbackOriginY},
252+
{overlayX: posX, overlayY: fallbackOverlayY})
245253
.withFallbackPosition(
246-
{originX: fallbackX, originY: fallbackY},
247-
{overlayX: fallbackX, overlayY: fallbackY});
254+
{originX: fallbackX, originY: fallbackOriginY},
255+
{overlayX: fallbackX, overlayY: fallbackOverlayY});
248256
}
249257

250258
private _cleanUpSubscriptions(): void {

src/lib/menu/menu.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ class PositionedMenu {
321321
class CustomMenuPanel implements MdMenuPanel {
322322
positionX: MenuPositionX = 'after';
323323
positionY: MenuPositionY = 'below';
324+
overlapTrigger: true;
324325

325326
@ViewChild(TemplateRef) templateRef: TemplateRef<any>;
326327
@Output() close = new EventEmitter<void>();

0 commit comments

Comments
 (0)