diff --git a/apps/automated/src/ui/action-bar/action-bar-tests.android.ts b/apps/automated/src/ui/action-bar/action-bar-tests.android.ts index 517a47de9..efed8663f 100644 --- a/apps/automated/src/ui/action-bar/action-bar-tests.android.ts +++ b/apps/automated/src/ui/action-bar/action-bar-tests.android.ts @@ -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 { Enums } from '@nativescript/core'; +import { CoreTypes } from '@nativescript/core'; import { Button } from '@nativescript/core/ui/button'; export * from './action-bar-tests-common'; diff --git a/apps/automated/src/ui/action-bar/action-bar-tests.ios.ts b/apps/automated/src/ui/action-bar/action-bar-tests.ios.ts index 9fd69e32c..0dca1d7ce 100644 --- a/apps/automated/src/ui/action-bar/action-bar-tests.ios.ts +++ b/apps/automated/src/ui/action-bar/action-bar-tests.ios.ts @@ -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 { Enums } from '@nativescript/core'; +import { CoreTypes } from '@nativescript/core'; export * from './action-bar-tests-common'; diff --git a/apps/automated/src/ui/layouts/stack-layout-tests.ts b/apps/automated/src/ui/layouts/stack-layout-tests.ts index b3efafaa9..67271835b 100644 --- a/apps/automated/src/ui/layouts/stack-layout-tests.ts +++ b/apps/automated/src/ui/layouts/stack-layout-tests.ts @@ -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 { Enums } from '@nativescript/core'; +import { CoreTypes } from '@nativescript/core'; import * as utils from '@nativescript/core/utils/utils'; import * as testModule from '../../ui-test'; import * as layoutHelper from './layout-helper'; diff --git a/apps/automated/src/ui/styling/root-views-css-classes-tests.ts b/apps/automated/src/ui/styling/root-views-css-classes-tests.ts index 4576778fc..59fe6f157 100644 --- a/apps/automated/src/ui/styling/root-views-css-classes-tests.ts +++ b/apps/automated/src/ui/styling/root-views-css-classes-tests.ts @@ -1,7 +1,7 @@ import * as helper from '../../ui-helper'; import * as TKUnit from '../../tk-unit'; -import { Application, isAndroid, isIOS, Device, Button, Page, ShownModallyData, ShowModalOptions, View, Utils, Enums } from '@nativescript/core'; +import { Application, isAndroid, isIOS, Device, Button, Page, ShownModallyData, ShowModalOptions, View, Utils, CoreTypes } from '@nativescript/core'; import { _rootModalViews } from '@nativescript/core/ui/core/view/view-common'; const CLASS_NAME = 'class-name'; diff --git a/apps/automated/src/ui/text-view/text-view-tests.ts b/apps/automated/src/ui/text-view/text-view-tests.ts index 15345398a..692269d4f 100644 --- a/apps/automated/src/ui/text-view/text-view-tests.ts +++ b/apps/automated/src/ui/text-view/text-view-tests.ts @@ -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 { Enums } from '@nativescript/core'; +import { CoreTypes } from '@nativescript/core'; import * as platform from '@nativescript/core/platform'; // >> require-textmodules diff --git a/packages/core/accessibility/index.ios.ts b/packages/core/accessibility/index.ios.ts index e67e3eb66..3d0945eaf 100644 --- a/packages/core/accessibility/index.ios.ts +++ b/packages/core/accessibility/index.ios.ts @@ -151,11 +151,13 @@ export function updateAccessibilityProperties(view: View): void { return; } - console.log('--- Accessible element: ', view.constructor.name); - console.log('accessibilityLabel: ', view.accessibilityLabel); - console.log('accessibilityRole: ', accessibilityRole); - console.log('accessibilityState: ', accessibilityState); - console.log('accessibilityValue: ', view.accessibilityValue); + + // NOTE: left here for various core inspection passes while running the toolbox app + // console.log('--- Accessible element: ', view.constructor.name); + // console.log('accessibilityLabel: ', view.accessibilityLabel); + // console.log('accessibilityRole: ', accessibilityRole); + // console.log('accessibilityState: ', accessibilityState); + // console.log('accessibilityValue: ', view.accessibilityValue); let a11yTraits = UIAccessibilityTraitNone; if (RoleTypeMap.has(accessibilityRole)) { @@ -195,9 +197,11 @@ export function updateAccessibilityProperties(view: View): void { break; } } - if (view.accessibilityLiveRegion) { - console.log('accessibilityLiveRegion:', view.accessibilityLiveRegion); - } + + // NOTE: left here for various core inspection passes while running the toolbox app + // if (view.accessibilityLiveRegion) { + // console.log('accessibilityLiveRegion:', view.accessibilityLiveRegion); + // } if (view.accessibilityMediaSession) { a11yTraits |= RoleTypeMap.get(AccessibilityRole.StartsMediaSession); @@ -210,8 +214,11 @@ export function updateAccessibilityProperties(view: View): void { // if (view.accessibilityTraits) { // a11yTraits |= inputArrayToBitMask(view.accessibilityTraits, AccessibilityTraitsMap); // } - console.log('a11yTraits:', a11yTraits); - console.log(' '); + + // NOTE: left here for various core inspection passes while running the toolbox app + // console.log('a11yTraits:', a11yTraits); + // console.log(' '); + uiView.accessibilityTraits = a11yTraits; } diff --git a/packages/core/core-types/index.d.ts b/packages/core/core-types/index.d.ts index 0d4bd1e5d..55a27b4bf 100644 --- a/packages/core/core-types/index.d.ts +++ b/packages/core/core-types/index.d.ts @@ -754,6 +754,43 @@ export namespace CoreTypes { // WhiteSpaceType: WhiteSpaceType; } +/** + * @deprecated Use `CoreTypes.dip` instead. + */ +export type dip = number; + +/** + * @deprecated Use `CoreTypes.px` instead. + */ +export type px = number; + +/** + * @deprecated Use `CoreTypes.percent` instead. + */ +export type percent = number; + +/** + * @deprecated Use `CoreTypes.LengthDipUnit` instead. + */ +export type LengthDipUnit = { readonly unit: 'dip'; readonly value: dip }; +/** + * @deprecated Use `CoreTypes.LengthPxUnit` instead. + */ +export type LengthPxUnit = { readonly unit: 'px'; readonly value: px }; +/** + * @deprecated Use `CoreTypes.LengthPercentUnit` instead. + */ +export type LengthPercentUnit = { readonly unit: '%'; readonly value: percent }; + +/** + * @deprecated Use `CoreTypes.LengthType` instead. + */ +export type LengthType = 'auto' | dip | LengthDipUnit | LengthPxUnit; +/** + * @deprecated Use `CoreTypes.PercentLengthType` instead. + */ +export type PercentLengthType = 'auto' | dip | LengthDipUnit | LengthPxUnit | LengthPercentUnit; + /** * @deprecated Use `CoreTypes` instead. Enums will be removed in 9.0 */ diff --git a/packages/core/core-types/index.ts b/packages/core/core-types/index.ts index 0da8fc35b..c3310e32b 100644 --- a/packages/core/core-types/index.ts +++ b/packages/core/core-types/index.ts @@ -310,6 +310,43 @@ export namespace CoreTypes { } /** - * @deprecated Use `CoreTypes` instead. Enums will be removed in 9.0 + * @deprecated Use `CoreTypes.dip` instead. + */ +export type dip = number; + +/** + * @deprecated Use `CoreTypes.px` instead. + */ +export type px = number; + +/** + * @deprecated Use `CoreTypes.percent` instead. + */ +export type percent = number; + +/** + * @deprecated Use `CoreTypes.LengthDipUnit` instead. + */ +export type LengthDipUnit = { readonly unit: 'dip'; readonly value: dip }; +/** + * @deprecated Use `CoreTypes.LengthPxUnit` instead. + */ +export type LengthPxUnit = { readonly unit: 'px'; readonly value: px }; +/** + * @deprecated Use `CoreTypes.LengthPercentUnit` instead. + */ +export type LengthPercentUnit = { readonly unit: '%'; readonly value: percent }; + +/** + * @deprecated Use `CoreTypes.LengthType` instead. + */ +export type LengthType = 'auto' | dip | LengthDipUnit | LengthPxUnit; +/** + * @deprecated Use `CoreTypes.PercentLengthType` instead. + */ +export type PercentLengthType = 'auto' | dip | LengthDipUnit | LengthPxUnit | LengthPercentUnit; + +/** + * @deprecated Use `CoreTypes` instead. */ export const Enums: typeof CoreTypes = CoreTypes; diff --git a/packages/core/index.d.ts b/packages/core/index.d.ts index 1cdfa46b8..2c202d540 100644 --- a/packages/core/index.d.ts +++ b/packages/core/index.d.ts @@ -70,7 +70,7 @@ export declare const Connectivity: { startMonitoring: typeof startMonitoring; stopMonitoring: typeof stopMonitoring; }; -export { CoreTypes, Enums } from './core-types'; +export * from './core-types'; export { CSSUtils } from './css/system-classes'; export { ObservableArray, ChangeType } from './data/observable-array'; export type { ChangedData } from './data/observable-array'; diff --git a/packages/core/index.ts b/packages/core/index.ts index e2fe873f9..709ba7fc6 100644 --- a/packages/core/index.ts +++ b/packages/core/index.ts @@ -77,7 +77,7 @@ export const Connectivity = { stopMonitoring, }; -export { CoreTypes, Enums } from './core-types'; +export * from './core-types'; export { CSSUtils } from './css/system-classes'; diff --git a/packages/core/ui/enums/enums.d.ts b/packages/core/ui/enums/enums.d.ts new file mode 100644 index 000000000..517cb299d --- /dev/null +++ b/packages/core/ui/enums/enums.d.ts @@ -0,0 +1,5 @@ +/** + * A lot of plugins still used @nativescript/core/ui/enums/enums + * Remove this once @nativescript/eslint-plugin supports automigrating these + */ +export * from '../../core-types'; diff --git a/packages/core/ui/enums/enums.ts b/packages/core/ui/enums/enums.ts new file mode 100644 index 000000000..517cb299d --- /dev/null +++ b/packages/core/ui/enums/enums.ts @@ -0,0 +1,5 @@ +/** + * A lot of plugins still used @nativescript/core/ui/enums/enums + * Remove this once @nativescript/eslint-plugin supports automigrating these + */ +export * from '../../core-types'; diff --git a/packages/core/ui/enums/index.d.ts b/packages/core/ui/enums/index.d.ts new file mode 100644 index 000000000..73f5aea8b --- /dev/null +++ b/packages/core/ui/enums/index.d.ts @@ -0,0 +1,5 @@ +/** + * A lot of plugins still used @nativescript/core/ui/enums + * Remove this once @nativescript/eslint-plugin supports automigrating these + */ +export * from '../../core-types'; diff --git a/packages/core/ui/enums/index.ts b/packages/core/ui/enums/index.ts new file mode 100644 index 000000000..73f5aea8b --- /dev/null +++ b/packages/core/ui/enums/index.ts @@ -0,0 +1,5 @@ +/** + * A lot of plugins still used @nativescript/core/ui/enums + * Remove this once @nativescript/eslint-plugin supports automigrating these + */ +export * from '../../core-types';