From 64bca39e2b8c647e75f3cdd86ac7c171fb86b097 Mon Sep 17 00:00:00 2001
From: vakrilov <alexander.vakrilov@telerik.com>
Date: Wed, 4 Jan 2017 17:18:18 +0200
Subject: [PATCH] IOS fix for context

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

diff --git a/tns-core-modules/ui/core/view-base.ts b/tns-core-modules/ui/core/view-base.ts
index eb4377025..9090ec72e 100644
--- a/tns-core-modules/ui/core/view-base.ts
+++ b/tns-core-modules/ui/core/view-base.ts
@@ -407,7 +407,7 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
     }
 
     protected _addViewCore(view: ViewBase, atIndex?: number) {
-        if (this._context) {
+        if (isIOS || this._context) {
             view._setupUI(this._context, atIndex);
         }
 
@@ -448,7 +448,7 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
 
         // view.unsetInheritedProperties();
 
-        if (view._context) {
+        if (isIOS || view._context) {
             view._tearDownUI();
         }
     }
@@ -478,11 +478,6 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
 
         this._initNativeView();
 
-        // TODO: Remove this 
-        if (this.nativeView && !this.nativeView.getLayoutParams()) {
-            this.nativeView.setLayoutParams(new org.nativescript.widgets.CommonLayoutParams());
-        }
-
         if (this.parent) {
             this.parent._addViewToNativeVisualTree(this, atIndex);
         }
diff --git a/tns-core-modules/ui/core/view.ios.ts b/tns-core-modules/ui/core/view.ios.ts
index ff8c125ba..b65958833 100644
--- a/tns-core-modules/ui/core/view.ios.ts
+++ b/tns-core-modules/ui/core/view.ios.ts
@@ -19,6 +19,10 @@ export class View extends ViewCommon {
     private _cachedFrame: CGRect;
     private _suspendCATransaction = false;
 
+    get _nativeView(): UIView {
+        return this.ios;
+    }
+
     public _addViewCore(view: ViewCommon, atIndex?: number) {
         super._addViewCore(view, atIndex);
         this.requestLayout();