From d60e5dace4edfee832267ffcc9d70392e30ebc0e Mon Sep 17 00:00:00 2001
From: Martin Yankov <m.i.yankov@gmail.com>
Date: Tue, 21 May 2019 13:42:10 +0300
Subject: [PATCH] refactor: platform specific logic from view common

---
 tns-core-modules/ui/core/view/view-common.ts | 6 +-----
 tns-core-modules/ui/core/view/view.ios.ts    | 6 ++++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tns-core-modules/ui/core/view/view-common.ts b/tns-core-modules/ui/core/view/view-common.ts
index 166f2205e..ac3ef9f50 100644
--- 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
index 99cd1ad43..c9cbd1abe 100644
--- 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;