javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 21:01:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3977 from NativeScript/fix-initial-animations

Browse Source 
Inital animations were not played in android
This commit is contained in:
Panayot Cankov
2017-04-12 11:12:26 +03:00
committed by GitHub
parent 4069bcea02 108f4c287d
commit 837871a3c9
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tns-core-modules/ui/core/view-base/view-base.ts
View File

@ -608,13 +608,19 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
}
public initNativeView(): void {
//
// No initNativeView(this)?
if (this._cssState) {
this._cssState.playPendingKeyframeAnimations();
}
}
public resetNativeView(): void {
if (this.nativeView && this.recycleNativeView && isAndroid) {
resetNativeView(this);
}
if (this._cssState) {
this._cancelAllAnimations();
}
}
public _setupUI(context: android.content.Context, atIndex?: number, parentIsLoaded?: boolean) {

14
tns-core-modules/ui/styling/style-scope.ts
View File

@ -86,6 +86,8 @@ if (application.hasLaunched()) {
}
export class CssState {
private _pendingKeyframeAnimations: SelectorCore[];
constructor(private view: ViewBase, private match: SelectorsMatch<ViewBase>) {
}
@ -103,7 +105,15 @@ export class CssState {
}
matchingSelectors.forEach(s => this.applyDescriptors(s.ruleset));
matchingSelectors.forEach(s => this.playKeyframeAnimations(s.ruleset));
this._pendingKeyframeAnimations = matchingSelectors;
this.playPendingKeyframeAnimations();
}
public playPendingKeyframeAnimations() {
if (this._pendingKeyframeAnimations && this.view.nativeView) {
this._pendingKeyframeAnimations.forEach(s => this.playKeyframeAnimationsFromRuleSet(s.ruleset));
this._pendingKeyframeAnimations = null;
}
}
private applyDescriptors(ruleset: RuleSet): void {
@ -123,7 +133,7 @@ export class CssState {
});
}
private playKeyframeAnimations(ruleset: RuleSet): void {
private playKeyframeAnimationsFromRuleSet(ruleset: RuleSet): void {
let ruleAnimations: kam.KeyframeAnimationInfo[] = ruleset[animationsSymbol];
if (ruleAnimations) {
ensureKeyframeAnimationModule();