From 77c45da790f089df786b26d0e55535b3b4fb32a7 Mon Sep 17 00:00:00 2001
From: Martin Yankov <m.i.yankov@gmail.com>
Date: Tue, 7 May 2019 13:17:24 +0300
Subject: [PATCH 1/2] fix(ios-tabview): crash when setting tab text color
 (#7188)

---
 apps/app/ui-tests-app/tab-view/main-page.ts   |  1 +
 .../ui-tests-app/tab-view/tab-text-color.xml  | 24 +++++++++++++++++++
 tns-core-modules/ui/tab-view/tab-view.ios.ts  |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 apps/app/ui-tests-app/tab-view/tab-text-color.xml

diff --git a/apps/app/ui-tests-app/tab-view/main-page.ts b/apps/app/ui-tests-app/tab-view/main-page.ts
index 69d4aa857..50f8dca5d 100644
--- a/apps/app/ui-tests-app/tab-view/main-page.ts
+++ b/apps/app/ui-tests-app/tab-view/main-page.ts
@@ -27,5 +27,6 @@ export function loadExamples() {
     examples.set("tab-view-tab-text-font-size", "tab-view/tab-view-tab-text-font-size");
     examples.set("tab-view-android-swipe", "tab-view/tab-view-android-swipe");
     examples.set("tab-view-icon-title-placement", "tab-view/icon-title-placement");
+    examples.set("tab-text-color", "tab-view/tab-text-color");
     return examples;
 }
diff --git a/apps/app/ui-tests-app/tab-view/tab-text-color.xml b/apps/app/ui-tests-app/tab-view/tab-text-color.xml
new file mode 100644
index 000000000..8f851e60d
--- /dev/null
+++ b/apps/app/ui-tests-app/tab-view/tab-text-color.xml
@@ -0,0 +1,24 @@
+<Page>
+  <TabView tabTextColor="red">
+    <TabView.items>
+
+      <TabViewItem title="Tab 1">
+        <TabViewItem.view>
+          <Label text="Label 1" />
+        </TabViewItem.view>
+      </TabViewItem>
+
+      <TabViewItem title="Tab 2">
+        <TabViewItem.view>
+          <Label text="Label 2" />
+        </TabViewItem.view>
+      </TabViewItem>
+
+      <TabViewItem title="Tab 3">
+        <TabViewItem.view>
+          <Label text="Label 3" />
+        </TabViewItem.view>
+      </TabViewItem>
+    </TabView.items>
+  </TabView>
+</Page>
diff --git a/tns-core-modules/ui/tab-view/tab-view.ios.ts b/tns-core-modules/ui/tab-view/tab-view.ios.ts
index 3201e9a2c..70f8c1f3d 100644
--- a/tns-core-modules/ui/tab-view/tab-view.ios.ts
+++ b/tns-core-modules/ui/tab-view/tab-view.ios.ts
@@ -576,7 +576,7 @@ function getTitleAttributesForStates(tabView: TabView): TabStates {
     }
 
     const tabSelectedItemTextColor = tabView.style.selectedTabTextColor;
-    const selectedTextColor = tabItemTextColor instanceof Color ? tabSelectedItemTextColor.ios : null;
+    const selectedTextColor = tabSelectedItemTextColor instanceof Color ? tabSelectedItemTextColor.ios : null;
     result.selectedState = { [NSFontAttributeName]: font }
     if (selectedTextColor) {
         result.selectedState[UITextAttributeTextColor] = selectedTextColor

From aa44eb950e7239803d2783a2ae33dabba6566e24 Mon Sep 17 00:00:00 2001
From: Vladimir Amiorkov <vladimir.amiorkov@progress.com>
Date: Tue, 7 May 2019 17:09:39 +0300
Subject: [PATCH 2/2] fix(ios-modal): closeCallback not being called with
 popover presentation style (#7189)

---
 e2e/modal-navigation/app/home/home-page.ts    | 16 ++++++++++-
 e2e/modal-navigation/app/home/home-page.xml   |  1 +
 .../app/modal-no-page/modal-no-page.ts        |  2 +-
 e2e/modal-navigation/app/modal/modal-page.ts  |  2 +-
 e2e/modal-navigation/package.json             |  1 +
 e2e/modal-navigation/references.d.ts          |  1 +
 tns-core-modules/ui/core/view/view-common.ts  |  7 ++++-
 tns-core-modules/ui/core/view/view.ios.ts     | 27 ++++++++++++++++++-
 8 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 e2e/modal-navigation/references.d.ts

diff --git a/e2e/modal-navigation/app/home/home-page.ts b/e2e/modal-navigation/app/home/home-page.ts
index 54cb458fa..1ce7f9179 100644
--- a/e2e/modal-navigation/app/home/home-page.ts
+++ b/e2e/modal-navigation/app/home/home-page.ts
@@ -1,7 +1,7 @@
 import * as application from "tns-core-modules/application";
 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 { View, EventData, ShowModalOptions } from "tns-core-modules/ui/core/view";
 import { Frame } from "tns-core-modules/ui/frame";
 
 export function onNavigatingTo(args: NavigatedData) {
@@ -29,6 +29,20 @@ export function onModalNoPage(args: EventData) {
         false);
 }
 
+export function onPopoverModal(args: EventData) {
+    const view = args.object as View;
+    let options: ShowModalOptions = {
+        context: "context",
+        closeCallback: () => console.log("home-page modal popover frame closed"),
+        animated: false,
+        ios: {
+            presentationStyle: UIModalPresentationStyle.Popover
+        }
+    }
+
+    view.showModal("modal-no-page/modal-no-page", options);
+}
+
 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 67a6197eb..62bfbc778 100644
--- a/e2e/modal-navigation/app/home/home-page.xml
+++ b/e2e/modal-navigation/app/home/home-page.xml
@@ -20,6 +20,7 @@
             <Button text="Show Modal Without Page" tap="onModalNoPage" textAlignment="left" />
             <Button text="Show Modal Page With Frame" tap="onModalFrame" textAlignment="left" />
             <Button text="Show Modal Page" tap="onModalPage" textAlignment="left" />
+            <Button text="Show 'popover' modal" tap="onPopoverModal" textAlignment="left" />
             <Button text="Show Modal Layout" tap="onModalLayout" textAlignment="left" />
             <Button text="Show Modal TabView" tap="onModalTabView" textAlignment="left" />
             <Button text="Android Back Btn Events" tap="onAndroidBackEvents" textAlignment="left" />
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
index 88395c2b7..2652b50bd 100644
--- a/e2e/modal-navigation/app/modal-no-page/modal-no-page.ts
+++ b/e2e/modal-navigation/app/modal-no-page/modal-no-page.ts
@@ -3,7 +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";
+import { confirm } from "tns-core-modules/ui/dialogs";
 
 export function onLoaded(args) {
     console.log("modal-no-page loaded");
diff --git a/e2e/modal-navigation/app/modal/modal-page.ts b/e2e/modal-navigation/app/modal/modal-page.ts
index c191dfe95..6de08686d 100644
--- a/e2e/modal-navigation/app/modal/modal-page.ts
+++ b/e2e/modal-navigation/app/modal/modal-page.ts
@@ -3,7 +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";
+import { confirm } from "tns-core-modules/ui/dialogs";
 
 export function onShowingModally(args: ShownModallyData) {
     console.log("modal-page showingModally");
diff --git a/e2e/modal-navigation/package.json b/e2e/modal-navigation/package.json
index 68db87859..c3ffbd134 100644
--- a/e2e/modal-navigation/package.json
+++ b/e2e/modal-navigation/package.json
@@ -25,6 +25,7 @@
     "nativescript-dev-appium": "next",
     "nativescript-dev-typescript": "next",
     "nativescript-dev-webpack": "next",
+    "tns-platform-declarations": "next",
     "rimraf": "^2.6.2",
     "typescript": "^3.1.6"
   },
diff --git a/e2e/modal-navigation/references.d.ts b/e2e/modal-navigation/references.d.ts
new file mode 100644
index 000000000..b945d69c5
--- /dev/null
+++ b/e2e/modal-navigation/references.d.ts
@@ -0,0 +1 @@
+/// <reference path="./node_modules/tns-platform-declarations/ios.d.ts" />
\ No newline at end of file
diff --git a/tns-core-modules/ui/core/view/view-common.ts b/tns-core-modules/ui/core/view/view-common.ts
index 1f14c34d6..7bd97f254 100644
--- a/tns-core-modules/ui/core/view/view-common.ts
+++ b/tns-core-modules/ui/core/view/view-common.ts
@@ -22,6 +22,7 @@ import {
 } from "../../gestures";
 
 import { createViewFromEntry } from "../../builder";
+import { isAndroid } from "../../../platform";
 import { StyleScope } from "../../styling/style-scope";
 import { LinearGradient } from "../../styling/linear-gradient";
 import { BackgroundRepeat } from "../../styling/style-properties";
@@ -324,7 +325,11 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
                     }
                 }
 
-                that._hideNativeModalView(parent, whenClosedCallback);
+                if (isAndroid || (parent.viewController && parent.viewController.presentedViewController)) {
+                    that._hideNativeModalView(parent, whenClosedCallback);
+                } else {
+                    whenClosedCallback();
+                }
             }
         };
     }
diff --git a/tns-core-modules/ui/core/view/view.ios.ts b/tns-core-modules/ui/core/view/view.ios.ts
index 19e01ed0f..c133c361b 100644
--- a/tns-core-modules/ui/core/view/view.ios.ts
+++ b/tns-core-modules/ui/core/view/view.ios.ts
@@ -29,6 +29,7 @@ const majorVersion = iosUtils.MajorVersion;
 export class View extends ViewCommon {
     nativeViewProtected: UIView;
     viewController: UIViewController;
+    private _popoverPresentationDelegate: ios.UIPopoverPresentationControllerDelegateImp;
 
     private _isLaidOut = false;
     private _hasTransfrom = false;
@@ -416,6 +417,8 @@ export class View extends ViewCommon {
 
             if (presentationStyle === UIModalPresentationStyle.Popover) {
                 const popoverPresentationController = controller.popoverPresentationController;
+                this._popoverPresentationDelegate = ios.UIPopoverPresentationControllerDelegateImp.initWithOwnerAndCallback(new WeakRef(this), this._closeModalCallback);
+                popoverPresentationController.delegate = this._popoverPresentationDelegate;
                 const view = parent.nativeViewProtected;
                 // Note: sourceView and sourceRect are needed to specify the anchor location for the popover.
                 // Note: sourceView should be the button triggering the modal. If it the Page the popover might appear "behind" the page content
@@ -906,7 +909,7 @@ export namespace ios {
 
         public viewDidLoad(): void {
             super.viewDidLoad();
-    
+
             // Unify translucent and opaque bars layout
             // this.edgesForExtendedLayout = UIRectEdgeBottom;
             this.extendedLayoutIncludesOpaqueBars = true;
@@ -982,4 +985,26 @@ export namespace ios {
             }
         }
     }
+
+    export class UIPopoverPresentationControllerDelegateImp extends NSObject implements UIPopoverPresentationControllerDelegate {
+        public static ObjCProtocols = [UIPopoverPresentationControllerDelegate];
+
+        private owner: WeakRef<View>;
+        private closedCallback: Function;
+
+        public static initWithOwnerAndCallback(owner: WeakRef<View>, whenClosedCallback: Function): UIPopoverPresentationControllerDelegateImp {
+            const instance = <UIPopoverPresentationControllerDelegateImp>super.new();
+            instance.owner = owner;
+            instance.closedCallback = whenClosedCallback;
+
+            return instance;
+        }
+
+        public popoverPresentationControllerDidDismissPopover(popoverPresentationController: UIPopoverPresentationController) {
+            const owner = this.owner.get();
+            if (owner && typeof this.closedCallback === "function") {
+                this.closedCallback();
+            }
+        }
+    }
 }