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

5
packages/core/ui/label/index.android.ts
View File

@@ -1,8 +1,9 @@
import { Label as LabelDefinition } from '.';
import { TextBase, WhiteSpace, whiteSpaceProperty } from '../text-base';
import { TextBase, whiteSpaceProperty } from '../text-base';
import { profile } from '../../profiling';
import { CSSType } from '../core/view';
import { booleanConverter } from '../core/view-base';
import { Enums } from '../enums';
export * from '../text-base';
@@ -40,7 +41,7 @@ export class Label extends TextBase implements LabelDefinition {
textView.setEllipsize(android.text.TextUtils.TruncateAt.END);
}
[whiteSpaceProperty.setNative](value: WhiteSpace) {
[whiteSpaceProperty.setNative](value: Enums.WhiteSpaceType) {
// Label initial value is no-wrap. set in initNativeView
const newValue = value === 'initial' ? 'nowrap' : value;
super[whiteSpaceProperty.setNative](newValue);