Fix crash on API17 and API21-25

Hristo Hristov · Hristo Hristov · commit 0abfb1493c3b · 2017-12-15T13:08:15.000+02:00
diff --git a/tests/app/ui/view/view-tests-common.ts b/tests/app/ui/view/view-tests-common.ts
@@ -280,7 +280,6 @@ const customShortHandProperty = new ShorthandProperty<Style, string>({
     name: "customShortHand",
     cssName: "custom-short-hand",
     converter(value: string): [CssProperty<any, any>, any][] {
-        console.log("Convert: " + value);
         const values = value.split(",");
         return [
             [customCssAProperty, values[0]],
diff --git a/tns-core-modules/ui/frame/fragment.transitions.android.ts b/tns-core-modules/ui/frame/fragment.transitions.android.ts
@@ -204,10 +204,11 @@ export function _onFragmentCreateAnimator(entry: ExpandedEntry, fragment: androi
 
     if (!animator && sdkVersion() >= 21) {
         const view = fragment.getView();
-        const parent = view.getParent();
+        const jsParent = entry.resolvedPage.parent;
+        const parent = view.getParent() || (jsParent && jsParent.nativeViewProtected);
         const animatedEntries = _getAnimatedEntries(entry.frameId);
         if (!animatedEntries || !animatedEntries.has(entry)) {
-            if (!(<any>parent).isLaidOut()) {
+            if (parent && !(<any>parent).isLaidOut()) {
                 animator = enter ? entry.defaultEnterAnimator : entry.defaultExitAnimator;
             }
         }
diff --git a/tns-core-modules/ui/tab-view/tab-view.android.ts b/tns-core-modules/ui/tab-view/tab-view.android.ts
@@ -185,6 +185,7 @@ function initializeNativeClasses() {
                     (<any>this.mCurTransaction).commitNowAllowingStateLoss();
                 } else {
                     this.mCurTransaction.commitAllowingStateLoss();
+                    this.owner._getFragmentManager().executePendingTransactions();
                 }
 
                 this.mCurTransaction = null;

Original file line number	Diff line number	Diff line change
`@@ -204,10 +204,11 @@ export function _onFragmentCreateAnimator(entry: ExpandedEntry, fragment: androi`
`204`	`204`
`205`	`205`	`if (!animator && sdkVersion() >= 21) {`
`206`	`206`	`const view = fragment.getView();`
`207`		`- const parent = view.getParent();`
	`207`	`+ const jsParent = entry.resolvedPage.parent;`
	`208`	`+ const parent = view.getParent() \|\| (jsParent && jsParent.nativeViewProtected);`
`208`	`209`	`const animatedEntries = _getAnimatedEntries(entry.frameId);`
`209`	`210`	`if (!animatedEntries \|\| !animatedEntries.has(entry)) {`
`210`		`- if (!(<any>parent).isLaidOut()) {`
	`211`	`+ if (parent && !(<any>parent).isLaidOut()) {`
`211`	`212`	`animator = enter ? entry.defaultEnterAnimator : entry.defaultExitAnimator;`
`212`	`213`	`}`
`213`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,7 @@ function initializeNativeClasses() {`
`185`	`185`	`(<any>this.mCurTransaction).commitNowAllowingStateLoss();`
`186`	`186`	`} else {`
`187`	`187`	`this.mCurTransaction.commitAllowingStateLoss();`
	`188`	`+ this.owner._getFragmentManager().executePendingTransactions();`
`188`	`189`	`}`
`189`	`190`
`190`	`191`	`this.mCurTransaction = null;`