Skip to content
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

Jump to bottom

Fixed router transitions/animations #498

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed router transitions/animations #498

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
154b7e6
Fixed broken router transitions/animations
dyingangel666 Nov 7, 2019
9b6a8b0
Merge pull request #1 from dyingangel666/dyingangel666-patch-1
dyingangel666 Nov 7, 2019
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
13 changes: 10 additions & 3 deletions projects/angular-ngrx-material-starter/src/app/core/animations/route.animations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ import { AnimationsService } from './animations.service';
export const ROUTE_ANIMATIONS_ELEMENTS = 'route-animations-elements';

const STEPS_ALL: any[] = [
query(':leave > *', style({opacity: 1, position: 'static'}), {
optional: true
}),
query(':enter > *', style({ opacity: 0, position: 'fixed' }), {
optional: true
}),
Expand Down Expand Up @@ -45,7 +48,11 @@ const STEPS_ALL: any[] = [
)
],
{ optional: true }
)
),
query(':enter > *', [
style({position: 'static'})
],
{optional: true})
]),
query(
':enter .' + ROUTE_ANIMATIONS_ELEMENTS,
Expand All @@ -60,8 +67,8 @@ const STEPS_ALL: any[] = [
)
];
const STEPS_NONE = [];
const STEPS_PAGE = [STEPS_ALL[0], STEPS_ALL[2]];
const STEPS_ELEMENTS = [STEPS_ALL[1], STEPS_ALL[3]];
const STEPS_PAGE = [STEPS_ALL[0], STEPS_ALL[1], STEPS_ALL[3]];
const STEPS_ELEMENTS = [STEPS_ALL[2], STEPS_ALL[4]];

export const routeAnimations = trigger('routeAnimations', [
transition(isRouteAnimationsAll, STEPS_ALL),
Expand Down