javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): type collisions with namespace (#8809)

Browse Source
This commit is contained in:
Nathan Walker
2021-02-25 21:03:07 -08:00
parent 784e9c93cd
commit ab11dc9c9f
110 changed files with 1882 additions and 1827 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/core/ui/label/index.ios.ts
View File

@@ -1,9 +1,10 @@
import { Label as LabelDefinition } from '.';
import { Background } from '../styling/background';
import { Length, borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, paddingLeftProperty } from '../styling/style-properties';
import { Length, borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, paddingLeftProperty, LengthType } from '../styling/style-properties';
import { booleanConverter } from '../core/view-base';
import { View, CSSType } from '../core/view';
import { TextBase, whiteSpaceProperty, WhiteSpace } from '../text-base';
import { Enums } from '../enums';
import { TextBase, whiteSpaceProperty } from '../text-base';
import { layout } from '../../utils';
import { ios } from '../styling/background';
@@ -111,7 +112,7 @@ export class Label extends TextBase implements LabelDefinition {
return nativeSize;
}
[whiteSpaceProperty.setNative](value: WhiteSpace) {
[whiteSpaceProperty.setNative](value: Enums.WhiteSpaceType) {
const nativeView = this.nativeTextViewProtected;
switch (value) {
case 'normal':
@@ -141,7 +142,7 @@ export class Label extends TextBase implements LabelDefinition {
this._setNativeClipToBounds();
}
[borderTopWidthProperty.setNative](value: Length) {
[borderTopWidthProperty.setNative](value: LengthType) {
const nativeView = this.nativeTextViewProtected;
const border = nativeView.borderThickness;
nativeView.borderThickness = {
@@ -152,7 +153,7 @@ export class Label extends TextBase implements LabelDefinition {
};
}
[borderRightWidthProperty.setNative](value: Length) {
[borderRightWidthProperty.setNative](value: LengthType) {
const nativeView = this.nativeTextViewProtected;
const border = nativeView.borderThickness;
nativeView.borderThickness = {
@@ -163,7 +164,7 @@ export class Label extends TextBase implements LabelDefinition {
};
}
[borderBottomWidthProperty.setNative](value: Length) {
[borderBottomWidthProperty.setNative](value: LengthType) {
const nativeView = this.nativeTextViewProtected;
const border = nativeView.borderThickness;
nativeView.borderThickness = {
@@ -174,7 +175,7 @@ export class Label extends TextBase implements LabelDefinition {
};
}
[borderLeftWidthProperty.setNative](value: Length) {
[borderLeftWidthProperty.setNative](value: LengthType) {
const nativeView = this.nativeTextViewProtected;
const border = nativeView.borderThickness;
nativeView.borderThickness = {
@@ -185,7 +186,7 @@ export class Label extends TextBase implements LabelDefinition {
};
}
[paddingTopProperty.setNative](value: Length) {
[paddingTopProperty.setNative](value: LengthType) {
const nativeView = this.nativeTextViewProtected;
const padding = nativeView.padding;
nativeView.padding = {
@@ -196,7 +197,7 @@ export class Label extends TextBase implements LabelDefinition {
};
}
[paddingRightProperty.setNative](value: Length) {
[paddingRightProperty.setNative](value: LengthType) {
const nativeView = this.nativeTextViewProtected;
const padding = nativeView.padding;
nativeView.padding = {
@@ -207,7 +208,7 @@ export class Label extends TextBase implements LabelDefinition {
};
}
[paddingBottomProperty.setNative](value: Length) {
[paddingBottomProperty.setNative](value: LengthType) {
const nativeView = this.nativeTextViewProtected;
const padding = nativeView.padding;
nativeView.padding = {
@@ -218,7 +219,7 @@ export class Label extends TextBase implements LabelDefinition {
};
}
[paddingLeftProperty.setNative](value: Length) {
[paddingLeftProperty.setNative](value: LengthType) {
const nativeView = this.nativeTextViewProtected;
const padding = nativeView.padding;
nativeView.padding = {