Skip to content

chore: revert #9971 #10091

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.

Sign up for GitHub

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
josephperrott merged 1 commit into from
Feb 22, 2018
Merged

chore: revert #9971 #10091

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
chore: revert #9971 
Reverts the changes from #9971, because they break the case where a mat-menu is placed inside another mat-menu, causing the keyboard controls to be thrown off and nested menus not to work. Having a solution that supports both cases will require moving some more code around.

Fixes #10081.
  • Loading branch information
@crisbeto
crisbeto committed Feb 22, 2018
commit 1b4e9e9abc7e2e530aea4b1bda697aee5dadff45
2 changes: 1 addition & 1 deletion src/lib/menu/menu-directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export class MatMenu implements OnInit, AfterContentInit, MatMenuPanel, OnDestro
@ViewChild(TemplateRef) templateRef: TemplateRef<any>;

/** List of the items inside of a menu. */
@ContentChildren(MatMenuItem, {descendants: true}) items: QueryList<MatMenuItem>;
@ContentChildren(MatMenuItem) items: QueryList<MatMenuItem>;

/**
* Menu content that will be rendered lazily.
Expand Down