nativescript-material-core - npm Package Compare versions

Comparing version 2.2.3 to 2.2.4

android/utils.d.ts

@@ -14,22 +14,25 @@ import { ViewBase } from 'tns-core-modules/ui/page/page';
 export declare const stateSets: {
-    readonly PRESSED_STATE_SET: number[];
-    readonly HOVERED_FOCUSED_STATE_SET: number[];
-    readonly FOCUSED_STATE_SET: number[];
-    readonly HOVERED_STATE_SET: number[];
+    readonly PRESSED_STATE_SET: native.Array<number>;
+    readonly HOVERED_FOCUSED_STATE_SET: native.Array<number>;
+    readonly FOCUSED_STATE_SET: native.Array<number>;
+    readonly HOVERED_STATE_SET: native.Array<number>;
     readonly SELECTED_PRESSED_STATE_SET: native.Array<number>;
-    readonly SELECTED_HOVERED_FOCUSED_STATE_SET: number[];
-    readonly SELECTED_FOCUSED_STATE_SET: number[];
-    readonly SELECTED_HOVERED_STATE_SET: number[];
-    readonly SELECTED_STATE_SET: number[];
+    readonly SELECTED_HOVERED_FOCUSED_STATE_SET: native.Array<number>;
+    readonly SELECTED_FOCUSED_STATE_SET: native.Array<number>;
+    readonly SELECTED_HOVERED_STATE_SET: native.Array<number>;
+    readonly SELECTED_STATE_SET: native.Array<number>;
     readonly BACKGROUND_DEFAULT_STATE_1: number[];
-    readonly BACKGROUND_DEFAULT_STATE_2: number[];
-    readonly BACKGROUND_SELECTED_STATE: number[];
-    readonly BACKGROUND_CHECKED_STATE: number[];
-    readonly BACKGROUND_FOCUSED_STATE: number[];
-    readonly BACKGROUND_DISABLED_STATE: number[];
+    readonly BACKGROUND_DEFAULT_STATE_2: native.Array<number>;
+    readonly BACKGROUND_SELECTED_STATE: native.Array<number>;
+    readonly BACKGROUND_CHECKED_STATE: native.Array<number>;
+    readonly BACKGROUND_FOCUSED_STATE: native.Array<number>;
+    readonly BACKGROUND_DISABLED_STATE: native.Array<number>;
 };
 export declare function getRippleColorStateList(color: number): globalAndroid.content.res.ColorStateList;
 export declare function getEnabledColorStateList(color: number, variant: string): globalAndroid.content.res.ColorStateList;
+export declare function getFocusedColorStateList(color: number, variant: string): globalAndroid.content.res.ColorStateList;
 export declare function createStateListAnimator(view: ViewBase, nativeView: android.view.View): void;
 export declare function getAttrColor(context: android.content.Context, name: string): number;
 export declare function createRippleDrawable(view: android.view.View, rippleColor: number, radius?: number): globalAndroid.graphics.drawable.StateListDrawable | globalAndroid.graphics.drawable.RippleDrawable;
+export declare function handleClearFocus(view: android.view.View): void;
+export declare function setFocusable(view: android.view.View, focusable: boolean): void;

android/utils.js

@@ -1,5 +0,7 @@
-import { Color } from 'tns-core-modules/color/color';
-import { ad } from 'tns-core-modules/utils/utils';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var color_1 = require("tns-core-modules/color/color");
+var utils_1 = require("tns-core-modules/utils/utils");
 var isPostLollipopVar = undefined;
-export function isPostLollipop() {
+function isPostLollipop() {
     if (isPostLollipopVar === undefined) {
@@ -10,4 +12,5 @@ isPostLollipopVar = android.os.Build.VERSION.SDK_INT >= 21;
 }
+exports.isPostLollipop = isPostLollipop;
 var isPostLollipopMR1Var = undefined;
-export function isPostLollipopMR1() {
+function isPostLollipopMR1() {
     if (isPostLollipopMR1Var === undefined) {
@@ -18,3 +21,4 @@ isPostLollipopMR1Var = android.os.Build.VERSION.SDK_INT >= 22;
 }
-export var state = {
+exports.isPostLollipopMR1 = isPostLollipopMR1;
+exports.state = {
     get selected() {
@@ -51,6 +55,6 @@ return 16842913;
 }
-export var stateSets = {
+exports.stateSets = {
     get PRESSED_STATE_SET() {
         if (!this._PRESSED_STATE_SET) {
-            this._PRESSED_STATE_SET = createNativeArray(state.pressed);
+            this._PRESSED_STATE_SET = createNativeArray(exports.state.pressed);
         }
@@ -61,3 +65,3 @@ return this._PRESSED_STATE_SET;
         if (!this._HOVERED_FOCUSED_STATE_SET) {
-            this._HOVERED_FOCUSED_STATE_SET = createNativeArray(state.hovered, state.focused);
+            this._HOVERED_FOCUSED_STATE_SET = createNativeArray(exports.state.hovered, exports.state.focused);
         }
@@ -68,3 +72,3 @@ return this._PRESSED_STATE_SET;
         if (!this._FOCUSED_STATE_SET) {
-            this._FOCUSED_STATE_SET = createNativeArray(state.focused);
+            this._FOCUSED_STATE_SET = createNativeArray(exports.state.focused);
         }
@@ -75,3 +79,3 @@ return this._FOCUSED_STATE_SET;
         if (!this._HOVERED_STATE_SET) {
-            this._HOVERED_STATE_SET = createNativeArray(state.hovered);
+            this._HOVERED_STATE_SET = createNativeArray(exports.state.hovered);
         }
@@ -82,3 +86,3 @@ return this._HOVERED_STATE_SET;
         if (!this._SELECTED_PRESSED_STATE_SET) {
-            this._SELECTED_PRESSED_STATE_SET = createNativeArray(state.enabled, state.pressed);
+            this._SELECTED_PRESSED_STATE_SET = createNativeArray(exports.state.enabled, exports.state.pressed);
         }
@@ -89,3 +93,3 @@ return this._SELECTED_PRESSED_STATE_SET;
         if (!this._SELECTED_HOVERED_FOCUSED_STATE_SET) {
-            this._SELECTED_HOVERED_FOCUSED_STATE_SET = createNativeArray(state.selected, state.hovered, state.focused);
+            this._SELECTED_HOVERED_FOCUSED_STATE_SET = createNativeArray(exports.state.selected, exports.state.hovered, exports.state.focused);
         }
@@ -96,3 +100,3 @@ return this._SELECTED_HOVERED_FOCUSED_STATE_SET;
         if (!this._SELECTED_FOCUSED_STATE_SET) {
-            this._SELECTED_FOCUSED_STATE_SET = createNativeArray(state.selected, state.focused);
+            this._SELECTED_FOCUSED_STATE_SET = createNativeArray(exports.state.selected, exports.state.focused);
         }
@@ -103,3 +107,3 @@ return this._SELECTED_FOCUSED_STATE_SET;
         if (!this._SELECTED_HOVERED_STATE_SET) {
-            this._SELECTED_HOVERED_STATE_SET = createNativeArray(state.selected, state.hovered);
+            this._SELECTED_HOVERED_STATE_SET = createNativeArray(exports.state.selected, exports.state.hovered);
         }
@@ -110,3 +114,3 @@ return this._SELECTED_HOVERED_STATE_SET;
         if (!this._SELECTED_STATE_SET) {
-            this._SELECTED_STATE_SET = createNativeArray(state.selected);
+            this._SELECTED_STATE_SET = createNativeArray(exports.state.selected);
         }
@@ -117,3 +121,3 @@ return this._SELECTED_STATE_SET;
         if (!this._BACKGROUND_DEFAULT_STATE_1) {
-            this._BACKGROUND_DEFAULT_STATE_1 = createNativeArray(state.window_focused, state.enabled);
+            this._BACKGROUND_DEFAULT_STATE_1 = createNativeArray(exports.state.window_focused, exports.state.enabled);
         }
@@ -124,3 +128,3 @@ return this._BACKGROUND_DEFAULT_STATE_1;
         if (!this._BACKGROUND_DEFAULT_STATE_1_SET) {
-            this._BACKGROUND_DEFAULT_STATE_1_SET = createNativeArray(state.enabled);
+            this._BACKGROUND_DEFAULT_STATE_1_SET = createNativeArray(exports.state.enabled);
         }
@@ -131,3 +135,3 @@ return this._BACKGROUND_DEFAULT_STATE_1_SET;
         if (!this._BACKGROUND_SELECTED_STATE) {
-            this._BACKGROUND_SELECTED_STATE = createNativeArray(state.window_focused, state.enabled, state.pressed);
+            this._BACKGROUND_SELECTED_STATE = createNativeArray(exports.state.window_focused, exports.state.enabled, exports.state.pressed);
         }
@@ -138,3 +142,3 @@ return this._BACKGROUND_SELECTED_STATE;
         if (!this._BACKGROUND_CHECKED_STATE) {
-            this._BACKGROUND_CHECKED_STATE = createNativeArray(state.window_focused, state.enabled, state.checked);
+            this._BACKGROUND_CHECKED_STATE = createNativeArray(exports.state.window_focused, exports.state.enabled, exports.state.checked);
         }
@@ -145,3 +149,3 @@ return this._BACKGROUND_CHECKED_STATE;
         if (!this._BACKGROUND_FOCUSED_STATE) {
-            this._BACKGROUND_FOCUSED_STATE = createNativeArray(state.focused, state.window_focused, state.enabled);
+            this._BACKGROUND_FOCUSED_STATE = createNativeArray(exports.state.focused, exports.state.window_focused, exports.state.enabled);
         }
@@ -152,3 +156,3 @@ return this._BACKGROUND_FOCUSED_STATE;
         if (!this._BACKGROUND_DISABLED_STATE) {
-            this._BACKGROUND_DISABLED_STATE = createNativeArray(-state.enabled);
+            this._BACKGROUND_DISABLED_STATE = createNativeArray(-exports.state.enabled);
         }
@@ -158,5 +162,5 @@ return this._BACKGROUND_DISABLED_STATE;
 };
-export function getRippleColorStateList(color) {
+function getRippleColorStateList(color) {
     var states = Array.create('[I', 2);
-    states[0] = stateSets.SELECTED_PRESSED_STATE_SET;
+    states[0] = exports.stateSets.SELECTED_PRESSED_STATE_SET;
     states[1] = Array.create('int', 0);
@@ -174,3 +178,4 @@ // states[1][0] = new java.lang.Integer(state.enabled);
 }
-export function getEnabledColorStateList(color, variant) {
+exports.getRippleColorStateList = getRippleColorStateList;
+function getEnabledColorStateList(color, variant) {
     var states = Array.create('[I', 2);
@@ -180,3 +185,3 @@ // const SELECTED_PRESSED_STATE_SET = Array.create("int",1);
     states[0] = Array.create('int', 1);
-    states[0][0] = -state.enabled;
+    states[0][0] = -exports.state.enabled;
     states[1] = android.util.StateSet.NOTHING;
@@ -189,7 +194,26 @@ // states[1][0] = new java.lang.Integer(-state.enabled);
     var colors = Array.create('int', 2);
-    colors[0] = variant === 'text' || variant === 'outline' ? 0 : new Color(30, 0, 0, 0).android;
+    colors[0] = variant === 'text' || variant === 'outline' ? 0 : new color_1.Color(30, 0, 0, 0).android;
     colors[1] = color;
     return new android.content.res.ColorStateList(states, colors);
 }
-export function createStateListAnimator(view, nativeView) {
+exports.getEnabledColorStateList = getEnabledColorStateList;
+function getFocusedColorStateList(color, variant) {
+    var states = Array.create('[I', 3);
+    states[0] = Array.create('int', 1);
+    states[0][0] = exports.state.pressed;
+    states[1] = Array.create('int', 2);
+    states[1][0] = exports.state.enabled;
+    states[1][1] = exports.state.focused;
+    // states[2] = Array.create('int', 1);
+    // states[2][0] = state.selected;
+    states[2] = android.util.StateSet.NOTHING;
+    var colors = Array.create('int', 4);
+    colors[0] = color;
+    colors[1] = color;
+    colors[2] = color;
+    colors[2] = variant === 'text' || variant === 'outline' ? 0 : new color_1.Color(255, 160, 160, 160).android;
+    return new android.content.res.ColorStateList(states, colors);
+}
+exports.getFocusedColorStateList = getFocusedColorStateList;
+function createStateListAnimator(view, nativeView) {
     var elevation = android.support.v4.view.ViewCompat.getElevation(nativeView);
@@ -211,3 +235,3 @@ var translationZ = android.support.v4.view.ViewCompat.getTranslationZ(nativeView);
     set.setDuration(animationDuration);
-    listAnimator.addState(stateSets.BACKGROUND_SELECTED_STATE, set);
+    listAnimator.addState(exports.stateSets.BACKGROUND_SELECTED_STATE, set);
     animators.clear();
@@ -223,3 +247,3 @@ set = new android.animation.AnimatorSet();
     set.setDuration(animationDuration);
-    listAnimator.addState(stateSets.BACKGROUND_FOCUSED_STATE, set);
+    listAnimator.addState(exports.stateSets.BACKGROUND_FOCUSED_STATE, set);
     animators.clear();
@@ -237,3 +261,3 @@ set = new android.animation.AnimatorSet();
     set.setStartDelay(animationDuration);
-    listAnimator.addState(stateSets.BACKGROUND_DEFAULT_STATE_2, set);
+    listAnimator.addState(exports.stateSets.BACKGROUND_DEFAULT_STATE_2, set);
     animators.clear();
@@ -253,4 +277,5 @@ set = new android.animation.AnimatorSet();
 }
-export function getAttrColor(context, name) {
-    var ta = context.obtainStyledAttributes([ad.resources.getId(':attr/' + name)]);
+exports.createStateListAnimator = createStateListAnimator;
+function getAttrColor(context, name) {
+    var ta = context.obtainStyledAttributes([utils_1.ad.resources.getId(':attr/' + name)]);
     var color = ta.getColor(0, 0);
@@ -260,2 +285,3 @@ ta.recycle();
 }
+exports.getAttrColor = getAttrColor;
 function createForegroundShape(radius) {
@@ -268,3 +294,3 @@ var radii = Array.create('float', 8);
 }
-export function createRippleDrawable(view, rippleColor, radius) {
+function createRippleDrawable(view, rippleColor, radius) {
     if (radius === void 0) { radius = 0; }
@@ -281,3 +307,3 @@ var rippleShape = createForegroundShape(radius);
         rippleShape.getPaint().setColor(rippleColor);
-        rippleDrawable.addState([state.pressed], rippleShape);
+        rippleDrawable.addState([exports.state.pressed], rippleShape);
         // this.rippleDrawable = this.createCompatRippleDrawable(this.getCardRippleColor());
@@ -290,2 +316,31 @@ // view.setForeground(this.createCompatRippleDrawable(this.getRippleColor(this.style['rippleColor'])));
 }
+exports.createRippleDrawable = createRippleDrawable;
+function handleClearFocus(view) {
+    var root = view.getRootView();
+    var oldValue = true;
+    var oldDesc = android.view.ViewGroup.FOCUS_BEFORE_DESCENDANTS;
+    if (root != null) {
+        if (root instanceof android.view.ViewGroup) {
+            oldDesc = root.getDescendantFocusability();
+            root.setDescendantFocusability(android.view.ViewGroup.FOCUS_BLOCK_DESCENDANTS);
+        }
+        oldValue = root.isFocusable();
+        setFocusable(root, false);
+    }
+    view.clearFocus();
+    if (root != null) {
+        setFocusable(root, oldValue);
+        if (root instanceof android.view.ViewGroup) {
+            root.setDescendantFocusability(oldDesc);
+        }
+    }
+}
+exports.handleClearFocus = handleClearFocus;
+function setFocusable(view, focusable) {
+    view.setFocusable(focusable);
+    // so dumb setFocusable to false set setFocusableInTouchMode
+    // but not when using true :s so we have to do it
+    view.setFocusableInTouchMode(focusable);
+}
+exports.setFocusable = setFocusable;
 //# sourceMappingURL=utils.js.map

cssproperties.js

@@ -1,5 +0,7 @@
-import { CssProperty } from 'tns-core-modules/ui/core/properties';
-import { Color } from 'tns-core-modules/color';
-import { Length } from 'tns-core-modules/ui/styling/style-properties';
-import { Style } from 'tns-core-modules/ui/styling/style';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var properties_1 = require("tns-core-modules/ui/core/properties");
+var color_1 = require("tns-core-modules/color");
+var style_properties_1 = require("tns-core-modules/ui/styling/style-properties");
+var style_1 = require("tns-core-modules/ui/styling/style");
 function createGetter(key) {
@@ -15,3 +17,3 @@ return function () {
 }
-export var cssProperty = function (target, key) {
+exports.cssProperty = function (target, key) {
     Object.defineProperty(target, key, {
@@ -24,26 +26,26 @@ get: createGetter(key),
 };
-export var rippleColorProperty = new CssProperty({
+exports.rippleColorProperty = new properties_1.CssProperty({
     name: 'rippleColor',
     cssName: 'ripple-color',
-    equalityComparer: Color.equals,
-    valueConverter: function (v) { return new Color(v); }
+    equalityComparer: color_1.Color.equals,
+    valueConverter: function (v) { return new color_1.Color(v); }
 });
-rippleColorProperty.register(Style);
-export var elevationProperty = new CssProperty({
+exports.rippleColorProperty.register(style_1.Style);
+exports.elevationProperty = new properties_1.CssProperty({
     name: 'elevation',
     cssName: 'elevation',
-    valueConverter: function (v) { return Length.toDevicePixels(Length.parse(v), 0); }
+    valueConverter: function (v) { return style_properties_1.Length.toDevicePixels(style_properties_1.Length.parse(v), 0); }
 });
-elevationProperty.register(Style);
-export var elevationHighlightedProperty = new CssProperty({
+exports.elevationProperty.register(style_1.Style);
+exports.elevationHighlightedProperty = new properties_1.CssProperty({
     name: 'elevationHighlighted',
     cssName: 'elevation-highlighted',
-    valueConverter: function (v) { return Length.toDevicePixels(Length.parse(v), 0); }
+    valueConverter: function (v) { return style_properties_1.Length.toDevicePixels(style_properties_1.Length.parse(v), 0); }
 });
-elevationHighlightedProperty.register(Style);
-export var variantProperty = new CssProperty({
+exports.elevationHighlightedProperty.register(style_1.Style);
+exports.variantProperty = new properties_1.CssProperty({
     name: 'variant',
     cssName: 'variant'
 });
-variantProperty.register(Style);
+exports.variantProperty.register(style_1.Style);
 //# sourceMappingURL=cssproperties.js.map

material.android.js

@@ -0,5 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 // export * from './material.common';
-import { Color } from 'tns-core-modules/color';
-import { applyMixins } from './material.common';
-export { applyMixins };
+var color_1 = require("tns-core-modules/color");
+var material_common_1 = require("./material.common");
+exports.applyMixins = material_common_1.applyMixins;
 // stub class as we don't use this on android
@@ -27,5 +29,5 @@ var Themer = /** @class */ (function () {
 }());
-export { Themer };
-export var themer = new Themer();
-export function install() {
+exports.Themer = Themer;
+exports.themer = new Themer();
+function install() {
     try {
@@ -38,10 +40,13 @@ require('nativescript-material-bottomsheet').install();
 }
-export function getRippleColor(color) {
+exports.install = install;
+function getRippleColor(color) {
     if (color) {
-        var temp = typeof color === 'string' ? new Color(color) : color;
-        return new Color(temp.a !== 255 ? temp.a : 36, temp.r, temp.g, temp.b).android; // default alpha is 0.14
+        var temp = typeof color === 'string' ? new color_1.Color(color) : color;
+        return new color_1.Color(temp.a !== 255 ? temp.a : 36, temp.r, temp.g, temp.b).android; // default alpha is 0.14
     }
     return null;
 }
-export function installMixins() { }
+exports.getRippleColor = getRippleColor;
+function installMixins() { }
+exports.installMixins = installMixins;
 //# sourceMappingURL=material.android.js.map

material.common.js

@@ -1,2 +0,4 @@
-export function applyMixins(derivedCtor, baseCtors) {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function applyMixins(derivedCtor, baseCtors) {
     baseCtors.forEach(function (baseCtor) {
@@ -45,2 +47,3 @@ Object.getOwnPropertyNames(baseCtor.prototype).forEach(function (name) {
 }
+exports.applyMixins = applyMixins;
 //# sourceMappingURL=material.common.js.map

material.ios.js

@@ -1,10 +0,12 @@
-import { Color } from 'tns-core-modules/color';
-import { View } from 'tns-core-modules/ui/core/view/view';
-import { layout } from 'tns-core-modules/utils/utils';
-import { cssProperty, elevationHighlightedProperty, elevationProperty, rippleColorProperty } from './cssproperties';
-import { ControlStateChangeListener } from 'tns-core-modules/ui/core/control-state-change';
-import { backgroundInternalProperty } from 'tns-core-modules/ui/styling/style-properties';
-import { applyMixins } from './material.common';
-import { GestureTypes, TouchAction } from 'tns-core-modules/ui/gestures';
-export { applyMixins };
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var color_1 = require("tns-core-modules/color");
+var view_1 = require("tns-core-modules/ui/core/view/view");
+var utils_1 = require("tns-core-modules/utils/utils");
+var cssproperties_1 = require("./cssproperties");
+var control_state_change_1 = require("tns-core-modules/ui/core/control-state-change");
+var style_properties_1 = require("tns-core-modules/ui/styling/style-properties");
+var material_common_1 = require("./material.common");
+exports.applyMixins = material_common_1.applyMixins;
+var gestures_1 = require("tns-core-modules/ui/gestures");
 var Themer = /** @class */ (function () {
@@ -27,8 +29,8 @@ function Themer() {
         var colorTheme = this.getOrcreateAppColorScheme();
-        var color = new Color(value);
+        var color = new color_1.Color(value);
         colorTheme.primaryColor = color.ios;
-        colorTheme.primaryColorVariant = new Color(61.2, color.r, color.g, color.b).ios; // default alpha is 0.24
+        colorTheme.primaryColorVariant = new color_1.Color(61.2, color.r, color.g, color.b).ios; // default alpha is 0.24
     };
     Themer.prototype.setPrimaryColorVariant = function (value) {
-        this.getOrcreateAppColorScheme().primaryColorVariant = new Color(value).ios;
+        this.getOrcreateAppColorScheme().primaryColorVariant = new color_1.Color(value).ios;
     };
@@ -53,5 +55,5 @@ Themer.prototype.getOrcreateAppTypographyScheme = function () {
 }());
-export { Themer };
-export var themer = new Themer();
-export function install() {
+exports.Themer = Themer;
+exports.themer = new Themer();
+function install() {
     try {
@@ -64,9 +66,11 @@ require('nativescript-material-bottomsheet').install();
 }
-export function getRippleColor(color) {
+exports.install = install;
+function getRippleColor(color) {
     if (color) {
-        var temp = typeof color === 'string' ? new Color(color) : color;
-        return new Color(temp.a !== 255 ? temp.a : 36, temp.r, temp.g, temp.b).ios; // default alpha is 0.14
+        var temp = typeof color === 'string' ? new color_1.Color(color) : color;
+        return new color_1.Color(temp.a !== 255 ? temp.a : 36, temp.r, temp.g, temp.b).ios; // default alpha is 0.14
     }
     return null;
 }
+exports.getRippleColor = getRippleColor;
 var ViewWithElevationAndRipple = /** @class */ (function (_super) {
@@ -84,6 +88,6 @@ __extends(ViewWithElevationAndRipple, _super);
             this.inkTouchController.addInkView();
-            var colorScheme = themer.getAppColorScheme();
+            var colorScheme = exports.themer.getAppColorScheme();
             MDCInkColorThemer.applyColorSchemeToInkView(colorScheme, this.inkTouchController.defaultInkView);
             if (this.style.backgroundInternal) {
-                this.inkTouchController.defaultInkView.layer.cornerRadius = layout.toDeviceIndependentPixels(this.style.backgroundInternal.borderTopLeftRadius);
+                this.inkTouchController.defaultInkView.layer.cornerRadius = utils_1.layout.toDeviceIndependentPixels(this.style.backgroundInternal.borderTopLeftRadius);
             }
@@ -103,3 +107,3 @@ }
             if (this.style.backgroundInternal) {
-                layer.cornerRadius = layout.toDeviceIndependentPixels(this.style.backgroundInternal.borderTopLeftRadius);
+                layer.cornerRadius = utils_1.layout.toDeviceIndependentPixels(this.style.backgroundInternal.borderTopLeftRadius);
             }
@@ -128,3 +132,3 @@ if (this.nativeViewProtected instanceof UIControl) {
             else {
-                this.off(GestureTypes.touch, this._elevationStateChangedHandler);
+                this.off(gestures_1.GestureTypes.touch, this._elevationStateChangedHandler);
             }
@@ -139,7 +143,7 @@ }
     };
-    ViewWithElevationAndRipple.prototype[rippleColorProperty.setNative] = function (color) {
+    ViewWithElevationAndRipple.prototype[cssproperties_1.rippleColorProperty.setNative] = function (color) {
         this.getOrCreateRippleController();
         this.inkTouchController.defaultInkView.inkColor = getRippleColor(color);
     };
-    ViewWithElevationAndRipple.prototype[elevationProperty.setNative] = function (value) {
+    ViewWithElevationAndRipple.prototype[cssproperties_1.elevationProperty.setNative] = function (value) {
         this.getOrCreateShadowLayer();
@@ -159,3 +163,3 @@ this._shadowElevations['normal'] = value;
                     this._elevationStateChangedHandler ||
-                        new ControlStateChangeListener(this.nativeViewProtected, function (s) {
+                        new control_state_change_1.ControlStateChangeListener(this.nativeViewProtected, function (s) {
                             _this.updateShadowElevation(s);
@@ -170,6 +174,6 @@ });
                             switch (args.action) {
-                                case TouchAction.up:
+                                case gestures_1.TouchAction.up:
                                     _this.updateShadowElevation('normal');
                                     break;
-                                case TouchAction.down:
+                                case gestures_1.TouchAction.down:
                                     _this.updateShadowElevation('highlighted');
@@ -179,7 +183,7 @@ break;
                         });
-                this.on(GestureTypes.touch, this._elevationStateChangedHandler);
+                this.on(gestures_1.GestureTypes.touch, this._elevationStateChangedHandler);
             }
         }
     };
-    ViewWithElevationAndRipple.prototype[elevationHighlightedProperty.setNative] = function (value) {
+    ViewWithElevationAndRipple.prototype[cssproperties_1.elevationHighlightedProperty.setNative] = function (value) {
         this.getOrCreateShadowLayer();
@@ -191,32 +195,34 @@ this.startElevationStateChangeHandler();
     };
-    ViewWithElevationAndRipple.prototype[backgroundInternalProperty.setNative] = function (value) {
+    ViewWithElevationAndRipple.prototype[style_properties_1.backgroundInternalProperty.setNative] = function (value) {
         // base impl will be called before
         if (this.shadowLayer) {
-            this.shadowLayer.cornerRadius = layout.toDeviceIndependentPixels(value.borderTopLeftRadius);
+            this.shadowLayer.cornerRadius = utils_1.layout.toDeviceIndependentPixels(value.borderTopLeftRadius);
         }
         if (this.inkTouchController) {
-            this.inkTouchController.defaultInkView.layer.cornerRadius = layout.toDeviceIndependentPixels(value.borderTopLeftRadius);
+            this.inkTouchController.defaultInkView.layer.cornerRadius = utils_1.layout.toDeviceIndependentPixels(value.borderTopLeftRadius);
         }
     };
     __decorate([
-        cssProperty,
+        cssproperties_1.cssProperty,
         __metadata("design:type", Number)
     ], ViewWithElevationAndRipple.prototype, "elevation", void 0);
     __decorate([
-        cssProperty,
+        cssproperties_1.cssProperty,
         __metadata("design:type", Number)
     ], ViewWithElevationAndRipple.prototype, "elevationHighlighted", void 0);
     __decorate([
-        cssProperty,
-        __metadata("design:type", Color)
+        cssproperties_1.cssProperty,
+        __metadata("design:type", color_1.Color)
     ], ViewWithElevationAndRipple.prototype, "rippleColor", void 0);
     return ViewWithElevationAndRipple;
-}(View));
-export function overrideViewBase() {
+}(view_1.View));
+function overrideViewBase() {
     var NSView = require('tns-core-modules/ui/core/view').View;
-    applyMixins(NSView, [ViewWithElevationAndRipple]);
+    material_common_1.applyMixins(NSView, [ViewWithElevationAndRipple]);
 }
-export function installMixins() {
+exports.overrideViewBase = overrideViewBase;
+function installMixins() {
     overrideViewBase();
 }
+exports.installMixins = installMixins;
 //# sourceMappingURL=material.ios.js.map

package.json

 {
     "name": "nativescript-material-core",
-    "version": "2.2.3",
+    "version": "2.2.4",
     "description": "Material Core component",
@@ -33,3 +33,3 @@ "main": "./material",
     "readmeFilename": "README.md",
-    "gitHead": "5a8de5bc4958261b46b50bea9c67ff5d29df87e9"
+    "gitHead": "9a09ea458c669d29c914d25a60e9c244d269644c"
 }

No alert changes

Improved metrics

Total package byte prevSize

109688

increased by5.13%

Lines of code

781

increased by10.47%

No dependency changes