Skip to content

fix(animations): enable routable animations #926

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
vakrilov merged 1 commit into from
Aug 2, 2017
Merged

fix(animations): enable routable animations #926

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
13 changes: 9 additions & 4 deletions nativescript-angular/animations/animation-driver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { AnimationPlayer } from "@angular/animations";
import { AnimationDriver } from "@angular/animations/browser";
import { ProxyViewContainer } from "tns-core-modules/ui/proxy-view-container";
import { eachDescendant } from "tns-core-modules/ui/core/view";

import { NativeScriptAnimationPlayer } from "./animation-player";
Expand Down Expand Up @@ -177,14 +178,18 @@ function queryDescendants(
// skip comment and text nodes
// because they are not actual Views
// and cannot be animated
if (element instanceof InvisibleNode) {
if (element instanceof InvisibleNode || !selector.match(element)) {
return true;
}

if (selector.match(element)) {
if (element instanceof ProxyViewContainer) {
element.eachChild((child: NgView) => {
result.matches.push(child);
return true;
});
} else {
result.matches.push(element);
return multi;
}

return true;
return multi;
}