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 a67fb69687
commit 733050995c
110 changed files with 1882 additions and 1827 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/automated/src/ui/label/label-tests-native.android.ts
View File

@@ -1,20 +1,20 @@
import * as labelModule from '@nativescript/core/ui/label';
import * as enums from '@nativescript/core/ui/enums';
import { Enums } from '@nativescript/core';
import * as colorModule from '@nativescript/core/color';
export function getNativeTextAlignment(label: labelModule.Label): string {
let gravity = label.android.getGravity();
if ((gravity & android.view.Gravity.HORIZONTAL_GRAVITY_MASK) === android.view.Gravity.LEFT) {
return enums.TextAlignment.left;
return Enums.TextAlignment.left;
}
if ((gravity & android.view.Gravity.HORIZONTAL_GRAVITY_MASK) === android.view.Gravity.CENTER_HORIZONTAL) {
return enums.TextAlignment.center;
return Enums.TextAlignment.center;
}
if ((gravity & android.view.Gravity.HORIZONTAL_GRAVITY_MASK) === android.view.Gravity.RIGHT) {
return enums.TextAlignment.right;
return Enums.TextAlignment.right;
}
return 'unexpected value';

8
apps/automated/src/ui/label/label-tests-native.ios.ts
View File

@@ -1,16 +1,16 @@
import * as labelModule from '@nativescript/core/ui/label';
import * as enums from '@nativescript/core/ui/enums';
import { Enums } from '@nativescript/core';
import * as colorModule from '@nativescript/core/color';
import { getColor } from '../../ui-helper';
export function getNativeTextAlignment(label: labelModule.Label): string {
switch (label.ios.textAlignment) {
case NSTextAlignment.Left:
return enums.TextAlignment.left;
return Enums.TextAlignment.left;
case NSTextAlignment.Center:
return enums.TextAlignment.center;
return Enums.TextAlignment.center;
case NSTextAlignment.Right:
return enums.TextAlignment.right;
return Enums.TextAlignment.right;
default:
return 'unexpected value';
}

14
apps/automated/src/ui/label/label-tests.ts
View File

@@ -10,7 +10,7 @@ import * as colorModule from '@nativescript/core/color';
import * as utils from '@nativescript/core/utils/utils';
import * as observableModule from '@nativescript/core/data/observable';
import * as bindable from '@nativescript/core/ui/core/bindable';
import * as enums from '@nativescript/core/ui/enums';
import { Enums } from '@nativescript/core';
import * as labelTestsNative from './label-tests-native';
import * as fs from '@nativescript/core/file-system';
@@ -489,7 +489,7 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
const actualResult = view.style.textAlignment;
TKUnit.assertEqual(actualResult, this.expectedTextAlignment);
page.addCss('label { text-align: ' + enums.TextAlignment.left + '; }');
page.addCss('label { text-align: ' + Enums.TextAlignment.left + '; }');
TKUnit.assertEqual(view.style.textAlignment, view.style.textAlignment);
}
@@ -500,7 +500,7 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
view.id = 'testLabel';
page.addCss('#testLabel { text-align: ' + this.expectedTextAlignment + '; }');
page.addCss('label { text-align: ' + enums.TextAlignment.left + '; }');
page.addCss('label { text-align: ' + Enums.TextAlignment.left + '; }');
const actualResult = view.style.textAlignment;
// actual result is taken from #testLabel tag, because it has a greater priority (id vs type).
@@ -585,8 +585,8 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
this.waitUntilTestElementIsLoaded();
view.setInlineStyle('text-transform: uppercase; text-decoration: underline; letter-spacing: 1;');
TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, 'TextTransform');
TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, 'TextDecoration');
TKUnit.assertEqual(view.style.textTransform, Enums.TextTransform.uppercase, 'TextTransform');
TKUnit.assertEqual(view.style.textDecoration, Enums.TextDecoration.underline, 'TextDecoration');
TKUnit.assertEqual(view.style.letterSpacing, 1, 'LetterSpacing');
}
@@ -597,8 +597,8 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
view.formattedText = formattedString;
view.setInlineStyle('text-transform: uppercase; text-decoration: underline; letter-spacing: 1;');
TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, 'TextTransform');
TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, 'TextDecoration');
TKUnit.assertEqual(view.style.textTransform, Enums.TextTransform.uppercase, 'TextTransform');
TKUnit.assertEqual(view.style.textDecoration, Enums.TextDecoration.underline, 'TextDecoration');
TKUnit.assertEqual(view.style.letterSpacing, 1, 'LetterSpacing');
}