@nativescript/core 9.0.19-next.7 → 9.0.19-next.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/ui/button/index.android.d.ts +2 -9
- package/ui/button/index.android.js +7 -24
- package/ui/button/index.android.js.map +1 -1
- package/ui/button/index.ios.d.ts +2 -9
- package/ui/button/index.ios.js +17 -72
- package/ui/button/index.ios.js.map +1 -1
- package/ui/core/view/index.android.d.ts +1 -0
- package/ui/core/view/index.android.js +17 -8
- package/ui/core/view/index.android.js.map +1 -1
- package/ui/core/view/index.ios.d.ts +1 -0
- package/ui/core/view/index.ios.js +14 -0
- package/ui/core/view/index.ios.js.map +1 -1
- package/ui/core/view-base/index.d.ts +19 -9
- package/ui/core/view-base/index.js +39 -26
- package/ui/core/view-base/index.js.map +1 -1
- package/ui/label/index.ios.d.ts +2 -5
- package/ui/label/index.ios.js +12 -44
- package/ui/label/index.ios.js.map +1 -1
- package/ui/layouts/layout-base.android.d.ts +3 -10
- package/ui/layouts/layout-base.android.js +7 -24
- package/ui/layouts/layout-base.android.js.map +1 -1
- package/ui/layouts/layout-base.ios.js.map +1 -1
- package/ui/styling/style/index.d.ts +1 -0
- package/ui/styling/style/index.js.map +1 -1
- package/ui/styling/style-properties.d.ts +1 -0
- package/ui/styling/style-properties.js +13 -4
- package/ui/styling/style-properties.js.map +1 -1
- package/ui/text-base/index.android.d.ts +2 -9
- package/ui/text-base/index.android.js +7 -24
- package/ui/text-base/index.android.js.map +1 -1
- package/ui/text-field/index.ios.d.ts +2 -9
- package/ui/text-field/index.ios.js +2 -23
- package/ui/text-field/index.ios.js.map +1 -1
- package/ui/text-view/index.ios.d.ts +2 -9
- package/ui/text-view/index.ios.js +20 -72
- package/ui/text-view/index.ios.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,19 +1,12 @@
|
|
|
1
1
|
import { ButtonBase } from './button-common';
|
|
2
|
-
import {
|
|
2
|
+
import { zIndexProperty, minWidthProperty, minHeightProperty, paddingInternalProperty } from '../styling/style-properties';
|
|
3
3
|
import { textAlignmentProperty } from '../text-base';
|
|
4
4
|
import { CoreTypes } from '../../core-types';
|
|
5
5
|
export * from './button-common';
|
|
6
6
|
export declare class Button extends ButtonBase {
|
|
7
7
|
[minWidthProperty.getDefault]: () => CoreTypes.LengthType;
|
|
8
8
|
[minHeightProperty.getDefault]: () => CoreTypes.LengthType;
|
|
9
|
-
[
|
|
10
|
-
[paddingTopProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
11
|
-
[paddingRightProperty.getDefault]: () => CoreTypes.LengthType;
|
|
12
|
-
[paddingRightProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
13
|
-
[paddingBottomProperty.getDefault]: () => CoreTypes.LengthType;
|
|
14
|
-
[paddingBottomProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
15
|
-
[paddingLeftProperty.getDefault]: () => CoreTypes.LengthType;
|
|
16
|
-
[paddingLeftProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
9
|
+
[paddingInternalProperty.setNative]: (_value: string) => void;
|
|
17
10
|
[zIndexProperty.setNative]: (value: number) => void;
|
|
18
11
|
[textAlignmentProperty.setNative]: (value: CoreTypes.TextAlignmentType) => void;
|
|
19
12
|
nativeViewProtected: android.widget.Button;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ButtonBase } from './button-common';
|
|
2
2
|
import { PseudoClassHandler } from '../core/view';
|
|
3
|
-
import {
|
|
3
|
+
import { zIndexProperty, minWidthProperty, minHeightProperty, paddingInternalProperty } from '../styling/style-properties';
|
|
4
4
|
import { Length } from '../styling/length-shared';
|
|
5
5
|
import { textAlignmentProperty } from '../text-base';
|
|
6
6
|
import { profile } from '../../profiling';
|
|
@@ -95,29 +95,12 @@ export class Button extends ButtonBase {
|
|
|
95
95
|
const dips = org.nativescript.widgets.ViewHelper.getMinHeight(this.nativeViewProtected);
|
|
96
96
|
return { value: dips, unit: 'px' };
|
|
97
97
|
}
|
|
98
|
-
[
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
[paddingRightProperty.getDefault]() {
|
|
105
|
-
return { value: this._defaultPaddingRight, unit: 'px' };
|
|
106
|
-
}
|
|
107
|
-
[paddingRightProperty.setNative](value) {
|
|
108
|
-
org.nativescript.widgets.ViewHelper.setPaddingRight(this.nativeViewProtected, Length.toDevicePixels(value, 0) + Length.toDevicePixels(this.style.borderRightWidth, 0));
|
|
109
|
-
}
|
|
110
|
-
[paddingBottomProperty.getDefault]() {
|
|
111
|
-
return { value: this._defaultPaddingBottom, unit: 'px' };
|
|
112
|
-
}
|
|
113
|
-
[paddingBottomProperty.setNative](value) {
|
|
114
|
-
org.nativescript.widgets.ViewHelper.setPaddingBottom(this.nativeViewProtected, Length.toDevicePixels(value, 0) + Length.toDevicePixels(this.style.borderBottomWidth, 0));
|
|
115
|
-
}
|
|
116
|
-
[paddingLeftProperty.getDefault]() {
|
|
117
|
-
return { value: this._defaultPaddingLeft, unit: 'px' };
|
|
118
|
-
}
|
|
119
|
-
[paddingLeftProperty.setNative](value) {
|
|
120
|
-
org.nativescript.widgets.ViewHelper.setPaddingLeft(this.nativeViewProtected, Length.toDevicePixels(value, 0) + Length.toDevicePixels(this.style.borderLeftWidth, 0));
|
|
98
|
+
[paddingInternalProperty.setNative](_value) {
|
|
99
|
+
const left = this.effectivePaddingLeft + Length.toDevicePixels(this.style.borderLeftWidth, 0);
|
|
100
|
+
const top = this.effectivePaddingTop + Length.toDevicePixels(this.style.borderTopWidth, 0);
|
|
101
|
+
const right = this.effectivePaddingRight + Length.toDevicePixels(this.style.borderRightWidth, 0);
|
|
102
|
+
const bottom = this.effectivePaddingBottom + Length.toDevicePixels(this.style.borderBottomWidth, 0);
|
|
103
|
+
this.nativeViewProtected.setPadding(left, top, right, bottom);
|
|
121
104
|
}
|
|
122
105
|
[zIndexProperty.setNative](value) {
|
|
123
106
|
if (SDK_VERSION >= 21) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../../packages/core/ui/button/index.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../../packages/core/ui/button/index.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3H,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAyB,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,cAAc,iBAAiB,CAAC;AAMhC,IAAI,aAA4B,CAAC;AACjC,IAAI,aAA2C,CAAC;AAEhD,SAAS,uBAAuB;IAC/B,IAAI,aAAa,EAAE,CAAC;QACnB,OAAO;IACR,CAAC;;;;;;;QAnBgC,CAAC;;;;;YAIjC,CAAC;QAAS,CAAC;;;;;IAKZ,CAAC;IA6BD,aAAa,GAAG,iBAAiB,CAAC;CAClC;AAED,SAAS,mBAAmB,CAAC,IAA2B;IACvD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAgB,CAAC;IAErC,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;QACrB,KAAK,WAAW,CAAC,EAAE,CAAC;QACpB,KAAK,WAAW,CAAC,MAAM;YACtB,MAAM,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;YACzC,MAAM;QACP,KAAK,WAAW,CAAC,IAAI;YACpB,MAAM,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;YACtC,MAAM;IACR,CAAC;AACF,CAAC;AAED,MAAM,OAAO,MAAO,SAAQ,UAAU;IAM9B,gBAAgB;QACtB,IAAI,CAAC,aAAa,EAAE,CAAC;YACpB,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;QACvC,CAAC;QAED,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAEM,cAAc;QACpB,KAAK,CAAC,cAAc,EAAE,CAAC;QACvB,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAC5C,8DAA8D;QAC9D,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC7B,uBAAuB,EAAE,CAAC;QAC1B,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC;QAC9C,UAAU,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;QACvC,UAAW,CAAC,aAAa,GAAG,aAAa,CAAC;IACjD,CAAC;IAEM,iBAAiB;QACvB,IAAU,IAAI,CAAC,mBAAoB,EAAE,aAAa,EAAE,CAAC;YAC9C,IAAI,CAAC,mBAAoB,CAAC,aAAa,CAAC,KAAK,GAAG,IAAI,CAAC;QAC5D,CAAC;QACD,KAAK,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAEM,eAAe;QACrB,KAAK,CAAC,eAAe,EAAE,CAAC;QAExB,IAAI,IAAI,CAAC,kBAAkB,IAAI,WAAW,IAAI,EAAE,EAAE,CAAC;YAClD,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACvE,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC;QACrC,CAAC;IACF,CAAC;IAGD,+BAA+B,CAAC,SAAkB;QACjD,IAAI,SAAS,EAAE,CAAC;YACf,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,mBAAmB,CAAC,CAAC;QAChE,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,mBAAmB,CAAC,CAAC;YAChE,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;QACxC,CAAC;IACF,CAAC;IAED,IAAa,uBAAuB;QACnC,OAAO,IAAI,CAAC;IACb,CAAC;IAED,CAAC,gBAAgB,CAAC,UAAU,CAAC;QAC5B,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAEvF,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACpC,CAAC;IAED,CAAC,iBAAiB,CAAC,UAAU,CAAC;QAC7B,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAExF,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACpC,CAAC;IAED,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC,MAAc;QACjD,MAAM,IAAI,GAAG,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;QAC9F,MAAM,GAAG,GAAG,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAC3F,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;QACjG,MAAM,MAAM,GAAG,IAAI,CAAC,sBAAsB,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;QACpG,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;IAED,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,KAAa;QACvC,IAAI,WAAW,IAAI,EAAE,EAAE,CAAC;YACvB,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC;YAC5C,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC9B,IAAI,CAAC,kBAAkB,GAAS,UAAW,CAAC,oBAAoB,EAAE,CAAC;YACpE,CAAC;YACK,UAAW,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAC9C,CAAC;QAED,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;IAChF,CAAC;IAED,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,KAAkC;QACnE,iCAAiC;QACjC,MAAM,QAAQ,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;QACxD,KAAK,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;IAES,mBAAmB;QAC5B,IAAI,WAAW,GAAG,EAAE,EAAE,CAAC;YACtB,OAAO,CAAC,CAAC;QACV,CAAC;QAED,iFAAiF;QACjF,8EAA8E;QAC9E,+EAA+E;QAC/E,OAAO,CAAC,CAAC;IACV,CAAC;IAES,gCAAgC;QACzC,IAAI,WAAW,GAAG,EAAE,EAAE,CAAC;YACtB,OAAO,CAAC,CAAC;QACV,CAAC;QAED,OAAO,CAAC,CAAC,CAAC,uCAAuC;IAClD,CAAC;CACD;AAzGO;IADN,OAAO;;;;8CAOP;AA8BD;IADC,kBAAkB,CAAC,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,QAAQ,CAAC;;;;6DAQhE;AAgEF,MAAM,CAAC,SAAS,CAAC,8BAA8B,GAAG,IAAI,CAAC"}
|
package/ui/button/index.ios.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ButtonBase } from './button-common';
|
|
2
|
-
import { borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty,
|
|
2
|
+
import { borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty, directionProperty, paddingInternalProperty } from '../styling/style-properties';
|
|
3
3
|
import { textAlignmentProperty, whiteSpaceProperty, textOverflowProperty } from '../text-base';
|
|
4
4
|
import { CoreTypes } from '../../core-types';
|
|
5
5
|
export * from './button-common';
|
|
@@ -12,14 +12,7 @@ export declare class Button extends ButtonBase {
|
|
|
12
12
|
[borderBottomWidthProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
13
13
|
[borderLeftWidthProperty.getDefault]: () => CoreTypes.LengthType;
|
|
14
14
|
[borderLeftWidthProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
15
|
-
[
|
|
16
|
-
[paddingTopProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
17
|
-
[paddingRightProperty.getDefault]: () => CoreTypes.LengthType;
|
|
18
|
-
[paddingRightProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
19
|
-
[paddingBottomProperty.getDefault]: () => CoreTypes.LengthType;
|
|
20
|
-
[paddingBottomProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
21
|
-
[paddingLeftProperty.getDefault]: () => CoreTypes.LengthType;
|
|
22
|
-
[paddingLeftProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
15
|
+
[paddingInternalProperty.setNative]: (_value: string) => void;
|
|
23
16
|
[textAlignmentProperty.setNative]: (value: CoreTypes.TextAlignmentType) => void;
|
|
24
17
|
[whiteSpaceProperty.setNative]: (value: CoreTypes.WhiteSpaceType) => void;
|
|
25
18
|
[textOverflowProperty.setNative]: (value: CoreTypes.TextOverflowType) => void;
|
package/ui/button/index.ios.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ControlStateChangeListener } from '../core/control-state-change';
|
|
2
2
|
import { ButtonBase } from './button-common';
|
|
3
3
|
import { View, PseudoClassHandler } from '../core/view';
|
|
4
|
-
import { borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty,
|
|
4
|
+
import { borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty, directionProperty, paddingInternalProperty } from '../styling/style-properties';
|
|
5
5
|
import { textAlignmentProperty, whiteSpaceProperty, textOverflowProperty } from '../text-base';
|
|
6
6
|
import { layout } from '../../utils';
|
|
7
7
|
import { CoreTypes } from '../../core-types';
|
|
@@ -20,6 +20,7 @@ export class Button extends ButtonBase {
|
|
|
20
20
|
super.initNativeView();
|
|
21
21
|
this._tapHandler = TapHandlerImpl.initWithOwner(new WeakRef(this));
|
|
22
22
|
this.nativeViewProtected.addTargetActionForControlEvents(this._tapHandler, 'tap', 64 /* UIControlEvents.TouchUpInside */);
|
|
23
|
+
this._setDefaultPaddings(this.nativeViewProtected.contentEdgeInsets);
|
|
23
24
|
}
|
|
24
25
|
disposeNativeView() {
|
|
25
26
|
this._tapHandler = null;
|
|
@@ -68,12 +69,12 @@ export class Button extends ButtonBase {
|
|
|
68
69
|
[borderTopWidthProperty.setNative](value) {
|
|
69
70
|
const inset = this.nativeViewProtected.contentEdgeInsets;
|
|
70
71
|
const top = layout.toDeviceIndependentPixels(this.effectivePaddingTop + this.effectiveBorderTopWidth);
|
|
71
|
-
this.nativeViewProtected.contentEdgeInsets = {
|
|
72
|
+
this.nativeViewProtected.contentEdgeInsets = new UIEdgeInsets({
|
|
72
73
|
top: top,
|
|
73
74
|
left: inset.left,
|
|
74
75
|
bottom: inset.bottom,
|
|
75
76
|
right: inset.right,
|
|
76
|
-
};
|
|
77
|
+
});
|
|
77
78
|
}
|
|
78
79
|
[borderRightWidthProperty.getDefault]() {
|
|
79
80
|
return {
|
|
@@ -84,12 +85,12 @@ export class Button extends ButtonBase {
|
|
|
84
85
|
[borderRightWidthProperty.setNative](value) {
|
|
85
86
|
const inset = this.nativeViewProtected.contentEdgeInsets;
|
|
86
87
|
const right = layout.toDeviceIndependentPixels(this.effectivePaddingRight + this.effectiveBorderRightWidth);
|
|
87
|
-
this.nativeViewProtected.contentEdgeInsets = {
|
|
88
|
+
this.nativeViewProtected.contentEdgeInsets = new UIEdgeInsets({
|
|
88
89
|
top: inset.top,
|
|
89
90
|
left: inset.left,
|
|
90
91
|
bottom: inset.bottom,
|
|
91
92
|
right: right,
|
|
92
|
-
};
|
|
93
|
+
});
|
|
93
94
|
}
|
|
94
95
|
[borderBottomWidthProperty.getDefault]() {
|
|
95
96
|
return {
|
|
@@ -100,12 +101,12 @@ export class Button extends ButtonBase {
|
|
|
100
101
|
[borderBottomWidthProperty.setNative](value) {
|
|
101
102
|
const inset = this.nativeViewProtected.contentEdgeInsets;
|
|
102
103
|
const bottom = layout.toDeviceIndependentPixels(this.effectivePaddingBottom + this.effectiveBorderBottomWidth);
|
|
103
|
-
this.nativeViewProtected.contentEdgeInsets = {
|
|
104
|
+
this.nativeViewProtected.contentEdgeInsets = new UIEdgeInsets({
|
|
104
105
|
top: inset.top,
|
|
105
106
|
left: inset.left,
|
|
106
107
|
bottom: bottom,
|
|
107
108
|
right: inset.right,
|
|
108
|
-
};
|
|
109
|
+
});
|
|
109
110
|
}
|
|
110
111
|
[borderLeftWidthProperty.getDefault]() {
|
|
111
112
|
return {
|
|
@@ -116,76 +117,20 @@ export class Button extends ButtonBase {
|
|
|
116
117
|
[borderLeftWidthProperty.setNative](value) {
|
|
117
118
|
const inset = this.nativeViewProtected.contentEdgeInsets;
|
|
118
119
|
const left = layout.toDeviceIndependentPixels(this.effectivePaddingLeft + this.effectiveBorderLeftWidth);
|
|
119
|
-
this.nativeViewProtected.contentEdgeInsets = {
|
|
120
|
+
this.nativeViewProtected.contentEdgeInsets = new UIEdgeInsets({
|
|
120
121
|
top: inset.top,
|
|
121
122
|
left: left,
|
|
122
123
|
bottom: inset.bottom,
|
|
123
124
|
right: inset.right,
|
|
124
|
-
};
|
|
125
|
-
}
|
|
126
|
-
[paddingTopProperty.getDefault]() {
|
|
127
|
-
return {
|
|
128
|
-
value: this.nativeViewProtected.contentEdgeInsets.top,
|
|
129
|
-
unit: 'px',
|
|
130
|
-
};
|
|
131
|
-
}
|
|
132
|
-
[paddingTopProperty.setNative](value) {
|
|
133
|
-
const inset = this.nativeViewProtected.contentEdgeInsets;
|
|
134
|
-
const top = layout.toDeviceIndependentPixels(this.effectivePaddingTop + this.effectiveBorderTopWidth);
|
|
135
|
-
this.nativeViewProtected.contentEdgeInsets = {
|
|
136
|
-
top: top,
|
|
137
|
-
left: inset.left,
|
|
138
|
-
bottom: inset.bottom,
|
|
139
|
-
right: inset.right,
|
|
140
|
-
};
|
|
141
|
-
}
|
|
142
|
-
[paddingRightProperty.getDefault]() {
|
|
143
|
-
return {
|
|
144
|
-
value: this.nativeViewProtected.contentEdgeInsets.right,
|
|
145
|
-
unit: 'px',
|
|
146
|
-
};
|
|
125
|
+
});
|
|
147
126
|
}
|
|
148
|
-
[
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
right: right,
|
|
156
|
-
};
|
|
157
|
-
}
|
|
158
|
-
[paddingBottomProperty.getDefault]() {
|
|
159
|
-
return {
|
|
160
|
-
value: this.nativeViewProtected.contentEdgeInsets.bottom,
|
|
161
|
-
unit: 'px',
|
|
162
|
-
};
|
|
163
|
-
}
|
|
164
|
-
[paddingBottomProperty.setNative](value) {
|
|
165
|
-
const inset = this.nativeViewProtected.contentEdgeInsets;
|
|
166
|
-
const bottom = layout.toDeviceIndependentPixels(this.effectivePaddingBottom + this.effectiveBorderBottomWidth);
|
|
167
|
-
this.nativeViewProtected.contentEdgeInsets = {
|
|
168
|
-
top: inset.top,
|
|
169
|
-
left: inset.left,
|
|
170
|
-
bottom: bottom,
|
|
171
|
-
right: inset.right,
|
|
172
|
-
};
|
|
173
|
-
}
|
|
174
|
-
[paddingLeftProperty.getDefault]() {
|
|
175
|
-
return {
|
|
176
|
-
value: this.nativeViewProtected.contentEdgeInsets.left,
|
|
177
|
-
unit: 'px',
|
|
178
|
-
};
|
|
179
|
-
}
|
|
180
|
-
[paddingLeftProperty.setNative](value) {
|
|
181
|
-
const inset = this.nativeViewProtected.contentEdgeInsets;
|
|
182
|
-
const left = layout.toDeviceIndependentPixels(this.effectivePaddingLeft + this.effectiveBorderLeftWidth);
|
|
183
|
-
this.nativeViewProtected.contentEdgeInsets = {
|
|
184
|
-
top: inset.top,
|
|
185
|
-
left: left,
|
|
186
|
-
bottom: inset.bottom,
|
|
187
|
-
right: inset.right,
|
|
188
|
-
};
|
|
127
|
+
[paddingInternalProperty.setNative](_value) {
|
|
128
|
+
this.nativeViewProtected.contentEdgeInsets = new UIEdgeInsets({
|
|
129
|
+
top: layout.toDeviceIndependentPixels(this.effectivePaddingTop + this.effectiveBorderTopWidth),
|
|
130
|
+
left: layout.toDeviceIndependentPixels(this.effectivePaddingLeft + this.effectiveBorderLeftWidth),
|
|
131
|
+
bottom: layout.toDeviceIndependentPixels(this.effectivePaddingBottom + this.effectiveBorderBottomWidth),
|
|
132
|
+
right: layout.toDeviceIndependentPixels(this.effectivePaddingRight + this.effectiveBorderRightWidth),
|
|
133
|
+
});
|
|
189
134
|
}
|
|
190
135
|
[textAlignmentProperty.setNative](value) {
|
|
191
136
|
switch (value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/button/index.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/button/index.ios.ts"],"names":[],"mappings":"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"}
|
|
@@ -107,6 +107,7 @@ export declare class View extends ViewCommon {
|
|
|
107
107
|
getMeasuredWidth(): number;
|
|
108
108
|
getMeasuredHeight(): number;
|
|
109
109
|
focus(): boolean;
|
|
110
|
+
_setDefaultPaddings(insets: android.graphics.Rect): void;
|
|
110
111
|
getLocationInWindow(): Point;
|
|
111
112
|
getLocationOnScreen(): Point;
|
|
112
113
|
getLocationRelativeTo(otherView: ViewCommon): Point;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getNativeScriptGlobals } from '../../../globals/global-utils';
|
|
2
2
|
import { ViewCommon, isEnabledProperty, originXProperty, originYProperty, isUserInteractionEnabledProperty, testIDProperty, AndroidHelper, androidOverflowEdgeProperty, statusBarStyleProperty } from './view-common';
|
|
3
|
-
import {
|
|
3
|
+
import { directionProperty } from '../../styling/style-properties';
|
|
4
4
|
import { layout } from '../../../utils';
|
|
5
5
|
import { Trace } from '../../../trace';
|
|
6
6
|
import { hiddenProperty } from '../view-base';
|
|
@@ -754,6 +754,20 @@ export class View extends ViewCommon {
|
|
|
754
754
|
}
|
|
755
755
|
return false;
|
|
756
756
|
}
|
|
757
|
+
_setDefaultPaddings(insets) {
|
|
758
|
+
if (insets) {
|
|
759
|
+
this._defaultPaddingTop = layout.toDevicePixels(insets.top);
|
|
760
|
+
this._defaultPaddingRight = layout.toDevicePixels(insets.right);
|
|
761
|
+
this._defaultPaddingBottom = layout.toDevicePixels(insets.bottom);
|
|
762
|
+
this._defaultPaddingLeft = layout.toDevicePixels(insets.left);
|
|
763
|
+
}
|
|
764
|
+
else {
|
|
765
|
+
this._defaultPaddingTop = 0;
|
|
766
|
+
this._defaultPaddingRight = 0;
|
|
767
|
+
this._defaultPaddingBottom = 0;
|
|
768
|
+
this._defaultPaddingLeft = 0;
|
|
769
|
+
}
|
|
770
|
+
}
|
|
757
771
|
getLocationInWindow() {
|
|
758
772
|
if (!this.nativeViewProtected || !this.nativeViewProtected.getWindowToken()) {
|
|
759
773
|
return undefined;
|
|
@@ -1363,16 +1377,11 @@ export class View extends ViewCommon {
|
|
|
1363
1377
|
else {
|
|
1364
1378
|
const nativeView = this.nativeViewProtected;
|
|
1365
1379
|
nativeView.setBackground(value);
|
|
1366
|
-
const style = this.style;
|
|
1367
|
-
const paddingTop = paddingTopProperty.isSet(style) ? this.effectivePaddingTop : this._defaultPaddingTop;
|
|
1368
|
-
const paddingRight = paddingRightProperty.isSet(style) ? this.effectivePaddingRight : this._defaultPaddingRight;
|
|
1369
|
-
const paddingBottom = paddingBottomProperty.isSet(style) ? this.effectivePaddingBottom : this._defaultPaddingBottom;
|
|
1370
|
-
const paddingLeft = paddingLeftProperty.isSet(style) ? this.effectivePaddingLeft : this._defaultPaddingLeft;
|
|
1371
1380
|
if (this._isPaddingRelative) {
|
|
1372
|
-
nativeView.setPaddingRelative(
|
|
1381
|
+
nativeView.setPaddingRelative(this.effectivePaddingLeft, this.effectivePaddingTop, this.effectivePaddingRight, this.effectivePaddingBottom);
|
|
1373
1382
|
}
|
|
1374
1383
|
else {
|
|
1375
|
-
nativeView.setPadding(
|
|
1384
|
+
nativeView.setPadding(this.effectivePaddingLeft, this.effectivePaddingTop, this.effectivePaddingRight, this.effectivePaddingBottom);
|
|
1376
1385
|
}
|
|
1377
1386
|
}
|
|
1378
1387
|
}
|