refactor: platform specific logic from view common

MartoYankov · web-flow · commit d60e5dace4ed · 2019-05-21T13:42:10.000+03:00
diff --git a/tns-core-modules/ui/core/view/view-common.ts b/tns-core-modules/ui/core/view/view-common.ts
@@ -350,11 +350,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
                     }
                 }
 
-                if (isAndroid || (parent.viewController && parent.viewController.presentedViewController)) {
-                    that._hideNativeModalView(parent, whenClosedCallback);
-                } else {
-                    whenClosedCallback();
-                }
+                that._hideNativeModalView(parent, whenClosedCallback);
             }
         };
     }
diff --git a/tns-core-modules/ui/core/view/view.ios.ts b/tns-core-modules/ui/core/view/view.ios.ts
@@ -452,6 +452,12 @@ export class View extends ViewCommon {
             return;
         }
 
+        // modal view has already been closed by UI, probably as a popover
+        if (!parent.viewController.presentedViewController) {
+            whenClosedCallback();
+            return;
+        }
+
         const parentController = parent.viewController;
         const animated = (<any>this.viewController).animated;
 

Original file line number	Diff line number	Diff line change
`@@ -350,11 +350,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {`
`350`	`350`	`}`
`351`	`351`	`}`
`352`	`352`
`353`		`- if (isAndroid \|\| (parent.viewController && parent.viewController.presentedViewController)) {`
`354`		`- that._hideNativeModalView(parent, whenClosedCallback);`
`355`		`- } else {`
`356`		`- whenClosedCallback();`
`357`		`- }`
	`353`	`+ that._hideNativeModalView(parent, whenClosedCallback);`
`358`	`354`	`}`
`359`	`355`	`};`
`360`	`356`	`}`