Skip to content

Commit 2f4e05c

Browse files
karatinayuangao
authored andcommitted
chore(menu): update menu position attributes to be camelCase (#3515)
1 parent 79db43d commit 2f4e05c

File tree

4 files changed

+30
-12
lines changed

4 files changed

+30
-12
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</button>
3939
</md-toolbar>
4040

41-
<md-menu x-position="before" #posXMenu="mdMenu" class="before">
41+
<md-menu xPosition="before" #posXMenu="mdMenu" class="before">
4242
<button md-menu-item *ngFor="let item of iconItems" [disabled]="item.disabled">
4343
<md-icon>{{ item.icon }}</md-icon>
4444
{{ item.text }}
@@ -55,7 +55,7 @@
5555
</button>
5656
</md-toolbar>
5757

58-
<md-menu y-position="above" #posYMenu="mdMenu">
58+
<md-menu yPosition="above" #posYMenu="mdMenu">
5959
<button md-menu-item *ngFor="let item of items" [disabled]="item.disabled">
6060
{{ item.text }}
6161
</button>
@@ -89,7 +89,7 @@
8989
</button>
9090
</md-toolbar>
9191

92-
<md-menu x-position="before" [overlapTrigger]="false" #posXMenuOverlay="mdMenu" class="before">
92+
<md-menu xPosition="before" [overlapTrigger]="false" #posXMenuOverlay="mdMenu" class="before">
9393
<button md-menu-item *ngFor="let item of iconItems" [disabled]="item.disabled">
9494
<md-icon>{{ item.icon }}</md-icon>
9595
{{ item.text }}
@@ -106,7 +106,7 @@
106106
</button>
107107
</md-toolbar>
108108

109-
<md-menu y-position="above" [overlapTrigger]="false" #posYMenuOverlay="mdMenu">
109+
<md-menu yPosition="above" [overlapTrigger]="false" #posYMenuOverlay="mdMenu">
110110
<button md-menu-item *ngFor="let item of items" [disabled]="item.disabled">
111111
{{ item.text }}
112112
</button>

src/e2e-app/menu/menu-e2e.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<button [mdMenuTriggerFor]="menu" id="trigger">TRIGGER</button>
66
<button [mdMenuTriggerFor]="menu" id="trigger-two">TRIGGER 2</button>
77

8-
<md-menu #menu="mdMenu" y-position="below" class="custom">
8+
<md-menu #menu="mdMenu" yPosition="below" class="custom">
99
<button md-menu-item (click)="selected='one'">One</button>
1010
<button md-menu-item (click)="selected='two'">Two</button>
1111
<button md-menu-item (click)="selected='three'" disabled>Three</button>
@@ -15,20 +15,20 @@
1515
<button [mdMenuTriggerFor]="beforeMenu" id="before-t">
1616
BEFORE
1717
</button>
18-
<md-menu x-position="before" y-position="below" class="before" #beforeMenu="mdMenu">
18+
<md-menu xPosition="before" yPosition="below" class="before" #beforeMenu="mdMenu">
1919
<button md-menu-item>Item</button>
2020
</md-menu>
2121

2222
<div class="bottom-row">
2323
<button [mdMenuTriggerFor]="aboveMenu" id="above-t">ABOVE</button>
24-
<md-menu y-position="above" class="above" #aboveMenu="mdMenu">
24+
<md-menu yPosition="above" class="above" #aboveMenu="mdMenu">
2525
<button md-menu-item>Item</button>
2626
</md-menu>
2727

2828
<button [mdMenuTriggerFor]="combined" id="combined-t">
2929
BOTH
3030
</button>
31-
<md-menu x-position="before" y-position="above" class="combined" #combined="mdMenu">
31+
<md-menu xPosition="before" yPosition="above" class="combined" #combined="mdMenu">
3232
<button md-menu-item>Item</button>
3333
</md-menu>
3434

src/lib/menu/menu-directive.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,15 @@ export class MdMenu implements AfterContentInit, MdMenuPanel, OnDestroy {
5454
@ContentChildren(MdMenuItem) items: QueryList<MdMenuItem>;
5555
@Input() overlapTrigger = true;
5656

57-
constructor(@Attribute('x-position') posX: MenuPositionX,
58-
@Attribute('y-position') posY: MenuPositionY) {
57+
constructor(@Attribute('xPosition') posX: MenuPositionX,
58+
@Attribute('yPosition') posY: MenuPositionY,
59+
@Attribute('x-position') deprecatedPosX: MenuPositionX,
60+
@Attribute('y-position') deprecatedPosY: MenuPositionY) {
61+
62+
// TODO(kara): Remove kebab-case attributes after next release
63+
if (deprecatedPosX) { this._setPositionX(deprecatedPosX); }
64+
if (deprecatedPosY) { this._setPositionY(deprecatedPosY); }
65+
5966
if (posX) { this._setPositionX(posX); }
6067
if (posY) { this._setPositionY(posY); }
6168
this.setPositionClasses(this.positionX, this.positionY);

src/lib/menu/menu.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
By itself, the `<md-menu>` element does not render anything. The menu is attached to and opened
66
via application of the `mdMenuTriggerFor` directive:
7-
```ts
7+
```html
88
<md-menu #appMenu="mdMenu">
99
<button md-menu-item> Settings </button>
1010
<button md-menu-item> Help </button>
@@ -53,9 +53,20 @@ Menus support displaying `md-icon` elements before the menu item text.
5353
### Customizing menu position
5454

5555
By default, the menu will display below (y-axis), after (x-axis), and overlapping its trigger. The position can be changed
56-
using the `x-position` (`before | after`) and `y-position` (`above | below`) attributes.
56+
using the `xPosition` (`before | after`) and `yPosition` (`above | below`) attributes.
5757
The menu can be be forced to not overlap the trigger using `[overlapTrigger]="false"` attribute.
5858

59+
```html
60+
<md-menu #appMenu="mdMenu" yPosition="above">
61+
<button md-menu-item> Settings </button>
62+
<button md-menu-item> Help </button>
63+
</md-menu>
64+
65+
<button md-icon-button [mdMenuTriggerFor]="appMenu">
66+
<md-icon>more_vert</md-icon>
67+
</button>
68+
```
69+
5970

6071
### Keyboard interaction
6172
- <kbd>DOWN_ARROW</kbd>: Focuses the next menu item

0 commit comments

Comments
 (0)