From a35e603d85cc1168548e247f7dabe7fae318af02 Mon Sep 17 00:00:00 2001
From: Hristo Hristov <Hristo.Hristov@telerik.com>
Date: Fri, 27 Oct 2017 13:50:20 +0300
Subject: [PATCH] Fix to always get the same bounds no matter if we are shown
 modally or not (for iOS). Remove code that moves actionBar when there is
 incoming call. We now depend on the autolayout to position us correctly.
 _addView, _removeView won't request layout for iOS. LayoutBase: addChild &
 remvoeChild will request layout. ContentView: content change will request
 layout.

---
 .../ui-tests-app/modal-view/modal-view.xml    |  2 +-
 .../ui/content-view/content-view.ts           |  3 +++
 tns-core-modules/ui/core/view/view.ios.ts     | 20 ++++-----------
 tns-core-modules/ui/frame/frame.ios.ts        | 22 ----------------
 .../ui/layouts/layout-base.ios.ts             | 25 +++++++++++++++----
 5 files changed, 29 insertions(+), 43 deletions(-)

diff --git a/apps/app/ui-tests-app/modal-view/modal-view.xml b/apps/app/ui-tests-app/modal-view/modal-view.xml
index 0ce8f81fa..0f0aaab57 100644
--- a/apps/app/ui-tests-app/modal-view/modal-view.xml
+++ b/apps/app/ui-tests-app/modal-view/modal-view.xml
@@ -1,4 +1,4 @@
-<Page xmlns="http://schemas.nativescript.org/tns.xsd" loaded="pageLoaded" backgroundColor="Red">
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" loaded="pageLoaded" backgroundColor="white">
   <StackLayout backgroundColor="PaleGreen">
     <Button text="Login (pop-up)" tap="onTap" />
     <Button text="Login (full-screen)" tap="onTap" />
diff --git a/tns-core-modules/ui/content-view/content-view.ts b/tns-core-modules/ui/content-view/content-view.ts
index 85357ec43..baa518790 100644
--- a/tns-core-modules/ui/content-view/content-view.ts
+++ b/tns-core-modules/ui/content-view/content-view.ts
@@ -22,6 +22,9 @@ export class ContentView extends CustomLayoutView implements ContentViewDefiniti
         }
 
         this._onContentChanged(oldView, value);
+        if (oldView !== value) {
+            this.requestLayout();
+        }
     }
 
     get layoutView(): View {
diff --git a/tns-core-modules/ui/core/view/view.ios.ts b/tns-core-modules/ui/core/view/view.ios.ts
index 9434481b3..3d611689e 100644
--- a/tns-core-modules/ui/core/view/view.ios.ts
+++ b/tns-core-modules/ui/core/view/view.ios.ts
@@ -40,16 +40,6 @@ export class View extends ViewCommon {
      */
     _nativeBackgroundState: "unset" | "invalid" | "drawn";
 
-    public _addViewCore(view: ViewCommon, atIndex?: number) {
-        super._addViewCore(view, atIndex);
-        this.requestLayout();
-    }
-
-    public _removeViewCore(view: ViewCommon) {
-        super._removeViewCore(view);
-        this.requestLayout();
-    }
-
     get isLayoutRequired(): boolean {
         return (this._privateFlags & PFLAG_LAYOUT_REQUIRED) === PFLAG_LAYOUT_REQUIRED;
     }
@@ -255,7 +245,7 @@ export class View extends ViewCommon {
         }
 
         const background = this.style.backgroundInternal;
-        const backgroundDependsOnSize = background.image 
+        const backgroundDependsOnSize = background.image
             || !background.hasUniformBorder()
             || background.hasBorderRadius();
 
@@ -630,9 +620,9 @@ export namespace ios {
         if (extendedController.scrollable !== scrollable
             || extendedController.navBarHidden !== navBarHidden
             || extendedController.hasChildControllers !== hasChildControllers) {
-                extendedController.scrollable = scrollable;
-                extendedController.navBarHidden = navBarHidden;
-                extendedController.hasChildControllers = hasChildControllers;
+            extendedController.scrollable = scrollable;
+            extendedController.navBarHidden = navBarHidden;
+            extendedController.hasChildControllers = hasChildControllers;
             constrainView(extendedController, owner);
         }
     }
@@ -643,7 +633,7 @@ export namespace ios {
             return;
         }
 
-        const frame = controller.beingPresented ? owner.nativeView.superview.frame : controller.view.subviews[0].bounds;
+        const frame = controller.view.subviews[0].bounds;
         const origin = frame.origin;
         const size = frame.size;
         const width = layout.toDevicePixels(size.width);
diff --git a/tns-core-modules/ui/frame/frame.ios.ts b/tns-core-modules/ui/frame/frame.ios.ts
index 3ce3be176..13c53119f 100644
--- a/tns-core-modules/ui/frame/frame.ios.ts
+++ b/tns-core-modules/ui/frame/frame.ios.ts
@@ -252,28 +252,6 @@ export class Frame extends FrameBase {
     public _onNavigatingTo(backstackEntry: BackstackEntry, isBack: boolean) {
         //
     }
-
-    _handleHigherInCallStatusBarIfNeeded() {
-        let statusBarHeight = uiUtils.ios.getStatusBarHeight();
-        if (!this._ios ||
-            !this._ios.controller ||
-            !this._ios.controller.navigationBar ||
-            this._ios.controller.navigationBar.hidden ||
-            utils.layout.toDevicePixels(this._ios.controller.navigationBar.frame.origin.y) === statusBarHeight) {
-            return;
-        }
-
-        if (traceEnabled()) {
-            traceWrite(`Forcing navigationBar.frame.origin.y to ${statusBarHeight} due to a higher in-call status-bar`, traceCategories.Layout);
-        }
-
-        this._ios.controller.navigationBar.removeConstraints((<any>this)._ios.controller.navigationBar.constraints);
-        this._ios.controller.navigationBar.frame = CGRectMake(
-            this._ios.controller.navigationBar.frame.origin.x,
-            utils.layout.toDeviceIndependentPixels(statusBarHeight),
-            this._ios.controller.navigationBar.frame.size.width,
-            this._ios.controller.navigationBar.frame.size.height);
-    }
 }
 
 let transitionDelegates = new Array<TransitionDelegate>();
diff --git a/tns-core-modules/ui/layouts/layout-base.ios.ts b/tns-core-modules/ui/layouts/layout-base.ios.ts
index b6c6faece..e0ff79080 100644
--- a/tns-core-modules/ui/layouts/layout-base.ios.ts
+++ b/tns-core-modules/ui/layouts/layout-base.ios.ts
@@ -1,15 +1,23 @@
-import { LayoutBaseCommon, clipToBoundsProperty } from "./layout-base-common";
+import { LayoutBaseCommon, clipToBoundsProperty, View } from "./layout-base-common";
 
 export * from "./layout-base-common";
 
 export class LayoutBase extends LayoutBaseCommon {
     nativeViewProtected: UIView;
     
-    [clipToBoundsProperty.getDefault](): boolean {
-        return false;
+    public addChild(child: View): void {
+        super.addChild(child);
+        this.requestLayout();
     }
-    [clipToBoundsProperty.setNative](value: boolean) {
-        this._setNativeClipToBounds();
+
+    public insertChild(child: View, atIndex: number): void {
+        super.insertChild(child, atIndex);
+        this.requestLayout();
+    }
+
+    public removeChild(child: View): void {
+        super.removeChild(child);
+        this.requestLayout();
     }
 
     _setNativeClipToBounds() {
@@ -19,4 +27,11 @@ export class LayoutBase extends LayoutBaseCommon {
             super._setNativeClipToBounds();
         }
     }
+    
+    [clipToBoundsProperty.getDefault](): boolean {
+        return false;
+    }
+    [clipToBoundsProperty.setNative](value: boolean) {
+        this._setNativeClipToBounds();
+    }
 }
\ No newline at end of file