From e59d1567a5938b7b367de1054a27fb80cf170f40 Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <a.djenkov90@gmail.com>
Date: Tue, 29 May 2018 18:06:02 +0300
Subject: [PATCH] fix(ios-dialogs): unable to show dialog from modal view
 without a page (#5881)

* fix(ios-dialogs): unable to show dialog from modal view

* tests(modal-navigation): add test that opens dialog inside modal view
---
 e2e/modal-navigation/app/home/home-page.ts    |  9 ++++++
 e2e/modal-navigation/app/home/home-page.xml   |  1 +
 e2e/modal-navigation/app/layout-root.ios.ts   |  1 +
 e2e/modal-navigation/app/layout-root.ios.xml  |  1 +
 .../app/modal-no-page/modal-no-page.ts        | 28 +++++++++++++++++++
 .../app/modal-no-page/modal-no-page.xml       |  4 +++
 e2e/modal-navigation/app/modal/modal-page.ts  | 15 ++++++++++
 e2e/modal-navigation/app/modal/modal-page.xml |  1 +
 tns-core-modules/ui/core/view/view.d.ts       |  1 +
 tns-core-modules/ui/core/view/view.ios.ts     | 23 +++++++--------
 tns-core-modules/ui/dialogs/dialogs.ios.ts    | 22 +++++++++++----
 11 files changed, 90 insertions(+), 16 deletions(-)
 create mode 100644 e2e/modal-navigation/app/modal-no-page/modal-no-page.ts
 create mode 100644 e2e/modal-navigation/app/modal-no-page/modal-no-page.xml

diff --git a/e2e/modal-navigation/app/home/home-page.ts b/e2e/modal-navigation/app/home/home-page.ts
index 7c37d2b84..6537e5b79 100644
--- a/e2e/modal-navigation/app/home/home-page.ts
+++ b/e2e/modal-navigation/app/home/home-page.ts
@@ -20,6 +20,15 @@ export function onNavigatedFrom(args: NavigatedData) {
     console.log("home-page onNavigatedFrom");
 }
 
+export function onModalNoPage(args: EventData) {
+    const view = args.object as View;
+
+    view.showModal("modal-no-page/modal-no-page",
+        "context",
+        () => console.log("home-page modal frame closed"),
+        false);
+}
+
 export function onModalFrame(args: EventData) {
     const view = args.object as View;
 
diff --git a/e2e/modal-navigation/app/home/home-page.xml b/e2e/modal-navigation/app/home/home-page.xml
index 805df0ab5..4abbc0488 100644
--- a/e2e/modal-navigation/app/home/home-page.xml
+++ b/e2e/modal-navigation/app/home/home-page.xml
@@ -10,6 +10,7 @@
     </ActionBar>
 
     <StackLayout>
+        <Button text="Show Modal Without Page" tap="onModalNoPage" />
         <Button text="Show Modal Page With Frame" tap="onModalFrame" />
         <Button text="Show Modal Page" tap="onModalPage" />
         <Button text="Show Modal Layout" tap="onModalLayout" />
diff --git a/e2e/modal-navigation/app/layout-root.ios.ts b/e2e/modal-navigation/app/layout-root.ios.ts
index 403480d1e..2fa6b9ac8 100644
--- a/e2e/modal-navigation/app/layout-root.ios.ts
+++ b/e2e/modal-navigation/app/layout-root.ios.ts
@@ -1,4 +1,5 @@
 export {
+    onModalNoPage,
     onModalFrame,
     onModalPage,
     onModalLayout,
diff --git a/e2e/modal-navigation/app/layout-root.ios.xml b/e2e/modal-navigation/app/layout-root.ios.xml
index 40d6d68bd..eb544ab8f 100644
--- a/e2e/modal-navigation/app/layout-root.ios.xml
+++ b/e2e/modal-navigation/app/layout-root.ios.xml
@@ -1,5 +1,6 @@
 <StackLayout>
     <Label text="Home" horizontalAlignment="center" />
+    <Button text="Show Modal Without Page" tap="onModalNoPage" />
     <Button text="Show Modal Page With Frame" tap="onModalFrame" />
     <Button text="Show Modal Page" tap="onModalPage" />
     <Button text="Show Modal Layout" tap="onModalLayout" />
diff --git a/e2e/modal-navigation/app/modal-no-page/modal-no-page.ts b/e2e/modal-navigation/app/modal-no-page/modal-no-page.ts
new file mode 100644
index 000000000..88395c2b7
--- /dev/null
+++ b/e2e/modal-navigation/app/modal-no-page/modal-no-page.ts
@@ -0,0 +1,28 @@
+import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
+import { NavigatedData, Page } from "tns-core-modules/ui/page";
+import { View, EventData } from "tns-core-modules/ui/core/view";
+import { Frame, ShownModallyData } from "tns-core-modules/ui/frame";
+import { fromObject } from "tns-core-modules/data/observable";
+import { confirm } from "ui/dialogs";
+
+export function onLoaded(args) {
+    console.log("modal-no-page loaded");
+}
+
+export function closeModal(args: EventData) {
+    (args.object as View).closeModal();
+}
+
+export function showDialog(args: EventData) {
+    let options = {
+        title: "Dialog",
+        message: "Message",
+        okButtonText: "Yes",
+        cancelButtonText: "No"
+
+    }
+
+    confirm(options).then((result: boolean) => {
+        console.log(result);
+    })
+}
\ No newline at end of file
diff --git a/e2e/modal-navigation/app/modal-no-page/modal-no-page.xml b/e2e/modal-navigation/app/modal-no-page/modal-no-page.xml
new file mode 100644
index 000000000..dde7de6cb
--- /dev/null
+++ b/e2e/modal-navigation/app/modal-no-page/modal-no-page.xml
@@ -0,0 +1,4 @@
+<StackLayout backgroundColor="lightGreen" loaded="onLoaded">
+    <Button text="Show Dialog" tap="showDialog"/>
+    <Button text="Close Modal" tap="closeModal" />
+</StackLayout>
diff --git a/e2e/modal-navigation/app/modal/modal-page.ts b/e2e/modal-navigation/app/modal/modal-page.ts
index d35dfdbb4..c191dfe95 100644
--- a/e2e/modal-navigation/app/modal/modal-page.ts
+++ b/e2e/modal-navigation/app/modal/modal-page.ts
@@ -3,6 +3,7 @@ import { NavigatedData, Page } from "tns-core-modules/ui/page";
 import { View, EventData } from "tns-core-modules/ui/core/view";
 import { Frame, ShownModallyData } from "tns-core-modules/ui/frame";
 import { fromObject } from "tns-core-modules/data/observable";
+import { confirm } from "ui/dialogs";
 
 export function onShowingModally(args: ShownModallyData) {
     console.log("modal-page showingModally");
@@ -64,4 +65,18 @@ export function onNavigate(args: EventData) {
     const view = args.object as View;
     const page = view.page as Page;
     page.frame.navigate("modal-second/modal-second-page");
+}
+
+export function showDialog(args: EventData) {
+    let options = {
+        title: "Dialog",
+        message: "Message",
+        okButtonText: "Yes",
+        cancelButtonText: "No"
+
+    }
+
+    confirm(options).then((result: boolean) => {
+        console.log(result);
+    })
 }
\ No newline at end of file
diff --git a/e2e/modal-navigation/app/modal/modal-page.xml b/e2e/modal-navigation/app/modal/modal-page.xml
index d5c4941ea..c7350b4a6 100644
--- a/e2e/modal-navigation/app/modal/modal-page.xml
+++ b/e2e/modal-navigation/app/modal/modal-page.xml
@@ -10,6 +10,7 @@
 
     <StackLayout backgroundColor="lightGreen">
         <Button text="Navigate To Second Page" tap="onNavigate" visibility="{{ navigationVisibility }}" />
+        <Button text="Show Dialog" tap="showDialog" />
         <Button text="Show Nested Modal Page With Frame" tap="showNestedModalFrame" />
         <Button text="Show Nested Modal Page" tap="showNestedModalPage" />
         <Button text="Close Modal" tap="closeModal" />
diff --git a/tns-core-modules/ui/core/view/view.d.ts b/tns-core-modules/ui/core/view/view.d.ts
index bb267f0fa..f040ce2e6 100644
--- a/tns-core-modules/ui/core/view/view.d.ts
+++ b/tns-core-modules/ui/core/view/view.d.ts
@@ -775,6 +775,7 @@ export const isEnabledProperty: Property<View, boolean>;
 export const isUserInteractionEnabledProperty: Property<View, boolean>;
 
 export namespace ios {
+    export function getParentWithViewController(parent: View): View
     export function isContentScrollable(controller: any /* UIViewController */, owner: View): boolean
     export function updateAutoAdjustScrollInsets(controller: any /* UIViewController */, owner: View): void
     export function updateConstraints(controller: any /* UIViewController */, owner: View): void;
diff --git a/tns-core-modules/ui/core/view/view.ios.ts b/tns-core-modules/ui/core/view/view.ios.ts
index fc47597a3..d4b139b7f 100644
--- a/tns-core-modules/ui/core/view/view.ios.ts
+++ b/tns-core-modules/ui/core/view/view.ios.ts
@@ -308,18 +308,8 @@ export class View extends ViewCommon {
         return this._suspendCATransaction || this._suspendNativeUpdatesCount;
     }
 
-    private getParentWithViewController(parent: View): View {
-        let view = parent;
-        let controller = view.viewController;
-        while (!controller) {
-            view = view.parent as View;
-            controller = view.viewController;
-        }
-
-        return view;
-    }
     protected _showNativeModalView(parent: View, context: any, closeCallback: Function, fullscreen?: boolean, animated?: boolean, stretched?: boolean) {
-        let parentWithController = this.getParentWithViewController(parent);
+        let parentWithController = ios.getParentWithViewController(parent);
 
         super._showNativeModalView(parentWithController, context, closeCallback, fullscreen, stretched);
         let controller = this.viewController;
@@ -592,6 +582,17 @@ export class CustomLayoutView extends View {
 }
 
 export namespace ios {
+    export function getParentWithViewController(parent: View): View {
+        let view = parent;
+        let controller = view.viewController;
+        while (!controller) {
+            view = view.parent as View;
+            controller = view.viewController;
+        }
+
+        return view;
+    }
+
     export function isContentScrollable(controller: UIViewController, owner: View): boolean {
         let scrollableContent = (<any>owner).scrollableContent;
         if (scrollableContent === undefined) {
diff --git a/tns-core-modules/ui/dialogs/dialogs.ios.ts b/tns-core-modules/ui/dialogs/dialogs.ios.ts
index a38ee792e..cb4da410c 100644
--- a/tns-core-modules/ui/dialogs/dialogs.ios.ts
+++ b/tns-core-modules/ui/dialogs/dialogs.ios.ts
@@ -1,7 +1,7 @@
 /**
  * iOS specific dialogs functions implementation.
  */
-
+import { View, ios as iosView } from "../core/view";
 import { ConfirmOptions, PromptOptions, PromptResult, LoginOptions, LoginResult, ActionOptions } from ".";
 import { getCurrentPage, getLabelColor, getButtonColors, getTextFieldColor, isDialogOptions, inputType, ALERT, OK, CONFIRM, CANCEL, PROMPT, LOGIN } from "./dialogs-common";
 import { isString, isDefined, isFunction } from "../../utils/types";
@@ -42,7 +42,7 @@ export function alert(arg: any): Promise<void> {
         try {
             let options = !isDialogOptions(arg) ? { title: ALERT, okButtonText: OK, message: arg + "" } : arg;
             let alertController = UIAlertController.alertControllerWithTitleMessagePreferredStyle(options.title, options.message, UIAlertControllerStyle.Alert);
-            
+
             addButtonsToAlertController(alertController, options, () => { resolve(); });
 
             showUIAlertController(alertController);
@@ -157,7 +157,7 @@ export function login(): Promise<LoginResult> {
             let alertController = UIAlertController.alertControllerWithTitleMessagePreferredStyle(options.title, options.message, UIAlertControllerStyle.Alert);
 
             let textFieldColor = getTextFieldColor();
-            
+
             alertController.addTextFieldWithConfigurationHandler((arg: UITextField) => {
                 arg.placeholder = "Login";
                 arg.text = isString(options.userName) ? options.userName : "";
@@ -185,7 +185,7 @@ export function login(): Promise<LoginResult> {
                     resolve({
                         result: r,
                         userName:
-                        userNameTextField.text,
+                            userNameTextField.text,
                         password: passwordTextField.text
                     });
                 });
@@ -200,7 +200,19 @@ export function login(): Promise<LoginResult> {
 function showUIAlertController(alertController: UIAlertController) {
     let currentPage = getCurrentPage();
     if (currentPage) {
-        let viewController: UIViewController = currentPage.modal ? currentPage.modal.ios : currentPage.ios;
+        let view: View = currentPage;
+        let viewController: UIViewController = currentPage.ios;
+
+        if (currentPage.modal) {
+            view = currentPage.modal;
+
+            if (view.ios instanceof UIViewController) {
+                viewController = view.ios;
+            } else {
+                viewController = iosView.getParentWithViewController(view).viewController;
+            }
+        }
+
         if (viewController) {
             if (alertController.popoverPresentationController) {
                 alertController.popoverPresentationController.sourceView = viewController.view;