From c71b4d4bf1c94aab9eb000b14b48f1d93a44133e Mon Sep 17 00:00:00 2001
From: Hristo Hristov <hristo.hristov@telerik.com>
Date: Mon, 19 Dec 2016 17:52:18 +0200
Subject: [PATCH] Hhristov/modules30 fixes (#3321)

* Fixed bindings, several css properties, attached properties

* Fix valueChanged handlers
Fix double registration of width/height property handlers

* fix broken merge
---
 package.json                                  |   2 +-
 tns-core-modules/ui/core/bindable.ts          |   2 +-
 tns-core-modules/ui/core/properties.ts        |   3 +-
 tns-core-modules/ui/core/view-common.ts       |  56 ++++-----
 tns-core-modules/ui/core/view.android.ts      | 116 +-----------------
 .../absolute-layout.android.ts                |   2 +-
 .../dock-layout/dock-layout.android.ts        |   2 +-
 .../flexbox-layout/flexbox-layout.android.ts  |   2 +-
 .../flexbox-layout/flexbox-layout.ios.ts      |   2 +-
 .../layouts/grid-layout/grid-layout-common.ts |   8 +-
 .../grid-layout/grid-layout.android.ts        |   4 +-
 11 files changed, 47 insertions(+), 152 deletions(-)

diff --git a/package.json b/package.json
index e2778da42..a41db7586 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "time-grunt": "1.3.0",
     "tslint": "^3.15.1",
     "typedoc": "0.4.5",
-    "typescript": "~2.0.10"
+    "typescript": "~2.1.4"
   },
   "scripts": {
     "setup": "npm run dev-link-tns-platform-declarations && npm run dev-link-tns-core-modules && npm run dev-link-tests && npm run dev-link-apps",
diff --git a/tns-core-modules/ui/core/bindable.ts b/tns-core-modules/ui/core/bindable.ts
index e5f31b65d..b00668225 100644
--- a/tns-core-modules/ui/core/bindable.ts
+++ b/tns-core-modules/ui/core/bindable.ts
@@ -642,7 +642,7 @@ export class Binding {
         this.updating = true;
 
         try {
-            if (optionsInstance instanceof Bindable &&
+            if (optionsInstance instanceof ViewBase &&
                 isEventOrGesture(options.property, <any>optionsInstance) &&
                 types.isFunction(value)) {
                 // calling off method with null as handler will remove all handlers for options.property event
diff --git a/tns-core-modules/ui/core/properties.ts b/tns-core-modules/ui/core/properties.ts
index aaff8c711..131fab1bd 100644
--- a/tns-core-modules/ui/core/properties.ts
+++ b/tns-core-modules/ui/core/properties.ts
@@ -41,7 +41,7 @@ export interface PropertyOptions<T, U> {
 }
 
 export interface CoerciblePropertyOptions<T, U> extends PropertyOptions<T, U> {
-    readonly coerceValue: (T, U) => U;
+    readonly coerceValue: (t: T, u: U) => U;
 }
 
 export interface ShorthandPropertyOptions {
@@ -53,7 +53,6 @@ export interface ShorthandPropertyOptions {
 
 export interface CssPropertyOptions<T extends Style, U> extends PropertyOptions<T, U> {
     cssName: string;
-    dependentProperty?: CssProperty<T, any>;
 }
 
 export class Property<T extends ViewBase, U> implements PropertyDescriptor {
diff --git a/tns-core-modules/ui/core/view-common.ts b/tns-core-modules/ui/core/view-common.ts
index ce754cc88..e9d5ddd5f 100644
--- a/tns-core-modules/ui/core/view-common.ts
+++ b/tns-core-modules/ui/core/view-common.ts
@@ -1147,7 +1147,7 @@ export const zeroLength: Length = { value: 0, unit: "px" };
 
 export const minWidthProperty = new CssProperty<Style, Length>({
     name: "minWidth", cssName: "min-width", defaultValue: zeroLength, affectsLayout: isIOS, equalityComparer: Length.equals,
-    valueChanged: (target, newValue) => {
+    valueChanged: (target, oldValue, newValue) => {
         target.effectiveMinWidth = Length.toDevicePixels(newValue, 0);
     }, valueConverter: Length.parse
 });
@@ -1155,7 +1155,7 @@ minWidthProperty.register(Style);
 
 export const minHeightProperty = new CssProperty<Style, Length>({
     name: "minHeight", cssName: "min-height", defaultValue: zeroLength, affectsLayout: isIOS, equalityComparer: Length.equals,
-    valueChanged: (target, newValue) => {
+    valueChanged: (target, oldValue, newValue) => {
         target.effectiveMinHeight = Length.toDevicePixels(newValue, 0);
     }, valueConverter: Length.parse
 });
@@ -1197,7 +1197,7 @@ paddingProperty.register(Style);
 
 export const paddingLeftProperty = new CssProperty<Style, Length>({
     name: "paddingLeft", cssName: "padding-left", defaultValue: zeroLength, affectsLayout: isIOS, equalityComparer: Length.equals,
-    valueChanged: (target, newValue) => {
+    valueChanged: (target, oldValue, newValue) => {
         target.effectivePaddingLeft = Length.toDevicePixels(newValue, 0);
     }, valueConverter: Length.parse
 });
@@ -1205,7 +1205,7 @@ paddingLeftProperty.register(Style);
 
 export const paddingRightProperty = new CssProperty<Style, Length>({
     name: "paddingRight", cssName: "padding-right", defaultValue: zeroLength, affectsLayout: isIOS, equalityComparer: Length.equals,
-    valueChanged: (target, newValue) => {
+    valueChanged: (target, oldValue, newValue) => {
         target.effectivePaddingRight = Length.toDevicePixels(newValue, 0);
     }, valueConverter: Length.parse
 });
@@ -1213,7 +1213,7 @@ paddingRightProperty.register(Style);
 
 export const paddingTopProperty = new CssProperty<Style, Length>({
     name: "paddingTop", cssName: "padding-top", defaultValue: zeroLength, affectsLayout: isIOS, equalityComparer: Length.equals,
-    valueChanged: (target, newValue) => {
+    valueChanged: (target, oldValue, newValue) => {
         target.effectivePaddingTop = Length.toDevicePixels(newValue, 0);
     }, valueConverter: Length.parse
 });
@@ -1221,7 +1221,7 @@ paddingTopProperty.register(Style);
 
 export const paddingBottomProperty = new CssProperty<Style, Length>({
     name: "paddingBottom", cssName: "padding-bottom", defaultValue: zeroLength, affectsLayout: isIOS, equalityComparer: Length.equals,
-    valueChanged: (target, newValue) => {
+    valueChanged: (target, oldValue, newValue) => {
         target.effectivePaddingBottom = Length.toDevicePixels(newValue, 0);
     }, valueConverter: Length.parse
 });
@@ -1513,7 +1513,7 @@ export const backgroundImageProperty = new CssProperty<Style, string>({
 backgroundImageProperty.register(Style);
 
 export const backgroundColorProperty = new CssProperty<Style, Color>({
-    name: "backgroundColor", cssName: "background-color", valueChanged: (target, newValue) => {
+    name: "backgroundColor", cssName: "background-color", valueChanged: (target, oldValue, newValue) => {
         printUnregisteredProperties();
         let background = target.backgroundInternal;
         target.backgroundInternal = background.withColor(newValue);
@@ -1532,7 +1532,7 @@ export namespace BackgroundRepeat {
 }
 
 export const backgroundRepeatProperty = new CssProperty<Style, BackgroundRepeat>({
-    name: "backgroundRepeat", cssName: "background-repeat", valueConverter: BackgroundRepeat.parse, valueChanged: (target, newValue) => {
+    name: "backgroundRepeat", cssName: "background-repeat", valueConverter: BackgroundRepeat.parse, valueChanged: (target, oldValue, newValue) => {
         let background = target.backgroundInternal;
         target.backgroundInternal = background.withRepeat(newValue);
     }
@@ -1540,7 +1540,7 @@ export const backgroundRepeatProperty = new CssProperty<Style, BackgroundRepeat>
 backgroundRepeatProperty.register(Style);
 
 export const backgroundSizeProperty = new CssProperty<Style, string>({
-    name: "backgroundSize", cssName: "background-size", valueChanged: (target, newValue) => {
+    name: "backgroundSize", cssName: "background-size", valueChanged: (target, oldValue, newValue) => {
         let background = target.backgroundInternal;
         target.backgroundInternal = background.withSize(newValue);
     }
@@ -1548,7 +1548,7 @@ export const backgroundSizeProperty = new CssProperty<Style, string>({
 backgroundSizeProperty.register(Style);
 
 export const backgroundPositionProperty = new CssProperty<Style, string>({
-    name: "backgroundPosition", cssName: "background-position", valueChanged: (target, newValue) => {
+    name: "backgroundPosition", cssName: "background-position", valueChanged: (target, oldValue, newValue) => {
         let background = target.backgroundInternal;
         target.backgroundInternal = background.withPosition(newValue);
     }
@@ -1635,7 +1635,7 @@ const borderColorProperty = new ShorthandProperty<Style>({
 borderColorProperty.register(Style);
 
 export const borderTopColorProperty = new CssProperty<Style, Color>({
-    name: "borderTopColor", cssName: "border-top-color", valueChanged: (target, newValue) => {
+    name: "borderTopColor", cssName: "border-top-color", valueChanged: (target, oldValue, newValue) => {
         let background = target.backgroundInternal;
         target.backgroundInternal = background.withBorderTopColor(newValue);
     }, equalityComparer: Color.equals, valueConverter: (value) => new Color(value)
@@ -1643,7 +1643,7 @@ export const borderTopColorProperty = new CssProperty<Style, Color>({
 borderTopColorProperty.register(Style);
 
 export const borderRightColorProperty = new CssProperty<Style, Color>({
-    name: "borderRightColor", cssName: "border-right-color", valueChanged: (target, newValue) => {
+    name: "borderRightColor", cssName: "border-right-color", valueChanged: (target, oldValue, newValue) => {
         let background = target.backgroundInternal;
         target.backgroundInternal = background.withBorderRightColor(newValue);
     }, equalityComparer: Color.equals, valueConverter: (value) => new Color(value)
@@ -1651,7 +1651,7 @@ export const borderRightColorProperty = new CssProperty<Style, Color>({
 borderRightColorProperty.register(Style);
 
 export const borderBottomColorProperty = new CssProperty<Style, Color>({
-    name: "borderBottomColor", cssName: "border-bottom-color", valueChanged: (target, newValue) => {
+    name: "borderBottomColor", cssName: "border-bottom-color", valueChanged: (target, oldValue, newValue) => {
         let background = target.backgroundInternal;
         target.backgroundInternal = background.withBorderBottomColor(newValue);
     }, equalityComparer: Color.equals, valueConverter: (value) => new Color(value)
@@ -1659,7 +1659,7 @@ export const borderBottomColorProperty = new CssProperty<Style, Color>({
 borderBottomColorProperty.register(Style);
 
 export const borderLeftColorProperty = new CssProperty<Style, Color>({
-    name: "borderLeftColor", cssName: "border-left-color", valueChanged: (target, newValue) => {
+    name: "borderLeftColor", cssName: "border-left-color", valueChanged: (target, oldValue, newValue) => {
         let background = target.backgroundInternal;
         target.backgroundInternal = background.withBorderLeftColor(newValue);
     }, equalityComparer: Color.equals, valueConverter: (value) => new Color(value)
@@ -1692,7 +1692,7 @@ borderWidthProperty.register(Style);
 
 export const borderTopWidthProperty = new CssProperty<Style, Length>({
     name: "borderTopWidth", cssName: "border-top-width", defaultValue: zeroLength, affectsLayout: isIOS, equalityComparer: Length.equals,
-    valueChanged: (target, newValue) => {
+    valueChanged: (target, oldValue, newValue) => {
         let value = Length.toDevicePixels(newValue, 0);
         if (!isNonNegativeFiniteNumber(value)) {
             throw new Error(`border-top-width should be Non-Negative Finite number. Value: ${value}`);
@@ -1706,7 +1706,7 @@ borderTopWidthProperty.register(Style);
 
 export const borderRightWidthProperty = new CssProperty<Style, Length>({
     name: "borderRightWidth", cssName: "border-right-width", defaultValue: zeroLength, affectsLayout: isIOS, equalityComparer: Length.equals,
-    valueChanged: (target, newValue) => {
+    valueChanged: (target, oldValue, newValue) => {
         let value = Length.toDevicePixels(newValue, 0);
         if (!isNonNegativeFiniteNumber(value)) {
             throw new Error(`border-right-width should be Non-Negative Finite number. Value: ${value}`);
@@ -1720,7 +1720,7 @@ borderRightWidthProperty.register(Style);
 
 export const borderBottomWidthProperty = new CssProperty<Style, Length>({
     name: "borderBottomWidth", cssName: "border-bottom-width", defaultValue: zeroLength, affectsLayout: isIOS, equalityComparer: Length.equals,
-    valueChanged: (target, newValue) => {
+    valueChanged: (target, oldValue, newValue) => {
         let value = Length.toDevicePixels(newValue, 0);
         if (!isNonNegativeFiniteNumber(value)) {
             throw new Error(`border-bottom-width should be Non-Negative Finite number. Value: ${value}`);
@@ -1734,7 +1734,7 @@ borderBottomWidthProperty.register(Style);
 
 export const borderLeftWidthProperty = new CssProperty<Style, Length>({
     name: "borderLeftWidth", cssName: "border-left-width", defaultValue: zeroLength, affectsLayout: isIOS, equalityComparer: Length.equals,
-    valueChanged: (target, newValue) => {
+    valueChanged: (target, oldValue, newValue) => {
         let value = Length.toDevicePixels(newValue, 0);
         if (!isNonNegativeFiniteNumber(value)) {
             throw new Error(`border-left-width should be Non-Negative Finite number. Value: ${value}`);
@@ -1771,7 +1771,7 @@ const borderRadiusProperty = new ShorthandProperty<Style>({
 borderRadiusProperty.register(Style);
 
 export const borderTopLeftRadiusProperty = new CssProperty<Style, number>({
-    name: "borderTopLeftRadius", cssName: "border-top-left-radius", defaultValue: 0, affectsLayout: isIOS, valueChanged: (target, newValue) => {
+    name: "borderTopLeftRadius", cssName: "border-top-left-radius", defaultValue: 0, affectsLayout: isIOS, valueChanged: (target, oldValue, newValue) => {
         let background = target.backgroundInternal;
         target.backgroundInternal = background.withBorderTopLeftRadius(newValue);
     }, valueConverter: isNonNegativeFiniteNumberConverter
@@ -1779,7 +1779,7 @@ export const borderTopLeftRadiusProperty = new CssProperty<Style, number>({
 borderTopLeftRadiusProperty.register(Style);
 
 export const borderTopRightRadiusProperty = new CssProperty<Style, number>({
-    name: "borderTopRightRadius", cssName: "border-top-right-radius", defaultValue: 0, affectsLayout: isIOS, valueChanged: (target, newValue) => {
+    name: "borderTopRightRadius", cssName: "border-top-right-radius", defaultValue: 0, affectsLayout: isIOS, valueChanged: (target, oldValue, newValue) => {
         let background = target.backgroundInternal;
         target.backgroundInternal = background.withBorderTopRightRadius(newValue);
     }, valueConverter: isNonNegativeFiniteNumberConverter
@@ -1787,7 +1787,7 @@ export const borderTopRightRadiusProperty = new CssProperty<Style, number>({
 borderTopRightRadiusProperty.register(Style);
 
 export const borderBottomRightRadiusProperty = new CssProperty<Style, number>({
-    name: "borderBottomRightRadius", cssName: "border-bottom-right-radius", defaultValue: 0, affectsLayout: isIOS, valueChanged: (target, newValue) => {
+    name: "borderBottomRightRadius", cssName: "border-bottom-right-radius", defaultValue: 0, affectsLayout: isIOS, valueChanged: (target, oldValue, newValue) => {
         let background = target.backgroundInternal;
         target.backgroundInternal = background.withBorderBottomLeftRadius(newValue);
     }, valueConverter: isNonNegativeFiniteNumberConverter
@@ -1795,7 +1795,7 @@ export const borderBottomRightRadiusProperty = new CssProperty<Style, number>({
 borderBottomRightRadiusProperty.register(Style);
 
 export const borderBottomLeftRadiusProperty = new CssProperty<Style, number>({
-    name: "borderBottomLeftRadius", cssName: "border-bottom-left-radius", defaultValue: 0, affectsLayout: isIOS, valueChanged: (target, newValue) => {
+    name: "borderBottomLeftRadius", cssName: "border-bottom-left-radius", defaultValue: 0, affectsLayout: isIOS, valueChanged: (target, oldValue, newValue) => {
         let background = target.backgroundInternal;
         target.backgroundInternal = background.withBorderBottomRightRadius(newValue);
     }, valueConverter: isNonNegativeFiniteNumberConverter
@@ -1816,7 +1816,7 @@ function isClipPathValid(value: string): boolean {
 }
 
 export const clipPathProperty = new CssProperty<Style, string>({
-    name: "clipPath", cssName: "clip-path", valueChanged: (target, newValue) => {
+    name: "clipPath", cssName: "clip-path", valueChanged: (target, oldValue, newValue) => {
         if (!isClipPathValid(newValue)) {
             throw new Error("clip-path is not valid.");
         }
@@ -1863,7 +1863,7 @@ export const fontInternalProperty = new CssProperty<Style, Font>({ name: "fontIn
 fontInternalProperty.register(Style);
 
 export const fontFamilyProperty = new InheritedCssProperty<Style, string>({
-    name: "fontFamily", cssName: "font-family", valueChanged: (target, newValue) => {
+    name: "fontFamily", cssName: "font-family", valueChanged: (target, oldValue, newValue) => {
         let currentFont = target.fontInternal;
         if (currentFont.fontFamily !== newValue) {
             target.fontInternal = currentFont.withFontFamily(newValue);
@@ -1873,7 +1873,7 @@ export const fontFamilyProperty = new InheritedCssProperty<Style, string>({
 fontFamilyProperty.register(Style);
 
 export const fontSizeProperty = new InheritedCssProperty<Style, number>({
-    name: "fontSize", cssName: "font-size", valueChanged: (target, newValue) => {
+    name: "fontSize", cssName: "font-size", valueChanged: (target, oldValue, newValue) => {
         let currentFont = target.fontInternal;
         if (currentFont.fontSize !== newValue) {
             target.fontInternal = currentFont.withFontSize(newValue);
@@ -1884,7 +1884,7 @@ export const fontSizeProperty = new InheritedCssProperty<Style, number>({
 fontSizeProperty.register(Style);
 
 export const fontStyleProperty = new InheritedCssProperty<Style, FontStyle>({
-    name: "fontStyle", cssName: "font-style", defaultValue: FontStyle.NORMAL, valueConverter: FontStyle.parse, valueChanged: (target, newValue) => {
+    name: "fontStyle", cssName: "font-style", defaultValue: FontStyle.NORMAL, valueConverter: FontStyle.parse, valueChanged: (target, oldValue, newValue) => {
         let currentFont = target.fontInternal;
         if (currentFont.fontStyle !== newValue) {
             target.fontInternal = currentFont.withFontStyle(newValue);
@@ -1894,7 +1894,7 @@ export const fontStyleProperty = new InheritedCssProperty<Style, FontStyle>({
 fontStyleProperty.register(Style);
 
 export const fontWeightProperty = new InheritedCssProperty<Style, FontWeight>({
-    name: "fontWeight", cssName: "font-weight", defaultValue: FontWeight.NORMAL, valueConverter: FontWeight.parse, valueChanged: (target, newValue) => {
+    name: "fontWeight", cssName: "font-weight", defaultValue: FontWeight.NORMAL, valueConverter: FontWeight.parse, valueChanged: (target, oldValue, newValue) => {
         let currentFont = target.fontInternal;
         if (currentFont.fontWeight !== newValue) {
             target.fontInternal = currentFont.withFontWeight(newValue);
@@ -1932,7 +1932,7 @@ export namespace Visibility {
 }
 
 export const visibilityProperty = new CssProperty<Style, Visibility>({
-    name: "visibility", cssName: "visibility", defaultValue: Visibility.VISIBLE, affectsLayout: isIOS, valueConverter: Visibility.parse, valueChanged: (target, newValue) => {
+    name: "visibility", cssName: "visibility", defaultValue: Visibility.VISIBLE, affectsLayout: isIOS, valueConverter: Visibility.parse, valueChanged: (target, oldValue, newValue) => {
         target.view.isCollapsed = (newValue === Visibility.COLLAPSE);
     }
 });
diff --git a/tns-core-modules/ui/core/view.android.ts b/tns-core-modules/ui/core/view.android.ts
index 181e11e64..8643e3828 100644
--- a/tns-core-modules/ui/core/view.android.ts
+++ b/tns-core-modules/ui/core/view.android.ts
@@ -461,106 +461,6 @@ export class View extends ViewCommon {
         this.nativeView.setAlpha(value);
     }
 
-    get [minWidthProperty.native](): Length {
-        return { value: org.nativescript.widgets.ViewHelper.getMinWidth(this.nativeView), unit: "px" };
-    }
-    set [minWidthProperty.native](value: Length) {
-        let density = value.unit === "dip" ? layout.getDisplayDensity() : 1;
-        org.nativescript.widgets.ViewHelper.setMinWidth(this.nativeView, value.value * density);
-    }
-
-    get [minHeightProperty.native](): Length {
-        return { value: org.nativescript.widgets.ViewHelper.getMinHeight(this.nativeView), unit: "px" };
-    }
-    set [minHeightProperty.native](value: Length) {
-        let density = value.unit === "dip" ? layout.getDisplayDensity() : 1;
-        org.nativescript.widgets.ViewHelper.setMinHeight(this.nativeView, value.value * density);
-    }
-
-    get [widthProperty.native](): PercentLength {
-        return { value: org.nativescript.widgets.ViewHelper.getWidth(this.nativeView), unit: "px" };
-    }
-    set [widthProperty.native](value: PercentLength) {
-        let type = value.unit;
-        if (type === "%") {
-            org.nativescript.widgets.ViewHelper.setWidthPercent(this.nativeView, value.value);
-        } else if (type === "px") {
-            org.nativescript.widgets.ViewHelper.setWidth(this.nativeView, value.value);
-        } else {
-            org.nativescript.widgets.ViewHelper.setWidth(this.nativeView, value.value * layout.getDisplayDensity());
-        }
-    }
-
-    get [heightProperty.native](): PercentLength {
-        return { value: org.nativescript.widgets.ViewHelper.getHeight(this.nativeView), unit: "px" };
-    }
-    set [heightProperty.native](value: PercentLength) {
-        let type = value.unit;
-        if (type === "%") {
-            org.nativescript.widgets.ViewHelper.setHeightPercent(this.nativeView, value.value);
-        } else if (type === "px") {
-            org.nativescript.widgets.ViewHelper.setHeight(this.nativeView, value.value);
-        } else {
-            org.nativescript.widgets.ViewHelper.setHeight(this.nativeView, value.value * layout.getDisplayDensity());
-        }
-    }
-
-    get [marginLeftProperty.native](): PercentLength {
-        return { value: org.nativescript.widgets.ViewHelper.getMarginLeft(this.nativeView), unit: "px" };
-    }
-    set [marginLeftProperty.native](value: PercentLength) {
-        let type = value.unit;
-        if (type === "%") {
-            org.nativescript.widgets.ViewHelper.setMarginLeftPercent(this.nativeView, value.value);
-        } else if (type === "px") {
-            org.nativescript.widgets.ViewHelper.setMarginLeft(this.nativeView, value.value);
-        } else {
-            org.nativescript.widgets.ViewHelper.setMarginLeft(this.nativeView, value.value * layout.getDisplayDensity());
-        }
-    }
-
-    get [marginTopProperty.native](): PercentLength {
-        return { value: org.nativescript.widgets.ViewHelper.getMarginTop(this.nativeView), unit: "px" };
-    }
-    set [marginTopProperty.native](value: PercentLength) {
-        let type = value.unit;
-        if (type === "%") {
-            org.nativescript.widgets.ViewHelper.setMarginTopPercent(this.nativeView, value.value);
-        } else if (type === "px") {
-            org.nativescript.widgets.ViewHelper.setMarginTop(this.nativeView, value.value);
-        } else {
-            org.nativescript.widgets.ViewHelper.setMarginTop(this.nativeView, value.value * layout.getDisplayDensity());
-        }
-    }
-
-    get [marginRightProperty.native](): PercentLength {
-        return { value: org.nativescript.widgets.ViewHelper.getMarginRight(this.nativeView), unit: "px" };
-    }
-    set [marginRightProperty.native](value: PercentLength) {
-        let type = value.unit;
-        if (type === "%") {
-            org.nativescript.widgets.ViewHelper.setMarginRightPercent(this.nativeView, value.value);
-        } else if (type === "px") {
-            org.nativescript.widgets.ViewHelper.setMarginRight(this.nativeView, value.value);
-        } else {
-            org.nativescript.widgets.ViewHelper.setMarginRight(this.nativeView, value.value * layout.getDisplayDensity());
-        }
-    }
-
-    get [marginBottomProperty.native](): PercentLength {
-        return { value: org.nativescript.widgets.ViewHelper.getMarginBottom(this.nativeView), unit: "px" };
-    }
-    set [marginBottomProperty.native](value: PercentLength) {
-        let type = value.unit;
-        if (type === "%") {
-            org.nativescript.widgets.ViewHelper.setMarginBottomPercent(this.nativeView, value.value);
-        } else if (type === "px") {
-            org.nativescript.widgets.ViewHelper.setMarginBottom(this.nativeView, value.value);
-        } else {
-            org.nativescript.widgets.ViewHelper.setMarginBottom(this.nativeView, value.value * layout.getDisplayDensity());
-        }
-    }
-
     get [horizontalAlignmentProperty.native](): HorizontalAlignment {
         return <HorizontalAlignment>org.nativescript.widgets.ViewHelper.getHorizontalAlignment(this.nativeView);
     }
@@ -735,19 +635,15 @@ createNativePercentLengthProperty({
 });
 
 createNativePercentLengthProperty({
-    key: widthProperty.native,
-    auto: android.view.ViewGroup.LayoutParams.MATCH_PARENT,
-    getPixels: ViewHelper.getWidth,
-    setPixels: ViewHelper.setWidth,
-    setPercent: ViewHelper.setWidthPercent
+    key: minWidthProperty.native,
+    getPixels: ViewHelper.getMinWidth,
+    setPixels: ViewHelper.setMinWidth
 });
 
 createNativePercentLengthProperty({
-    key: heightProperty.native,
-    auto: android.view.ViewGroup.LayoutParams.MATCH_PARENT,
-    getPixels: ViewHelper.getHeight,
-    setPixels: ViewHelper.setHeight,
-    setPercent: ViewHelper.setHeightPercent
+    key: minHeightProperty.native,
+    getPixels: ViewHelper.getMinHeight,
+    setPixels: ViewHelper.setMinHeight
 });
 
 export class CustomLayoutView extends View implements CustomLayoutViewDefinition {
diff --git a/tns-core-modules/ui/layouts/absolute-layout/absolute-layout.android.ts b/tns-core-modules/ui/layouts/absolute-layout/absolute-layout.android.ts
index fd28d2492..f5a470d18 100644
--- a/tns-core-modules/ui/layouts/absolute-layout/absolute-layout.android.ts
+++ b/tns-core-modules/ui/layouts/absolute-layout/absolute-layout.android.ts
@@ -23,7 +23,7 @@ let topDescriptor: TypedPropertyDescriptor<Length> = {
 }
 
 // register native properties on View type.
-Object.defineProperties(View, {
+Object.defineProperties(View.prototype, {
     [leftProperty.native]: leftDescriptor,
     [topProperty.native]: topDescriptor
 });
diff --git a/tns-core-modules/ui/layouts/dock-layout/dock-layout.android.ts b/tns-core-modules/ui/layouts/dock-layout/dock-layout.android.ts
index 5854d412e..7af3131c7 100644
--- a/tns-core-modules/ui/layouts/dock-layout/dock-layout.android.ts
+++ b/tns-core-modules/ui/layouts/dock-layout/dock-layout.android.ts
@@ -38,7 +38,7 @@ let dockDescriptor: TypedPropertyDescriptor<"left" | "top" | "right" | "bottom">
 }
 
 // register native properties on View type.
-Object.defineProperties(View, {
+Object.defineProperties(View.prototype, {
     [dockProperty.native]: dockDescriptor
 });
 
diff --git a/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.android.ts b/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.android.ts
index e505ac6cc..25e8e5848 100644
--- a/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.android.ts
+++ b/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.android.ts
@@ -57,7 +57,7 @@ const alignSelfDescriptor: TypedPropertyDescriptor<AlignSelf> = {
 }
 
 // register native properties on View type.
-Object.defineProperties(View, {
+Object.defineProperties(View.prototype, {
     [orderProperty.native]: orderDescriptor,
     [flexGrowProperty.native]: flexGrowDescriptor,
     [flexShrinkProperty.native]: flexShrinkDescriptor,
diff --git a/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.ios.ts b/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.ios.ts
index 69c61857b..42b2621d9 100644
--- a/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.ios.ts
+++ b/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.ios.ts
@@ -75,7 +75,7 @@ const alignSelfDescriptor: TypedPropertyDescriptor<AlignSelf> = {
 }
 
 // register native properties on View type.
-Object.defineProperties(View, {
+Object.defineProperties(View.prototype, {
     [orderProperty.native]: orderDescriptor,
     [flexGrowProperty.native]: flexGrowDescriptor,
     [flexShrinkProperty.native]: flexShrinkDescriptor,
diff --git a/tns-core-modules/ui/layouts/grid-layout/grid-layout-common.ts b/tns-core-modules/ui/layouts/grid-layout/grid-layout-common.ts
index 5c1aa01d3..377f5581d 100644
--- a/tns-core-modules/ui/layouts/grid-layout/grid-layout-common.ts
+++ b/tns-core-modules/ui/layouts/grid-layout/grid-layout-common.ts
@@ -332,7 +332,7 @@ export const columnProperty = new Property<View, number>({
     },
     valueConverter: (v) => Math.max(0, parseInt(v))
 });
-columnProperty.register(GridLayoutBase);
+columnProperty.register(View);
 
 export const columnSpanProperty = new Property<View, number>({
     name: "colSpan", defaultValue: 1,
@@ -344,7 +344,7 @@ export const columnSpanProperty = new Property<View, number>({
     },
     valueConverter: (v) => Math.max(1, parseInt(v))
 });
-columnSpanProperty.register(GridLayoutBase);
+columnSpanProperty.register(View);
 
 export const rowProperty = new Property<View, number>({
     name: "row", defaultValue: 0,
@@ -356,7 +356,7 @@ export const rowProperty = new Property<View, number>({
     },
     valueConverter: (v) => Math.max(0, parseInt(v))
 });
-rowProperty.register(GridLayoutBase);
+rowProperty.register(View);
 
 export const rowSpanProperty = new Property<View, number>({
     name: "rowSpan", defaultValue: 1,
@@ -368,4 +368,4 @@ export const rowSpanProperty = new Property<View, number>({
     },
     valueConverter: (v) => Math.max(1, parseInt(v))
 });
-rowSpanProperty.register(GridLayoutBase);
\ No newline at end of file
+rowSpanProperty.register(View);
\ No newline at end of file
diff --git a/tns-core-modules/ui/layouts/grid-layout/grid-layout.android.ts b/tns-core-modules/ui/layouts/grid-layout/grid-layout.android.ts
index c830e675b..b6e58426f 100644
--- a/tns-core-modules/ui/layouts/grid-layout/grid-layout.android.ts
+++ b/tns-core-modules/ui/layouts/grid-layout/grid-layout.android.ts
@@ -6,7 +6,7 @@
 export * from "./grid-layout-common";
 
 function setNativeProperty(view: View, setter: (lp: org.nativescript.widgets.CommonLayoutParams) => void) {
-    let nativeView: android.view.View = view._nativeView;
+    const nativeView: android.view.View = view._nativeView;
     const lp = nativeView.getLayoutParams() || new org.nativescript.widgets.CommonLayoutParams();
     if (lp instanceof org.nativescript.widgets.CommonLayoutParams) {
         setter(lp);
@@ -55,7 +55,7 @@ let colSpanDescriptor: TypedPropertyDescriptor<number> = {
 }
 
 // register native properties on View type.
-Object.defineProperties(View, {
+Object.defineProperties(View.prototype, {
     [rowProperty.native]: rowDescriptor,
     [columnProperty.native]: colDescriptor,
     [rowSpanProperty.native]: rowSpanDescriptor,