Skip to content

fix(sidenav): content margins not updated on viewport changes #14089

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
merged 1 commit into from
Dec 6, 2018
Merged

fix(sidenav): content margins not updated on viewport changes #14089

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
17 changes: 15 additions & 2 deletions src/lib/sidenav/drawer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {Directionality} from '@angular/cdk/bidi';
import {coerceBooleanProperty} from '@angular/cdk/coercion';
import {ESCAPE} from '@angular/cdk/keycodes';
import {Platform} from '@angular/cdk/platform';
import {CdkScrollable, ScrollDispatcher} from '@angular/cdk/scrolling';
import {CdkScrollable, ScrollDispatcher, ViewportRuler} from '@angular/cdk/scrolling';
import {DOCUMENT} from '@angular/common';
import {
AfterContentChecked,
Expand Down Expand Up @@ -502,7 +502,12 @@ export class MatDrawerContainer implements AfterContentInit, DoCheck, OnDestroy
private _ngZone: NgZone,
private _changeDetectorRef: ChangeDetectorRef,
@Inject(MAT_DRAWER_DEFAULT_AUTOSIZE) defaultAutosize = false,
@Optional() @Inject(ANIMATION_MODULE_TYPE) private _animationMode?: string) {
@Optional() @Inject(ANIMATION_MODULE_TYPE) private _animationMode?: string,
/**
* @deprecated viewportRuler to become a required parameter.
* @breaking-change 8.0.0
*/
@Optional() viewportRuler?: ViewportRuler) {

// If a `Dir` directive exists up the tree, listen direction changes
// and update the left/right properties to point to the proper start/end.
Expand All @@ -513,6 +518,14 @@ export class MatDrawerContainer implements AfterContentInit, DoCheck, OnDestroy
});
}

// Since the minimum width of the sidenav depends on the viewport width,
// we need to recompute the margins if the viewport changes.
if (viewportRuler) {
viewportRuler.change()
.pipe(takeUntil(this._destroyed))
.subscribe(() => this._updateContentMargins());
}

this._autosize = defaultAutosize;
}

Expand Down