Skip to content

Revert "fix(dialog,bottom-sheet): enter animation blocking child anim… #14017

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
Nov 7, 2018
Merged

Revert "fix(dialog,bottom-sheet): enter animation blocking child anim… #14017

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
22 changes: 4 additions & 18 deletions src/cdk-experimental/dialog/dialog-container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,7 @@
* found in the LICENSE file at https://angular.io/license
*/

import {
animate,
AnimationEvent,
state,
style,
transition,
trigger,
group,
query,
animateChild,
} from '@angular/animations';
import {animate, AnimationEvent, state, style, transition, trigger} from '@angular/animations';
import {FocusTrapFactory} from '@angular/cdk/a11y';
import {
BasePortalOutlet,
Expand Down Expand Up @@ -64,13 +54,9 @@ export function throwDialogContentAlreadyAttachedError() {
changeDetection: ChangeDetectionStrategy.Default,
animations: [
trigger('dialog', [
state('enter', style({opacity: 1})),
state('exit, void', style({opacity: 0})),
transition('* => *', group([
// `animateChild` allows for child component to animate at the same time. See #13870.
query('@*', animateChild(), {optional: true}),
animate(225),
])),
state('enter', style({ opacity: 1 })),
state('exit, void', style({ opacity: 0 })),
transition('* => *', animate(225)),
])
],
host: {
Expand Down
10 changes: 2 additions & 8 deletions src/lib/bottom-sheet/bottom-sheet-animations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ import {
transition,
trigger,
AnimationTriggerMetadata,
group,
query,
animateChild,
} from '@angular/animations';
import {AnimationCurves, AnimationDurations} from '@angular/material/core';

Expand All @@ -28,10 +25,7 @@ export const matBottomSheetAnimations: {
state('visible', style({transform: 'translateY(0%)'})),
transition('visible => void, visible => hidden',
animate(`${AnimationDurations.COMPLEX} ${AnimationCurves.ACCELERATION_CURVE}`)),
transition('void => visible', group([
// `animateChild` allows for child component to animate at the same time. See #13870.
query('@*', animateChild(), {optional: true}),
animate(`${AnimationDurations.EXITING} ${AnimationCurves.DECELERATION_CURVE}`),
]))
transition('void => visible',
animate(`${AnimationDurations.EXITING} ${AnimationCurves.DECELERATION_CURVE}`)),
])
};
12 changes: 3 additions & 9 deletions src/lib/dialog/dialog-animations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ import {
transition,
trigger,
AnimationTriggerMetadata,
query,
animateChild,
group,
} from '@angular/animations';

const animationBody = [
Expand All @@ -23,13 +20,10 @@ const animationBody = [
// decimate the animation performance. Leaving it as `none` solves both issues.
state('void, exit', style({opacity: 0, transform: 'scale(0.7)'})),
state('enter', style({transform: 'none'})),
transition('* => enter', group([
// `animateChild` allows for child component to animate at the same time. See #13870.
query('@*', animateChild(), {optional: true}),
animate('150ms cubic-bezier(0, 0, 0.2, 1)', style({transform: 'none', opacity: 1})),
])),
transition('* => enter', animate('150ms cubic-bezier(0, 0, 0.2, 1)',
style({transform: 'none', opacity: 1}))),
transition('* => void, * => exit',
animate('75ms cubic-bezier(0.4, 0.0, 0.2, 1)', style({opacity: 0}))),
animate('75ms cubic-bezier(0.4, 0.0, 0.2, 1)', style({opacity: 0}))),
];

/**
Expand Down