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

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

View File

@@ -1,7 +1,7 @@
import * as TKUnit from '../../tk-unit';
import { createPageAndNavigate } from './action-bar-tests-common';
import { ActionItem } from '@nativescript/core/ui/action-bar';
import { Visibility } from '@nativescript/core/ui/enums';
import { Enums } from '@nativescript/core';
import { Button } from '@nativescript/core/ui/button';
export * from './action-bar-tests-common';
@@ -15,7 +15,7 @@ export function test_actionItem_visibility() {
const menu = toolbar.getMenu();
TKUnit.assertTrue(menu.hasVisibleItems(), 'Visibility does not work');
actionItem.visibility = Visibility.collapse;
actionItem.visibility = Enums.Visibility.collapse;
TKUnit.assertFalse(menu.hasVisibleItems(), 'Visibility does not work');
}
@@ -28,7 +28,7 @@ export function test_navigationButton_visibility() {
const toolbar = <androidx.appcompat.widget.Toolbar>page.actionBar.nativeViewProtected;
TKUnit.assertNotNull(toolbar.getNavigationIcon(), 'Visibility does not work');
actionItem.visibility = Visibility.collapse;
actionItem.visibility = Enums.Visibility.collapse;
TKUnit.assertNull(toolbar.getNavigationIcon(), 'Visibility does not work');
}

View File

@@ -5,7 +5,7 @@ import * as LabelModule from '@nativescript/core/ui/label';
import * as helper from '../../ui-helper';
import * as view from '@nativescript/core/ui/core/view';
import * as actionBar from '@nativescript/core/ui/action-bar';
import { Visibility } from '@nativescript/core/ui/enums';
import { Enums } from '@nativescript/core';
export * from './action-bar-tests-common';
@@ -95,7 +95,7 @@ export function test_actionItem_visibility() {
var leftBarButtonItemsCount = navigationItem.leftBarButtonItems ? navigationItem.leftBarButtonItems.count : 0;
TKUnit.assertEqual(leftBarButtonItemsCount, 1, 'Visibility does not work');
actionItem.visibility = Visibility.collapse;
actionItem.visibility = Enums.Visibility.collapse;
TKUnit.waitUntilReady(() => {
leftBarButtonItemsCount = navigationItem.leftBarButtonItems ? navigationItem.leftBarButtonItems.count : 0;
@@ -118,7 +118,7 @@ export function test_navigationButton_visibility() {
var navigationItem: UINavigationItem = viewController.navigationItem;
TKUnit.assertFalse(navigationItem.hidesBackButton, 'Visibility does not work');
actionItem.visibility = Visibility.collapse;
actionItem.visibility = Enums.Visibility.collapse;
TKUnit.waitUntilReady(() => {
return navigationItem.hidesBackButton;

View File

@@ -4,12 +4,12 @@ import * as viewModule from '@nativescript/core/ui/core/view';
import { Label } from '@nativescript/core/ui/label';
import { StackLayout } from '@nativescript/core/ui/layouts/stack-layout';
import * as colorModule from '@nativescript/core/color';
import * as enums from '@nativescript/core/ui/enums';
import { Enums } from '@nativescript/core';
import { AnimationPromise } from '@nativescript/core/ui/animation';
// >> animation-require
import * as animation from '@nativescript/core/ui/animation';
import { PercentLength } from '@nativescript/core/ui/styling/style-properties';
import { PercentLengthType, PercentLength } from '@nativescript/core';
// << animation-require
function prepareTest(parentHeight?: number, parentWidth?: number): Label {
@@ -46,7 +46,7 @@ export function test_AnimatingProperties(done) {
duration: 5,
delay: 10,
iterations: 3,
curve: enums.AnimationCurve.easeIn,
curve: Enums.AnimationCurve.easeIn,
})
.then(() => {
//console.log("Animation finished.");
@@ -418,7 +418,7 @@ export function test_AnimateRotate(done) {
});
}
function animateExtentAndAssertExpected(along: 'height' | 'width', value: PercentLength, pixelExpected: PercentLength): Promise<void> {
function animateExtentAndAssertExpected(along: 'height' | 'width', value: PercentLengthType, pixelExpected: PercentLengthType): Promise<void> {
function pretty(val) {
return JSON.stringify(val, null, 2);
}
@@ -478,7 +478,7 @@ export function test_AnimateExtent_Should_AcceptStringPixelValues(done) {
const expected = {
unit: 'px',
value: pair[1],
} as PercentLength;
} as PercentLengthType;
promise = promise.then(() => {
return animateExtentAndAssertExpected('height', input, expected);
});

View File

@@ -1,7 +1,7 @@
import * as TKUnit from '../../tk-unit';
import * as styleScope from '@nativescript/core/ui/styling/style-scope';
import * as keyframeAnimation from '@nativescript/core/ui/animation/keyframe-animation';
import * as enums from '@nativescript/core/ui/enums';
import { Enums } from '@nativescript/core';
import * as helper from '../../ui-helper';
import * as stackModule from '@nativescript/core/ui/layouts/stack-layout';
import * as labelModule from '@nativescript/core/ui/label';
@@ -37,7 +37,7 @@ export function test_ReadAnimationProperties() {
let animation = createAnimationFromCSS(css, 'test');
TKUnit.assertEqual(animation.name, 'first');
TKUnit.assertEqual(animation.duration, 4000);
TKUnit.assertEqual(animation.curve, enums.AnimationCurve.easeIn);
TKUnit.assertEqual(animation.curve, Enums.AnimationCurve.easeIn);
TKUnit.assertEqual(animation.delay, 1500);
TKUnit.assertEqual(animation.iterations, 10);
TKUnit.assertTrue(animation.isForwards);
@@ -48,22 +48,22 @@ export function test_ReadTheAnimationProperty() {
let animation = createAnimationFromCSS('.test { animation: second 0.2s ease-out 1 2 }', 'test');
TKUnit.assertEqual(animation.name, 'second');
TKUnit.assertEqual(animation.duration, 200);
TKUnit.assertEqual(animation.curve, enums.AnimationCurve.easeOut);
TKUnit.assertEqual(animation.curve, Enums.AnimationCurve.easeOut);
TKUnit.assertEqual(animation.delay, 1000);
TKUnit.assertEqual(animation.iterations, 2);
}
export function test_ReadAnimationCurve() {
let animation = createAnimationFromCSS('.test { animation-timing-function: ease-in; }', 'test');
TKUnit.assertEqual(animation.curve, enums.AnimationCurve.easeIn);
TKUnit.assertEqual(animation.curve, Enums.AnimationCurve.easeIn);
animation = createAnimationFromCSS('.test { animation-timing-function: ease-out; }', 'test');
TKUnit.assertEqual(animation.curve, enums.AnimationCurve.easeOut);
TKUnit.assertEqual(animation.curve, Enums.AnimationCurve.easeOut);
animation = createAnimationFromCSS('.test { animation-timing-function: linear; }', 'test');
TKUnit.assertEqual(animation.curve, enums.AnimationCurve.linear);
TKUnit.assertEqual(animation.curve, Enums.AnimationCurve.linear);
animation = createAnimationFromCSS('.test { animation-timing-function: ease-in-out; }', 'test');
TKUnit.assertEqual(animation.curve, enums.AnimationCurve.easeInOut);
TKUnit.assertEqual(animation.curve, Enums.AnimationCurve.easeInOut);
animation = createAnimationFromCSS('.test { animation-timing-function: spring; }', 'test');
TKUnit.assertEqual(animation.curve, enums.AnimationCurve.spring);
TKUnit.assertEqual(animation.curve, Enums.AnimationCurve.spring);
animation = createAnimationFromCSS('.test { animation-timing-function: cubic-bezier(0.1, 1.0, 0.5, 0.5); }', 'test');
let curve = animation.curve;
TKUnit.assert(curve.x1 === 0.1 && curve.y1 === 1.0 && curve.x2 === 0.5 && curve.y2 === 0.5);
@@ -389,8 +389,8 @@ export function test_ReadTwoAnimations() {
scope.ensureSelectors();
let selector = findSelectorInScope(scope, 'test');
TKUnit.assertEqual(scope.getAnimations(selector.ruleset).length, 2);
TKUnit.assertEqual(scope.getAnimations(selector.ruleset)[0].curve, enums.AnimationCurve.easeOut);
TKUnit.assertEqual(scope.getAnimations(selector.ruleset)[1].curve, enums.AnimationCurve.easeIn);
TKUnit.assertEqual(scope.getAnimations(selector.ruleset)[0].curve, Enums.AnimationCurve.easeOut);
TKUnit.assertEqual(scope.getAnimations(selector.ruleset)[1].curve, Enums.AnimationCurve.easeIn);
TKUnit.assertEqual(scope.getAnimations(selector.ruleset)[1].name, 'two');
TKUnit.assertEqual(scope.getAnimations(selector.ruleset)[1].duration, 2000);
}
@@ -401,12 +401,12 @@ export function test_AnimationCurveInKeyframes() {
scope.ensureSelectors();
let selector = findSelectorInScope(scope, 'test');
let animation = scope.getAnimations(selector.ruleset)[0];
TKUnit.assertEqual(animation.keyframes[0].curve, enums.AnimationCurve.linear);
TKUnit.assertEqual(animation.keyframes[0].curve, Enums.AnimationCurve.linear);
TKUnit.assertEqual(animation.keyframes[1].curve, undefined);
TKUnit.assertEqual(animation.keyframes[1].curve, undefined);
let realAnimation = keyframeAnimation.KeyframeAnimation.keyframeAnimationFromInfo(animation);
TKUnit.assertEqual(realAnimation.animations[1].curve, enums.AnimationCurve.linear);
TKUnit.assertEqual(realAnimation.animations[2].curve, enums.AnimationCurve.easeIn);
TKUnit.assertEqual(realAnimation.animations[1].curve, Enums.AnimationCurve.linear);
TKUnit.assertEqual(realAnimation.animations[2].curve, Enums.AnimationCurve.easeIn);
}
function getTransformsValues(declarations) {

View File

@@ -1,6 +1,6 @@
import * as buttonModule from '@nativescript/core/ui/button';
import * as colorModule from '@nativescript/core/color';
import * as enums from '@nativescript/core/ui/enums';
import { Enums } from '@nativescript/core';
import { getColor } from '../../ui-helper';
export function getNativeText(button: buttonModule.Button): string {
@@ -26,11 +26,11 @@ export function getNativeBackgroundColor(button: buttonModule.Button): colorModu
export function getNativeTextAlignment(button: buttonModule.Button): string {
switch (button.ios.titleLabel.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';
}

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';

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';
}

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');
}

View File

@@ -11,7 +11,7 @@ import * as dockModule from '@nativescript/core/ui/layouts/dock-layout';
// << dock-layout-require
// >> dock-layout-others
import * as enums from '@nativescript/core/ui/enums';
import { Enums } from '@nativescript/core';
// << dock-layout-others
export class DockLayoutTest extends testModule.UITest<DockLayout> {
@@ -41,7 +41,7 @@ export class DockLayoutTest extends testModule.UITest<DockLayout> {
public test_dock_DefaultValue() {
var testBtn = new button.Button();
var value = dockModule.DockLayout.getDock(testBtn);
TKUnit.assertEqual(value, enums.Dock.left, 'Default dock value.');
TKUnit.assertEqual(value, Enums.Dock.left, 'Default dock value.');
}
public test_setInvalidDock_Throws() {

View File

@@ -2,7 +2,7 @@ import { StackLayout } from '@nativescript/core/ui/layouts/stack-layout';
import { Button } from '@nativescript/core/ui/button';
import * as TKUnit from '../../tk-unit';
import * as helper from '../../ui-helper';
import * as enums from '@nativescript/core/ui/enums';
import { Enums } from '@nativescript/core';
import * as utils from '@nativescript/core/utils/utils';
import * as testModule from '../../ui-test';
import * as layoutHelper from './layout-helper';
@@ -30,7 +30,7 @@ export class StackLayoutTest extends testModule.UITest<StackLayout> {
}
public test_orientation_DefaultValue() {
TKUnit.assertEqual(this.rootLayout.orientation, enums.Orientation.vertical, 'Default orientation should be Vertical.');
TKUnit.assertEqual(this.rootLayout.orientation, Enums.Orientation.vertical, 'Default orientation should be Vertical.');
}
public test_SetWrongOrientation_ShouldThrowError() {
@@ -42,7 +42,7 @@ export class StackLayoutTest extends testModule.UITest<StackLayout> {
public test_Orientation_Change() {
this.waitUntilTestElementLayoutIsValid();
TKUnit.assertEqual(this.rootLayout.orientation, enums.Orientation.vertical, 'Default orientation should be Vertical.');
TKUnit.assertEqual(this.rootLayout.orientation, Enums.Orientation.vertical, 'Default orientation should be Vertical.');
this.rootLayout.orientation = 'horizontal';
this.waitUntilTestElementLayoutIsValid();
@@ -54,7 +54,7 @@ export class StackLayoutTest extends testModule.UITest<StackLayout> {
public test_ShouldMeasureWith_AtMost_OnVertical() {
this.waitUntilTestElementLayoutIsValid();
TKUnit.assertEqual(this.rootLayout.orientation, enums.Orientation.vertical, 'StackLayout should be vertical.');
TKUnit.assertEqual(this.rootLayout.orientation, Enums.Orientation.vertical, 'StackLayout should be vertical.');
TKUnit.assertTrue(this.rootLayout.measured, 'Layout should be measured.');
TKUnit.assertTrue(this.rootLayout.arranged, 'Layout should be arranged.');

View File

@@ -1,6 +1,6 @@
import * as TKUnit from '../../tk-unit';
import * as helper from '../../ui-helper';
import { isAndroid, isIOS, Button, Label, TextField, TextView, StackLayout, View, Color, Length, PercentLength, LengthPercentUnit, LengthPxUnit } from '@nativescript/core';
import { isAndroid, isIOS, Button, Label, TextField, TextView, StackLayout, View, Color, Length, PercentLength, LengthPercentUnit, LengthPxUnit, LengthType } from '@nativescript/core';
import * as fontModule from '@nativescript/core/ui/styling/font';
export function test_setting_textDecoration_property_from_CSS_is_applied_to_Style() {
@@ -821,7 +821,7 @@ export function test_border_width() {
testView.style.borderWidth = 10;
TKUnit.assertEqual(testView.style.borderWidth, 10, 'all');
let expected: Length = { value: 10, unit: 'dip' };
let expected: LengthType = { value: 10, unit: 'dip' };
TKUnit.assertTrue(Length.equals(testView.style.borderTopWidth, expected));
TKUnit.assertTrue(Length.equals(testView.style.borderRightWidth, expected));
TKUnit.assertTrue(Length.equals(testView.style.borderBottomWidth, expected));
@@ -841,7 +841,7 @@ export function test_border_radius() {
let testView = new Button();
testView.style.borderRadius = 10;
let expected: Length = { value: 10, unit: 'dip' };
let expected: LengthType = { value: 10, unit: 'dip' };
TKUnit.assertTrue(Length.equals(testView.style.borderRadius, expected), 'all');
TKUnit.assertTrue(Length.equals(testView.style.borderTopLeftRadius, expected), 'top');

View File

@@ -1,7 +1,7 @@
import * as textFieldModule from '@nativescript/core/ui/text-field';
import * as colorModule from '@nativescript/core/color';
import { getColor } from '../../ui-helper';
import * as enums from '@nativescript/core/ui/enums';
import { Enums } from '@nativescript/core';
export function getNativeText(textField: textFieldModule.TextField): string {
return textField.ios.text;
@@ -34,11 +34,11 @@ export function getNativeBackgroundColor(textField: textFieldModule.TextField):
export function getNativeTextAlignment(textField: textFieldModule.TextField): string {
switch (textField.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';
}

View File

@@ -1,7 +1,7 @@
import * as textViewModule from '@nativescript/core/ui/text-view';
import * as colorModule from '@nativescript/core/color';
import { getColor } from '../../ui-helper';
import * as enums from '@nativescript/core/ui/enums';
import { Enums } from '@nativescript/core';
export function getNativeText(textView: textViewModule.TextView): string {
return textView.ios.text;
@@ -35,11 +35,11 @@ export function getNativeBackgroundColor(textView: textViewModule.TextView): col
export function getNativeTextAlignment(textView: textViewModule.TextView): string {
switch (textView.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';
}

View File

@@ -4,7 +4,7 @@ import * as viewModule from '@nativescript/core/ui/core/view';
import * as pagesModule from '@nativescript/core/ui/page';
import * as textViewTestsNative from './text-view-tests-native';
import * as colorModule from '@nativescript/core/color';
import * as enums from '@nativescript/core/ui/enums';
import { Enums } from '@nativescript/core';
import * as platform from '@nativescript/core/platform';
// >> require-textmodules
@@ -537,8 +537,8 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithoutFormatt
view.text = 'NormalText';
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');
});
}
@@ -550,8 +550,8 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithFormattedT
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');
});
}