Skip to content

fix(material/sidenav): not resetting margin if transition does not start #33001

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

Open
crisbeto wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −11
Open

fix(material/sidenav): not resetting margin if transition does not start #33001

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
23 changes: 12 additions & 11 deletions src/material/sidenav/drawer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,6 @@ export class MatDrawer implements AfterViewInit, OnDestroy {
});
}
}),
renderer.listen(element, 'transitionrun', this._handleTransitionEvent),
renderer.listen(element, 'transitionend', this._handleTransitionEvent),
renderer.listen(element, 'transitioncancel', this._handleTransitionEvent),
];
Expand Down Expand Up @@ -572,6 +571,11 @@ export class MatDrawer implements AfterViewInit, OnDestroy {
// Note: it's important to set this as early as possible,
// otherwise the animation can look glitchy in some cases.
this._setIsAnimating(true);

// Previously we dispatched this in a `transitionrun` event, but it might not fire
// if the element is hidden (see #32992). Since this event is load-bearing for the
// margin calculations, we need it to fire consistently.
setTimeout(() => this._animationStarted.next());
} else {
// Simulate the animation events if animations are disabled.
setTimeout(() => {
Expand Down Expand Up @@ -646,17 +650,13 @@ export class MatDrawer implements AfterViewInit, OnDestroy {

if (event.target === element) {
this._ngZone.run(() => {
if (event.type === 'transitionrun') {
this._animationStarted.next(event);
} else {
// Don't toggle the animating state on `transitioncancel` since another animation should
// start afterwards. This prevents the drawer from blinking if an animation is interrupted.
if (event.type === 'transitionend') {
this._setIsAnimating(false);
}

this._animationEnd.next(event);
// Don't toggle the animating state on `transitioncancel` since another animation should
// start afterwards. This prevents the drawer from blinking if an animation is interrupted.
if (event.type === 'transitionend') {
this._setIsAnimating(false);
}

this._animationEnd.next(event);
});
}
};
Expand Down Expand Up @@ -941,6 +941,7 @@ export class MatDrawerContainer implements AfterContentInit, DoCheck, OnDestroy
* is properly hidden.
*/
private _watchDrawerToggle(drawer: MatDrawer): void {
//
drawer._animationStarted.pipe(takeUntil(this._drawers.changes)).subscribe(() => {
this.updateContentMargins();
this._changeDetectorRef.markForCheck();
Expand Down
Loading