feat(visionos): ui-mobile-base supporting xros plus improvements to window handling (#10478)

apps/automated/package.json

@@ -11,11 +11,12 @@
     "nativescript-theme-core": "file:../../node_modules/nativescript-theme-core"
   },
   "devDependencies": {
-    "@nativescript/android": "~8.6.0",
-    "@nativescript/ios": "~8.6.0",
+    "@nativescript/android": "rc",
+    "@nativescript/ios": "rc",
+    "@nativescript/visionos": "rc",
     "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz",
     "circular-dependency-plugin": "^5.2.2",
-    "typescript": "~5.2.0"
+    "typescript": "~5.4.0"
   },
   "gitHead": "c06800e52ee1a184ea2dffd12a6702aaa43be4e3",
   "readme": "NativeScript Application"

apps/automated/project.json

@@ -28,6 +28,16 @@
 				"platform": "ios"
 			}
 		},
+		"vision": {
+			"executor": "@nativescript/nx:build",
+			"inputs": ["default", "^production"],
+			"outputs": [],
+			"options": {
+				"noHmr": true,
+				"debug": false,
+				"platform": "vision"
+			}
+		},
 		"android": {
 			"executor": "@nativescript/nx:build",
 			"inputs": ["default", "^production"],

apps/automated/src/application/application-tests-common.ts

@@ -11,12 +11,15 @@ if (isAndroid) {
 export function testInitialized() {
 	if (Device.os === platformNames.android) {
 		TKUnit.assert(Application.android, 'Application module not properly intialized');
-	} else if (Device.os === platformNames.ios) {
+	} else if (__APPLE__) {
 		TKUnit.assert(Application.ios, 'Application module not properly intialized');
 	}
 }
 
 export function testDisplayedEvent() {
+	if (__VISIONOS__) {
+		return;
+	}
 	// global.isDisplayedEventFired flag is set in app.ts application.displayedEvent handler
 	TKUnit.assert(global.isDisplayedEventFired, 'application.displayedEvent not fired');
 }

apps/automated/src/application/application-tests.ios.ts

@@ -46,7 +46,7 @@ export function testIOSApplicationInitialized() {
 	TKUnit.assert(Application.ios.nativeApp, 'iOS nativeApp not initialized.');
 	TKUnit.assert(Application.ios.orientation(), 'iOS orientation not initialized.');
 
-	if (Utils.ios.MajorVersion <= 11) {
+	if (!__VISIONOS__ && Utils.SDK_VERSION <= 11) {
 		TKUnit.assertNull(Application.ios.systemAppearance(), 'iOS system appearance should be `null` on iOS <= 11.');
 	} else {
 		TKUnit.assert(Application.ios.systemAppearance(), 'iOS system appearance not initialized.');
@@ -57,7 +57,7 @@ export function testIOSApplicationInitialized() {
 }
 
 export function testSystemAppearance() {
-	if (Utils.ios.MajorVersion <= 11) {
+	if (!__VISIONOS__ && Utils.SDK_VERSION <= 11) {
 		TKUnit.assertNull(Application.ios.systemAppearance(), 'System appearance should be `null` on iOS <= 11.');
 	} else {
 		TKUnit.assert(Application.ios.systemAppearance(), 'System appearance not initialized.');

apps/automated/src/file-system/file-system-tests.ts

@@ -207,7 +207,7 @@ export var testFileReadWriteBinary = function () {
 		error = e;
 	});
 	TKUnit.assertNull(error);
-	if (Device.os === platformNames.ios) {
+	if (__APPLE__) {
 		TKUnit.assertTrue(source.isEqualToData(destination));
 	} else {
 		TKUnit.assertEqual(new java.io.File(sourceFile.path).length(), new java.io.File(destinationFile.path).length());
@@ -235,7 +235,7 @@ export var testFileReadWriteBinaryAsync = function () {
 					// Succeded in writing the file
 					destinationFile.read().then(
 						function (destination) {
-							if (Device.os === platformNames.ios) {
+							if (__APPLE__) {
 								TKUnit.assertTrue(source.isEqualToData(destination));
 							} else {
 								TKUnit.assertEqual(new java.io.File(sourceFile.path).length(), new java.io.File(destinationFile.path).length());
@@ -306,14 +306,16 @@ function _testIOSSpecificKnownFolder(knownFolderName: string) {
 }
 
 export var testIOSSpecificKnownFolders = function () {
-	_testIOSSpecificKnownFolder('library');
-	_testIOSSpecificKnownFolder('developer');
-	_testIOSSpecificKnownFolder('desktop');
-	_testIOSSpecificKnownFolder('downloads');
-	_testIOSSpecificKnownFolder('movies');
-	_testIOSSpecificKnownFolder('music');
-	_testIOSSpecificKnownFolder('pictures');
-	_testIOSSpecificKnownFolder('sharedPublic');
+	if (__IOS__) {
+		_testIOSSpecificKnownFolder('library');
+		_testIOSSpecificKnownFolder('developer');
+		_testIOSSpecificKnownFolder('desktop');
+		_testIOSSpecificKnownFolder('downloads');
+		_testIOSSpecificKnownFolder('movies');
+		_testIOSSpecificKnownFolder('music');
+		_testIOSSpecificKnownFolder('pictures');
+		_testIOSSpecificKnownFolder('sharedPublic');
+	}
 };
 
 export var testGetEntities = function () {

apps/automated/src/navigation/transition-tests.ts

@@ -32,7 +32,7 @@ export function test_Transitions() {
 	});
 
 	var transitions;
-	if (Device.os === platformNames.ios) {
+	if (__APPLE__) {
 		transitions = ['curl'];
 	} else {
 		const _sdkVersion = parseInt(Device.sdkVersion);

apps/automated/src/platform/platform-tests.ts

@@ -5,6 +5,8 @@ export function test_platform() {
 	let expectedPlatform;
 	if (isAndroid) {
 		expectedPlatform = 'Android';
+	} else if (__VISIONOS__) {
+		expectedPlatform = 'visionOS';
 	} else {
 		expectedPlatform = 'iOS';
 	}

apps/automated/src/test-runner.ts

@@ -2,7 +2,7 @@
 import * as TKUnit from './tk-unit';
 import './ui-test';
 
-import { isIOS, isAndroid, Application, Device, platformNames, Trace, Button, Frame, StackLayout, Page, TextView, Utils } from '@nativescript/core';
+import { isIOS, isAndroid, Application, Device, platformNames, Trace, Button, Frame, StackLayout, Page, TextView, Utils, Color } from '@nativescript/core';
 Frame.defaultAnimatedNavigation = false;
 
 export function isRunningOnEmulator(): boolean {
@@ -16,7 +16,7 @@ export function isRunningOnEmulator(): boolean {
 			android.os.Build.PRODUCT.toLocaleLowerCase().indexOf('sdk') > -1 ||
 			android.os.Build.PRODUCT.toLocaleLowerCase().indexOf('emulator') > -1
 		); // VS Emulator
-	} else if (Device.os === platformNames.ios) {
+	} else if (__APPLE__) {
 		return __dirname.search('Simulator') > -1;
 	}
 }
@@ -218,8 +218,8 @@ allTests['PROGRESS'] = progressTests;
 import * as placeholderTests from './ui/placeholder/placeholder-tests';
 allTests['PLACEHOLDER'] = placeholderTests;
 
-// import * as pageTests from './ui/page/page-tests';
-// allTests['PAGE'] = pageTests;
+import * as pageTests from './ui/page/page-tests';
+allTests['PAGE'] = pageTests;
 
 import * as listViewTests from './ui/list-view/list-view-tests';
 allTests['LISTVIEW'] = listViewTests;
@@ -245,6 +245,7 @@ allTests['DATE-PICKER'] = datePickerTests;
 import * as timePickerTests from './ui/time-picker/time-picker-tests';
 allTests['TIME-PICKER'] = timePickerTests;
 
+// TODO: followup on 3 assertions here -
 // import * as webViewTests from './ui/web-view/web-view-tests';
 // allTests['WEB-VIEW'] = webViewTests;
 
@@ -397,12 +398,23 @@ function showReportPage(finalMessage: string) {
 	messageContainer.text = finalMessage;
 	stack.addChild(messageContainer);
 
+	if (__VISIONOS__) {
+		// just helps make the results screen more clear on Vision Pro
+		btn.style.fontSize = 22;
+		stack.style.padding = 20;
+		stack.style.marginTop = 20;
+		messageContainer.style.fontSize = 22;
+		messageContainer.style.color = new Color('#fff');
+	}
+
 	Frame.topmost().navigate({
 		create: () => {
 			const page = new Page();
 			page.content = stack;
 			messageContainer.focus();
-			page.style.fontSize = 11;
+			if (!__VISIONOS__) {
+				page.style.fontSize = 11;
+			}
 			if (isAndroid) {
 				page.on('navigatedTo', () => {
 					messageContainer.focus();
@@ -473,7 +485,7 @@ export function runAll(testSelector?: string) {
 		new TestInfo(() => {
 			running = true;
 			startTime = TKUnit.time();
-		})
+		}),
 	);
 	for (const name in allTests) {
 		if (singleModuleName && singleModuleName !== name.toLowerCase()) {
@@ -519,7 +531,7 @@ export function runAll(testSelector?: string) {
 		new TestInfo(function () {
 			testsQueue = [];
 			running = false;
-		})
+		}),
 	);
 
 	TKUnit.runTests(testsQueue, 0);

apps/automated/src/ui/activity-indicator/activity-indicator-tests.ts

@@ -49,7 +49,7 @@ export function test_set_TNS_value_updates_native_value() {
 }
 
 // Uncomment this when find way to check android Drawable color set by setColorFilter() method.
-if (platform.Device.os === platform.platformNames.ios) {
+if (__APPLE__) {
 	exports.test_set_color = function () {
 		var ai = new activityIndicatorModule.ActivityIndicator();
 		ai.color = new color.Color('red');

apps/automated/src/ui/label/label-tests.ts

@@ -16,7 +16,7 @@ import * as fs from '@nativescript/core/file-system';
 
 import { StackLayout } from '@nativescript/core/ui/layouts/stack-layout';
 import { GridLayout } from '@nativescript/core/ui/layouts/grid-layout';
-import { isIOS, isAndroid } from '@nativescript/core/platform';
+import { isIOS, isAndroid, isApple } from '@nativescript/core/platform';
 import { Label } from '@nativescript/core/ui/label';
 import { LayoutBase } from '@nativescript/core/ui/layouts/layout-base';
 import * as helper from '../../ui-helper';
@@ -606,7 +606,7 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 	}
 
 	private requestLayoutFixture(expectRequestLayout: boolean, initialValue: string, setup: (label: Label) => LayoutBase): void {
-		if (!isIOS) {
+		if (!isApple) {
 			return;
 		}
 

apps/automated/src/ui/layouts/safe-area-tests.ts

@@ -3,7 +3,7 @@ import * as view from '@nativescript/core/ui/core/view';
 import * as testModule from '../../ui-test';
 import * as platform from '@nativescript/core/platform';
 import * as helper from '../../ui-helper';
-import { Builder, Page, Label, GridLayout } from '@nativescript/core';
+import { Builder, Page, Label, GridLayout, Utils } from '@nativescript/core';
 import { dipToDp, left, top, right, bottom, height, width, equal, closeEnough, lessOrCloseEnough, greaterOrCloseEnough, isLeftAlignedWith, isRightAlignedWith, isTopAlignedWith, isBottomAlignedWith, isLeftWith, isAboveWith, isRightWith, isBelowWith } from './layout-tests-helper';
 
 export class SafeAreaTests extends testModule.UITest<any> {
@@ -84,10 +84,10 @@ export class SafeAreaTests extends testModule.UITest<any> {
 	}
 
 	private layout_insets_top_action_bar_hidden_test(layout: view.View) {
-		const app = UIApplication.sharedApplication;
+		const keyWindow = Utils.ios.getWindow();
 		// const statusBarHeight = round(dipToDp(app.statusBarFrame.size.height));
 		// use window inset instead of status bar frame as that's unreliable on iOS 16+
-		const topInset = round(dipToDp(app.keyWindow.safeAreaInsets.top));
+		const topInset = round(dipToDp(keyWindow ? keyWindow.safeAreaInsets.top : UIApplication.sharedApplication.keyWindow.safeAreaInsets.top));
 
 		const insets = layout.getSafeAreaInsets();
 		equal(insets.top, topInset, `${layout}.topInset - actual:${insets.top}; expected: ${topInset}`);

apps/automated/src/ui/page/modal-tab-root.ts

@@ -13,7 +13,7 @@ export function onShownModally(args: ShownModallyData) {
 	TKUnit.assertEqual(hostFrame.currentPage.modal, tabView, 'hostFrame.currentPage.modal should be equal to the tabView instance on tabView.shownModally event handler.');
 
 	// shownModally raised after page.NavigatedTo on iOS
-	if (isIOS) {
+	if (__APPLE__) {
 		args.closeCallback('return value');
 	}
 }

apps/automated/src/ui/page/page-tests-common.ts

@@ -174,7 +174,7 @@ function _test_PageNavigation_EventSequence(withTransition: boolean) {
 			? {
 					name: 'slide',
 					duration: 10,
-			  }
+				}
 			: undefined,
 	};
 
@@ -370,7 +370,7 @@ export function test_page_backgroundColor() {
 	helper.navigate(factory);
 
 	if (isIOS) {
-		const backgroundColor = Utils.ios.MajorVersion <= 12 || !UIColor.systemBackgroundColor ? UIColor.whiteColor : UIColor.systemBackgroundColor;
+		const backgroundColor = (!__VISIONOS__ && Utils.ios.MajorVersion <= 12) || !UIColor.systemBackgroundColor ? UIColor.whiteColor : UIColor.systemBackgroundColor;
 		TKUnit.assertEqual(page.nativeView.backgroundColor, backgroundColor, 'page backgroundColor is wrong');
 	} else {
 		const whiteColor = new Color('white');
@@ -1219,6 +1219,10 @@ export function test_WhenModalPageShownShowModalEventsRaisedOnRootModalTabView()
 		return masterPage;
 	};
 
+	if (__ANDROID__) {
+		// revisit
+		return;
+	}
 	TKUnit.assertEqual(Frame._stack().length, 1, 'Single host frame should be instantiated at this point!');
 
 	helper.navigate(masterPageFactory);

apps/automated/src/ui/progress/progress-tests.ts

@@ -57,7 +57,7 @@ export function test_set_value_greater_than_max_should_set_value_to_max() {
 }
 
 // Uncomment this when find way to check android Drawable color set by setColorFilter() method.
-if (platform.Device.os === platform.platformNames.ios) {
+if (__APPLE__) {
 	exports.test_set_color = function () {
 		var progress = new progressModule.Progress();
 		progress.color = new color.Color('red');

apps/automated/src/ui/root-view/root-view-tests.ts

@@ -38,6 +38,10 @@ export function test_custom_component_rootview_layout_updates() {
 }
 
 export function test_tabview_rootview_css_applied() {
+	if (__VISIONOS__) {
+		// TODO: investigate resetRootView cases with visionOS setup
+		return;
+	}
 	var entry = {
 		moduleName: 'ui/root-view/root-modules/tabview-root',
 	};

apps/automated/src/ui/styling/root-views-css-classes-tests.ts

@@ -9,6 +9,7 @@ const ROOT_CSS_CLASS = 'ns-root';
 const MODAL_CSS_CLASS = 'ns-modal';
 const ANDROID_PLATFORM_CSS_CLASS = 'ns-android';
 const IOS_PLATFORM_CSS_CLASS = 'ns-ios';
+const VISIONOS_PLATFORM_CSS_CLASS = 'ns-visionos';
 const PHONE_DEVICE_TYPE_CSS_CLASS = 'ns-phone';
 const TABLET_DEVICE_TYPE_CSS_CLASS = 'ns-tablet';
 const PORTRAIT_ORIENTATION_CSS_CLASS = 'ns-portrait';
@@ -41,7 +42,8 @@ function _test_platform_css_class(rootView: View, shouldSetClassName: boolean) {
 		TKUnit.assertTrue(cssClasses.has(ANDROID_PLATFORM_CSS_CLASS), `${ANDROID_PLATFORM_CSS_CLASS} CSS class is missing`);
 		TKUnit.assertFalse(cssClasses.has(IOS_PLATFORM_CSS_CLASS), `${IOS_PLATFORM_CSS_CLASS} CSS class is present`);
 	} else {
-		TKUnit.assertTrue(cssClasses.has(IOS_PLATFORM_CSS_CLASS), `${IOS_PLATFORM_CSS_CLASS} CSS class is missing`);
+		const cssClass = __VISIONOS__ ? VISIONOS_PLATFORM_CSS_CLASS : IOS_PLATFORM_CSS_CLASS;
+		TKUnit.assertTrue(cssClasses.has(cssClass), `${cssClass} CSS class is missing`);
 		TKUnit.assertFalse(cssClasses.has(ANDROID_PLATFORM_CSS_CLASS), `${ANDROID_PLATFORM_CSS_CLASS} CSS class is present`);
 	}
 
@@ -113,7 +115,7 @@ function _test_system_appearance_css_class(rootView: View, shouldSetClassName: b
 	} else {
 		systemAppearance = Application.ios.systemAppearance;
 	}
-	if (isIOS && Utils.ios.MajorVersion <= 12) {
+	if (isIOS && !__VISIONOS__ && Utils.SDK_VERSION <= 12) {
 		TKUnit.assertFalse(cssClasses.has(DARK_SYSTEM_APPEARANCE_CSS_CLASS), `${DARK_SYSTEM_APPEARANCE_CSS_CLASS} CSS class is present`);
 		TKUnit.assertFalse(cssClasses.has(LIGHT_SYSTEM_APPEARANCE_CSS_CLASS), `${LIGHT_SYSTEM_APPEARANCE_CSS_CLASS} CSS class is present`);
 	} else if (systemAppearance === 'dark') {

apps/automated/src/ui/switch/switch-tests.ts

@@ -42,7 +42,7 @@ export function test_default_native_values() {
 }
 
 // Uncomment this when find way to check android Drawable color set by setColorFilter() method.
-if (platform.Device.os === platform.platformNames.ios) {
+if (__APPLE__) {
 	exports.test_set_color = function () {
 		var mySwitch = new switchModule.Switch();
 		mySwitch.color = new Color('red');

apps/automated/src/ui/tab-view/tab-view-root-tests.ts

@@ -63,89 +63,95 @@ function createTabItemsWithFrames(count: number) {
 }
 
 export function test_frame_topmost_matches_selectedIndex() {
-	const items = createTabItemsWithFrames(3);
-	const tabView = new TabView();
-	tabView.items = items.map((item) => item.tabItem);
+	if (!__VISIONOS__) {
+		// TODO: investigate TabView conditions on visionOS
+		const items = createTabItemsWithFrames(3);
+		const tabView = new TabView();
+		tabView.items = items.map((item) => item.tabItem);
 
-	// iOS cannot preload tab items
-	// Android preloads 1 tab item to the sides by default
-	// set this to 0, so that both platforms behave the same.
-	tabView.androidOffscreenTabLimit = 0;
+		// iOS cannot preload tab items
+		// Android preloads 1 tab item to the sides by default
+		// set this to 0, so that both platforms behave the same.
+		tabView.androidOffscreenTabLimit = 0;
 
-	const entry: NavigationEntry = {
-		create: () => tabView,
-	};
+		const entry: NavigationEntry = {
+			create: () => tabView,
+		};
 
-	waitUntilNavigatedToMaxTimeout([items[0].page], () => Application.resetRootView(entry));
-	TKUnit.assertEqual(Frame.topmost().id, 'Tab0 Frame0');
+		waitUntilNavigatedToMaxTimeout([items[0].page], () => Application.resetRootView(entry));
+		TKUnit.assertEqual(Frame.topmost().id, 'Tab0 Frame0');
 
-	waitUntilNavigatedToMaxTimeout([items[1].page], () => (tabView.selectedIndex = 1));
-	TKUnit.assertEqual(Frame.topmost().id, 'Tab1 Frame1');
+		waitUntilNavigatedToMaxTimeout([items[1].page], () => (tabView.selectedIndex = 1));
+		TKUnit.assertEqual(Frame.topmost().id, 'Tab1 Frame1');
+	}
 }
 
 export function test_offset_zero_should_raise_same_events() {
-	let actualEventsRaised = [];
+	if (!__VISIONOS__) {
+		// TODO: investigate cases where Application.resetRootView is called on visionOS
+		let actualEventsRaised = [];
 
-	function resetActualEventsRaised() {
-		for (var i = 0; i < actualEventsRaised.length; i++) {
-			actualEventsRaised[i] = [];
+		function resetActualEventsRaised() {
+			for (var i = 0; i < actualEventsRaised.length; i++) {
+				actualEventsRaised[i] = [];
+			}
 		}
+
+		function attachEventHandlers(i: number, item) {
+			actualEventsRaised.push([]);
+
+			const page = item.page;
+			page.on(Page.loadedEvent, () => actualEventsRaised[i].push(`${page.id} loaded`));
+			page.on(Page.unloadedEvent, () => actualEventsRaised[i].push(`${page.id} unloaded`));
+			page.on(Page.navigatingToEvent, () => actualEventsRaised[i].push(`${page.id} navigatingTo`));
+			page.on(Page.navigatingFromEvent, () => actualEventsRaised[i].push(`${page.id} navigatingFrom`));
+			page.on(Page.navigatedToEvent, () => actualEventsRaised[i].push(`${page.id} navigatedTo`));
+			page.on(Page.navigatedFromEvent, () => actualEventsRaised[i].push(`${page.id} navigatedFrom`));
+
+			const frame = item.frame;
+			frame.on(Frame.loadedEvent, () => actualEventsRaised[i].push(`${frame.id} loaded`));
+			frame.on(Frame.unloadedEvent, () => actualEventsRaised[i].push(`${frame.id} unloaded`));
+		}
+
+		const items = createTabItemsWithFrames(3);
+
+		items.forEach((item, i) => {
+			attachEventHandlers(i, item);
+		});
+
+		const tabView = new TabView();
+		tabView.items = items.map((item) => item.tabItem);
+
+		// iOS cannot preload tab items
+		// Android preloads 1 tab item to the sides by default
+		// set this to 0, so that both platforms behave the same.
+		tabView.androidOffscreenTabLimit = 0;
+
+		const entry: NavigationEntry = {
+			create: () => tabView,
+		};
+
+		waitUntilNavigatedToMaxTimeout([items[0].page], () => Application.resetRootView(entry));
+
+		const expectedEventsRaisedAfterTabCreated = [['Tab0 Frame0 loaded', 'Tab0 Frame0 Page0 navigatingTo', 'Tab0 Frame0 Page0 loaded', 'Tab0 Frame0 Page0 navigatedTo'], [], []];
+
+		TKUnit.assertDeepEqual(actualEventsRaised, expectedEventsRaisedAfterTabCreated);
+
+		resetActualEventsRaised();
+		waitUntilNavigatedToMaxTimeout([items[2].page], () => (tabView.selectedIndex = 2));
+
+		const expectedEventsRaisedAfterSelectThirdTab = [['Tab0 Frame0 Page0 unloaded', 'Tab0 Frame0 unloaded'], [], ['Tab2 Frame2 loaded', 'Tab2 Frame2 Page2 navigatingTo', 'Tab2 Frame2 Page2 loaded', 'Tab2 Frame2 Page2 navigatedTo']];
+
+		TKUnit.assertDeepEqual(actualEventsRaised, expectedEventsRaisedAfterSelectThirdTab);
+
+		resetActualEventsRaised();
+
+		waitUntilTabViewReady(items[0].page, () => (tabView.selectedIndex = 0));
+
+		const expectedEventsRaisedAfterReturnToFirstTab = [['Tab0 Frame0 Page0 loaded', 'Tab0 Frame0 loaded'], [], ['Tab2 Frame2 Page2 unloaded', 'Tab2 Frame2 unloaded']];
+
+		TKUnit.assertDeepEqual(actualEventsRaised, expectedEventsRaisedAfterReturnToFirstTab);
 	}
-
-	function attachEventHandlers(i: number, item) {
-		actualEventsRaised.push([]);
-
-		const page = item.page;
-		page.on(Page.loadedEvent, () => actualEventsRaised[i].push(`${page.id} loaded`));
-		page.on(Page.unloadedEvent, () => actualEventsRaised[i].push(`${page.id} unloaded`));
-		page.on(Page.navigatingToEvent, () => actualEventsRaised[i].push(`${page.id} navigatingTo`));
-		page.on(Page.navigatingFromEvent, () => actualEventsRaised[i].push(`${page.id} navigatingFrom`));
-		page.on(Page.navigatedToEvent, () => actualEventsRaised[i].push(`${page.id} navigatedTo`));
-		page.on(Page.navigatedFromEvent, () => actualEventsRaised[i].push(`${page.id} navigatedFrom`));
-
-		const frame = item.frame;
-		frame.on(Frame.loadedEvent, () => actualEventsRaised[i].push(`${frame.id} loaded`));
-		frame.on(Frame.unloadedEvent, () => actualEventsRaised[i].push(`${frame.id} unloaded`));
-	}
-
-	const items = createTabItemsWithFrames(3);
-
-	items.forEach((item, i) => {
-		attachEventHandlers(i, item);
-	});
-
-	const tabView = new TabView();
-	tabView.items = items.map((item) => item.tabItem);
-
-	// iOS cannot preload tab items
-	// Android preloads 1 tab item to the sides by default
-	// set this to 0, so that both platforms behave the same.
-	tabView.androidOffscreenTabLimit = 0;
-
-	const entry: NavigationEntry = {
-		create: () => tabView,
-	};
-
-	waitUntilNavigatedToMaxTimeout([items[0].page], () => Application.resetRootView(entry));
-
-	const expectedEventsRaisedAfterTabCreated = [['Tab0 Frame0 loaded', 'Tab0 Frame0 Page0 navigatingTo', 'Tab0 Frame0 Page0 loaded', 'Tab0 Frame0 Page0 navigatedTo'], [], []];
-
-	TKUnit.assertDeepEqual(actualEventsRaised, expectedEventsRaisedAfterTabCreated);
-
-	resetActualEventsRaised();
-	waitUntilNavigatedToMaxTimeout([items[2].page], () => (tabView.selectedIndex = 2));
-
-	const expectedEventsRaisedAfterSelectThirdTab = [['Tab0 Frame0 Page0 unloaded', 'Tab0 Frame0 unloaded'], [], ['Tab2 Frame2 loaded', 'Tab2 Frame2 Page2 navigatingTo', 'Tab2 Frame2 Page2 loaded', 'Tab2 Frame2 Page2 navigatedTo']];
-
-	TKUnit.assertDeepEqual(actualEventsRaised, expectedEventsRaisedAfterSelectThirdTab);
-
-	resetActualEventsRaised();
-
-	waitUntilTabViewReady(items[0].page, () => (tabView.selectedIndex = 0));
-
-	const expectedEventsRaisedAfterReturnToFirstTab = [['Tab0 Frame0 Page0 loaded', 'Tab0 Frame0 loaded'], [], ['Tab2 Frame2 Page2 unloaded', 'Tab2 Frame2 unloaded']];
-
-	TKUnit.assertDeepEqual(actualEventsRaised, expectedEventsRaisedAfterReturnToFirstTab);
 }
 
 export function test_android_default_offset_should_preload_1_tab_on_each_side() {

apps/automated/src/ui/text-view/text-view-tests.ts

@@ -87,7 +87,7 @@ export var testSetTextUndefined = function () {
 };
 
 // Supported for ios only.
-if (platform.Device.os === platform.platformNames.ios) {
+if (__APPLE__) {
 	exports.test_set_color = function () {
 		helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
 			var textView = <textViewModule.TextView>views[0];

apps/automated/src/xml-declaration/xml-declaration-tests.ts

@@ -322,7 +322,7 @@ export function test_parse_ShouldParsePlatformSpecificProperties() {
 	var p = <Page>Builder.parse("<Page><TextField ios:editable='False' android:editable='True' /></Page>");
 	var tf = <TextField>p.content;
 
-	if (Device.os === platformNames.ios) {
+	if (__APPLE__) {
 		TKUnit.assertFalse(tf.editable, 'Expected result: false; Actual result: ' + tf.editable + '; type: ' + typeof tf.editable);
 	} else {
 		TKUnit.assertTrue(tf.editable, 'Expected result: true; Actual result: ' + tf.editable + '; type: ' + typeof tf.editable);
@@ -331,7 +331,7 @@ export function test_parse_ShouldParsePlatformSpecificProperties() {
 
 export function test_parse_ShouldParsePlatformSpecificComponents() {
 	var p = <Page>Builder.parse('<Page><ios><TextField /></ios><android><Label /></android></Page>');
-	if (Device.os === platformNames.ios) {
+	if (__APPLE__) {
 		TKUnit.assert(p.content instanceof TextField, 'Expected result: TextField; Actual result: ' + p.content);
 	} else {
 		TKUnit.assert(p.content instanceof Label, 'Expected result: Label; Actual result: ' + p.content);

apps/toolbox/package.json

@@ -8,13 +8,14 @@
   },
   "dependencies": {
     "@nativescript/core": "file:../../packages/core",
-    "nativescript-theme-core": "file:../../node_modules/nativescript-theme-core",
-    "@nativescript/imagepicker": "^3.0.0"
+    "@nativescript/imagepicker": "^3.1.1",
+    "nativescript-theme-core": "file:../../node_modules/nativescript-theme-core"
   },
   "devDependencies": {
-    "@nativescript/android": "~8.6.0",
-    "@nativescript/ios": "~8.6.0",
+    "@nativescript/android": "rc",
+    "@nativescript/ios": "rc",
+    "@nativescript/visionos": "rc",
     "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz",
-    "typescript": "~5.2.0"
+    "typescript": "~5.4.0"
   }
 }

apps/toolbox/project.json

@@ -28,6 +28,16 @@
 				"noHmr": true
 			}
 		},
+		"vision": {
+			"executor": "@nativescript/nx:build",
+			"inputs": ["default", "^production"],
+			"outputs": [],
+			"options": {
+				"noHmr": true,
+				"debug": false,
+				"platform": "vision"
+			}
+		},
 		"android": {
 			"executor": "@nativescript/nx:build",
 			"inputs": ["default", "^production"],

apps/toolbox/src/app.css

@@ -9,7 +9,7 @@ Button {
     text-transform: none;
 }
 .btn-view-demo {
-  background-color: #65ADF1;
+  /* background-color: #65ADF1; */
   border-radius: 5;
   font-size: 17;
   padding: 15;
@@ -223,6 +223,22 @@ Button {
     background-color: #777;
 }
 
+.ns-visionos Page {
+    background-color: transparent;
+}
+
+.ns-visionos Label, TextField, TextView {
+    font-size: 24;
+    padding: 12
+}
+
+.ns-visionos Button {
+    padding: 12;
+    font-size: 24;
+    background-color: transparent;
+    width: 400;
+}
+
 .no-shadow {
     box-shadow: none;
 }

apps/toolbox/src/main-page.ts

@@ -5,7 +5,8 @@ export function navigatingTo(args: EventData) {
 	const page = <Page>args.object;
 	page.bindingContext = new HelloWorldModel();
 
-	if (global.isIOS) {
-		Utils.ios.setWindowBackgroundColor('blue');
-	}
+	// Testing setting window background color
+	// if (global.isIOS) {
+	// 	Utils.ios.setWindowBackgroundColor('blue');
+	// }
 }

apps/toolbox/src/pages/image-handling.ts

@@ -44,7 +44,7 @@ export class DemoModel extends Observable {
 						},
 						(err) => {
 							this.addingPhoto = false;
-						}
+						},
 					);
 				}
 			})

apps/toolbox/src/pages/labels.xml

@@ -5,24 +5,24 @@
     </Page.actionBar>
     <ScrollView>
       <StackLayout padding="20">
-	  	<GridLayout borderWidth="1" borderColor="#efefef" height="60" paddingLeft="5">
+	  	<GridLayout marginTop="10" borderWidth="1" borderColor="#dedede" height="60" paddingLeft="5">
 			<Label text="Test Label 1: should be aligned middle" />
 		</GridLayout>
-		<GridLayout marginTop="10" borderWidth="1" borderColor="#efefef" height="60" paddingLeft="5">
+		<GridLayout marginTop="10" borderWidth="1" borderColor="#dedede" height="60" paddingLeft="5">
 			<Label text="Test Label 2: should be aligned bottom" verticalAlignment="bottom" />
 		</GridLayout>
-		<GridLayout marginTop="10" borderWidth="1" borderColor="#efefef" height="60" paddingLeft="5">
+		<GridLayout marginTop="10" borderWidth="1" borderColor="#dedede" height="60" paddingLeft="5">
 			<Label text="Test Label 3: should be aligned top" verticalAlignment="top" />
 		</GridLayout>
-		<GridLayout marginTop="10" borderWidth="1" borderColor="#efefef" height="60" paddingLeft="5">
+		<GridLayout marginTop="10" borderWidth="1" borderColor="#dedede" height="60" paddingLeft="5">
 			<Label text="Test Label text-overflow: ellipsis, this should be long sentence and clipped at very end." textOverflow="ellipsis" whiteSpace="nowrap" />
 		</GridLayout>
 
-		<GridLayout marginTop="10" borderWidth="1" borderColor="#efefef" height="60" paddingLeft="5">
+		<GridLayout marginTop="10" borderWidth="1" borderColor="#dedede" height="60" paddingLeft="5">
 			<Button text="Test Button text-overflow: ellipsis, this should be long sentence and clipped at very end." textOverflow="ellipsis" whiteSpace="nowrap" />
 		</GridLayout>
 
-		<GridLayout marginTop="10" borderWidth="1" borderColor="#efefef" height="60" paddingLeft="5">
+		<GridLayout marginTop="10" borderWidth="1" borderColor="#dedede" height="60" paddingLeft="5">
 			<Button text="Test Button text-overflow: initial, this should be long sentence and truncated in the middle with ellipsis." textOverflow="initial" whiteSpace="nowrap" />
 		</GridLayout>
 		<GridLayout marginTop="10" height="60" paddingLeft="5" tap="{{toggleStrokeStyle}}">

apps/toolbox/src/pages/list-page.xml

@@ -12,6 +12,9 @@
                 <StackLayout class="list-row-item">
                     <GridLayout>
                         <FlexboxLayout flexDirection="row" class="list-view-row" verticalAlignment="center">
+                            <visionos>
+                                <Label text="{{ iconText }}" class="icon-around icon-label"/>
+                            </visionos>
                             <ios>
                                 <Label text="{{ iconText }}" class="icon-around icon-label"/>
                             </ios>
@@ -33,6 +36,9 @@
                 <StackLayout class="list-row-item">
                     <GridLayout>
                         <FlexboxLayout flexDirection="row" class="list-view-row" verticalAlignment="center">
+                            <visionos>
+                                <Label text="{{ iconText }}" class="icon-around icon-label"/>
+                            </visionos>
                             <ios>
                                 <Label text="{{ iconText }}" class="icon-around icon-label"/>
                             </ios>

apps/toolbox/src/pages/scroll-view.ts

@@ -17,6 +17,12 @@ export class ScrollViewModel extends Observable {
 	1914 translation by H. Rackham
 	"But I must explain to you how all this mistaken idea of denouncing pleasure and praising pain was born and I will give you a complete account of the system, and expound the actual teachings of the great explorer of the truth, the master-builder of human happiness. No one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but because those who do not know how to pursue pleasure rationally encounter consequences that are extremely painful. Nor again is there anyone who loves or pursues or desires to obtain pain of itself, because it is pain, but because occasionally circumstances occur in which toil and pain can procure him some great pleasure. To take a trivial example, which of us ever undertakes laborious physical exercise, except to obtain some advantage from it? But who has any right to find fault with a man who chooses to enjoy a pleasure that has no annoying consequences, or one who avoids a pain that produces no resultant pleasure?"
 	
+	Section 1.10.33 of "de Finibus Bonorum et Malorum", written by Cicero in 45 BC
+	"At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat.
+	
+	Section 1.10.33 of "de Finibus Bonorum et Malorum", written by Cicero in 45 BC
+	"At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat.
+	
 	Section 1.10.33 of "de Finibus Bonorum et Malorum", written by Cicero in 45 BC
 	"At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat."`;
 

apps/toolbox/src/pages/scroll-view.xml

@@ -5,7 +5,7 @@
     </Page.actionBar>
  
       <ScrollView scroll="{{ scroll }}">
-          <StackLayout>
+          <StackLayout class="p-20">
 
             <Label text="{{longText}}" textWrap="true" />
 

apps/toolbox/src/pages/switch.xml

@@ -4,9 +4,9 @@
         </ActionBar>
     </Page.actionBar>
 
-    <GridLayout padding="20" class="switch-demo-page">   
+    <GridLayout class="switch-demo-page">   
       <ScrollView>
-          <StackLayout>
+          <StackLayout ios:padding="20" visionos:padding="40">
 
             <GridLayout columns="*, auto" marginTop="24">
                 <Label text="Default + Checked + Enabled" />

apps/toolbox/src/pages/touch-animations.xml

@@ -4,7 +4,7 @@
         </ActionBar>
     </Page.actionBar>
 
-    <!-- <ScrollView> -->
+    <ScrollView>
     
       <StackLayout class="p-x-20" loaded="{{ loadedContainer }}">
           <Label id="label" tap="{{ onTapAnything }}" text="Touchable label" class="t-18 c-black text-center m-t-5" touchAnimation="{{ touchAnimationLabel }}" />
@@ -36,5 +36,5 @@
           <Button text="TAP" tap="{{ onTapAnything }}" class="btn btn-primary btn-view-demo" touchAnimation="true" /> -->
           
       </StackLayout>
-    <!-- </ScrollView> -->
+    </ScrollView>
 </Page>

apps/ui/package.json

@@ -7,14 +7,15 @@
     "url": "https://github.com/NativeScript/NativeScript.git"
   },
   "dependencies": {
-    "nativescript-theme-core": "file:../../node_modules/nativescript-theme-core",
-    "@nativescript/core": "file:../../packages/core"
+    "@nativescript/core": "file:../../packages/core",
+    "nativescript-theme-core": "file:../../node_modules/nativescript-theme-core"
   },
   "devDependencies": {
-    "@nativescript/android": "~8.6.0",
-    "@nativescript/ios": "~8.6.0",
+    "@nativescript/android": "rc",
+    "@nativescript/ios": "rc",
+    "@nativescript/visionos": "rc",
     "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz",
-    "typescript": "~5.2.0"
+    "typescript": "~5.4.0"
   },
   "gitHead": "8ab7726d1ee9991706069c1359c552e67ee0d1a4",
   "readme": "NativeScript Application",

apps/ui/project.json

@@ -28,6 +28,16 @@
 				"noHmr": true
 			}
 		},
+		"vision": {
+			"executor": "@nativescript/nx:build",
+			"inputs": ["default", "^production"],
+			"outputs": [],
+			"options": {
+				"noHmr": true,
+				"debug": false,
+				"platform": "vision"
+			}
+		},
 		"android": {
 			"executor": "@nativescript/nx:build",
 			"inputs": ["default", "^production"],

apps/ui/src/date-picker/date-picker-page.xml

@@ -1,6 +1,8 @@
 <Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
-    <StackLayout>
-        <DatePicker day="1" month="9" year="2017" verticalAlignment="center"/>
-        <DatePicker day="1" month="10" year="2017" verticalAlignment="center"/>
-    </StackLayout>
+    <ActionBar title="@nativescript/core DatePicker"/>
+    <GridLayout rows="auto,auto,auto,*" width="270" horizontalAlignment="center" marginRight="60">
+        <DatePicker row="0" day="2" month="10" year="2023" verticalAlignment="center" horizontalAlignment="center" fontSize="40" marginTop="50" marginRight="30" />
+        <DatePicker row="1" day="2" month="10" year="2023" verticalAlignment="center" horizontalAlignment="center" fontSize="40" marginTop="10" marginRight="30" />
+        <DatePicker row="2" day="2" month="10" year="2023" verticalAlignment="center" horizontalAlignment="center" fontSize="40" marginTop="10" showTime="true" />
+    </GridLayout>
 </Page>

apps/ui/src/issues/issue-1657-ios-page.ts

@@ -4,7 +4,7 @@ var platform = require('@nativescript/core/platform');
 var defaultSpeed = -1;
 
 export function navigatingTo(args: EventData) {
-	if (platform.device.os === platform.platformNames.ios) {
+	if (__APPLE__) {
 		if (defaultSpeed === -1) {
 			defaultSpeed = frameModule.topmost().ios.controller.view.layer.speed;
 			frameModule.topmost().ios.controller.navigationBar.translucent = false;
@@ -19,7 +19,7 @@ export function onTap() {
 }
 
 export function changeTranslucent() {
-	if (platform.device.os === platform.platformNames.ios) {
+	if (__APPLE__) {
 		frameModule.topmost().ios.controller.navigationBar.translucent = frameModule.topmost().ios.controller.navigationBar.translucent === true ? false : true;
 	}
 }