Merge pull request #2012 from NativeScript/dialog-from-modal

Fixed: Unable to show dialog from a modal page

apps/modal-views-demo/login-page.ts

@@ -2,6 +2,7 @@
 import pages = require("ui/page");
 import textField = require("ui/text-field");
 import frame = require("ui/frame");
+import dialogs = require("ui/dialogs");
 
 var closeCallback: Function;
 
@@ -65,4 +66,13 @@ export function onLoginButtonTap() {
     else {
         frame.topmost().goBack();
     }
+}
+
+export function onShowDialogButtonTap() {
+    console.log(">>> login-page.onShowDialogButtonTap");
+
+    dialogs.alert({ title: "test", message: "Anything", okButtonText: "ok" })
+        .then(function () {
+            console.log("Dialog closed!");
+        });
 }

apps/modal-views-demo/login-page.xml

@@ -12,5 +12,6 @@
     <TextField hint="username" id="username" text="username"/>
     <TextField hint="password" id="password" text="password" secure="true"/>
     <Button text="Login" tap="onLoginButtonTap"/>
+    <Button text="Show Dialog" tap="onShowDialogButtonTap"/>
   </StackLayout>
 </Page>

ui/dialogs/dialogs.ios.ts

@@ -388,7 +388,7 @@ export function login(arg: any): Promise<dialogs.LoginResult> {
 function showUIAlertController(alertController: UIAlertController) {
     var currentPage = dialogsCommon.getCurrentPage();
     if (currentPage) {
-        var viewController: UIViewController = currentPage.ios;
+        var viewController: UIViewController = currentPage.modal ? currentPage.modal.ios : currentPage.ios;
         if (viewController) {
             if (alertController.popoverPresentationController) {
                 alertController.popoverPresentationController.sourceView = viewController.view;