Skip to content

fix(material/sidenav): handle mixed sidenav and drawer #33274

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
crisbeto merged 1 commit into from
May 19, 2026
+8 −12
Merged

fix(material/sidenav): handle mixed sidenav and drawer #33274

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions goldens/material/sidenav/index.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export class MatDrawerContainer implements AfterContentInit, DoCheck, OnDestroy
// (undocumented)
_userContent: MatDrawerContent;
// (undocumented)
static ɵcmp: i0.ɵɵComponentDeclaration<MatDrawerContainer, "mat-drawer-container", ["matDrawerContainer"], { "autosize": { "alias": "autosize"; "required": false; }; "hasBackdrop": { "alias": "hasBackdrop"; "required": false; }; }, { "backdropClick": "backdropClick"; }, ["_content", "_allDrawers"], ["mat-drawer", "mat-drawer-content", "*"], true, never>;
static ɵcmp: i0.ɵɵComponentDeclaration<MatDrawerContainer, "mat-drawer-container", ["matDrawerContainer"], { "autosize": { "alias": "autosize"; "required": false; }; "hasBackdrop": { "alias": "hasBackdrop"; "required": false; }; }, { "backdropClick": "backdropClick"; }, ["_content", "_allDrawers"], ["mat-drawer, mat-sidenav", "mat-drawer-content, mat-sidenav-content", "*"], true, never>;
// (undocumented)
static ɵfac: i0.ɵɵFactoryDeclaration<MatDrawerContainer, never>;
}
Expand Down Expand Up @@ -159,7 +159,7 @@ export class MatSidenavContainer extends MatDrawerContainer {
// (undocumented)
_content: MatSidenavContent;
// (undocumented)
static ɵcmp: i0.ɵɵComponentDeclaration<MatSidenavContainer, "mat-sidenav-container", ["matSidenavContainer"], {}, {}, ["_content", "_allDrawers"], ["mat-sidenav", "mat-sidenav-content", "*"], true, never>;
static ɵcmp: i0.ɵɵComponentDeclaration<MatSidenavContainer, "mat-sidenav-container", ["matSidenavContainer"], {}, {}, ["_content", "_allDrawers"], ["mat-drawer, mat-sidenav", "mat-drawer-content, mat-sidenav-content", "*"], true, never>;
// (undocumented)
static ɵfac: i0.ɵɵFactoryDeclaration<MatSidenavContainer, never>;
}
Expand Down
8 changes: 3 additions & 5 deletions src/material/sidenav/drawer-container.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
[class.mat-drawer-shown]="_isShowingBackdrop()"></div>
}

<ng-content select="mat-drawer"></ng-content>

<ng-content select="mat-drawer-content">
</ng-content>
<ng-content select="mat-drawer, mat-sidenav"/>
<ng-content select="mat-drawer-content, mat-sidenav-content"/>

@if (!_content) {
<mat-drawer-content>
<ng-content></ng-content>
<ng-content/>
</mat-drawer-content>
}
8 changes: 3 additions & 5 deletions src/material/sidenav/sidenav-container.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
[class.mat-drawer-shown]="_isShowingBackdrop()"></div>
}

<ng-content select="mat-sidenav"></ng-content>

<ng-content select="mat-sidenav-content">
</ng-content>
<ng-content select="mat-drawer, mat-sidenav"/>
<ng-content select="mat-drawer-content, mat-sidenav-content"/>

@if (!_content) {
<mat-sidenav-content>
<ng-content></ng-content>
<ng-content/>
</mat-sidenav-content>
}
Loading