Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/automated/src/ui/page/page-tests-common.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Page, ShownModallyData, NavigatedData, View, PercentLength, unsetValue, EventData, Frame, NavigationEntry, TabView, TabViewItem, Button, Color, Label, StackLayout, Application, Utils, Builder } from '@nativescript/core';
import { Page, ShownModallyData, NavigatedData, View, PercentLength, unsetValue, EventData, Frame, NavigationEntry, TabView, TabViewItem, Button, Color, Label, StackLayout, Utils, Builder } from '@nativescript/core';

// >> article-set-bindingcontext
export function pageLoaded(args) {
Expand Down
49 changes: 49 additions & 0 deletions apps/automated/src/ui/styling/root-views-css-classes-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,35 @@ function _test_platform_css_class(rootView: View, shouldSetClassName: boolean) {
}
}

function _test_platform_sdk_css_class(rootView: View, shouldSetClassName: boolean) {
if (shouldSetClassName) {
rootView.className = CLASS_NAME;
}

const cssClasses = rootView.cssClasses;
const deviceType = Device.os.toLowerCase();
const majorVersion = Math.floor(Utils.SDK_VERSION);
const sdkClass = `ns-${deviceType}-${majorVersion}`;

if (isAndroid) {
const iosSdkClass = `ns-ios-${majorVersion}`;
const visionosSdkClass = `ns-visionos-${majorVersion}`;

TKUnit.assertTrue(cssClasses.has(sdkClass), `${sdkClass} CSS class is missing`);
TKUnit.assertFalse(cssClasses.has(iosSdkClass), `${iosSdkClass} CSS class is present`);
TKUnit.assertFalse(cssClasses.has(visionosSdkClass), `${visionosSdkClass} CSS class is present`);
} else {
const androidSdkClass = `ns-android-${majorVersion}`;

TKUnit.assertTrue(cssClasses.has(sdkClass), `${sdkClass} CSS class is missing`);
TKUnit.assertFalse(cssClasses.has(androidSdkClass), `${androidSdkClass} CSS class is present`);
}

if (shouldSetClassName) {
TKUnit.assertTrue(cssClasses.has(CLASS_NAME), `${CLASS_NAME} CSS class is missing`);
}
}

function _test_device_type_css_class(rootView: View, shouldSetClassName: boolean) {
if (shouldSetClassName) {
rootView.className = CLASS_NAME;
Expand Down Expand Up @@ -188,6 +217,16 @@ export function test_root_view_class_name_preserve_platform_css_class() {
_test_platform_css_class(rootView, true);
}

export function test_root_view_platform_sdk_css_class() {
const rootView = Application.getRootView();
_test_platform_sdk_css_class(rootView, false);
}

export function test_root_view_class_name_preserve_platform_sdk_css_class() {
const rootView = Application.getRootView();
_test_platform_sdk_css_class(rootView, true);
}

export function test_root_view_device_type_css_class() {
const rootView = Application.getRootView();
_test_device_type_css_class(rootView, false);
Expand Down Expand Up @@ -218,6 +257,16 @@ export function test_root_view_class_name_preserve_system_appearance_css_class()
_test_system_appearance_css_class(rootView, true);
}

export function test_root_view_layout_direction_css_class() {
const rootView = Application.getRootView();
_test_layout_direction_css_class(rootView, false);
}

export function test_root_view_class_name_preserve_layout_direction_css_class() {
const rootView = Application.getRootView();
_test_layout_direction_css_class(rootView, true);
}

// Modal root view
function _test_modal_root_view_modal_css_class(shouldSetClassName: boolean) {
let modalClosed = false;
Expand Down
54 changes: 6 additions & 48 deletions packages/core/application/application-common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,54 +36,6 @@ const LAYOUT_DIRECTION_CSS_CLASSES = [
`${CSSUtils.CLASS_PREFIX}${CoreTypes.LayoutDirection.rtl}`,
];

// SDK Version CSS classes
let sdkVersionClasses: string[] = [];

export function initializeSdkVersionClass(rootView: View): void {
const majorVersion = Math.floor(SDK_VERSION);
sdkVersionClasses = [];

let platformPrefix = '';
if (__APPLE__) {
platformPrefix = __VISIONOS__ ? 'ns-visionos' : 'ns-ios';
} else if (__ANDROID__) {
platformPrefix = 'ns-android';
}

if (platformPrefix) {
// Add exact version class (e.g., .ns-ios-26 or .ns-android-36)
// this acts like 'gte' for that major version range
// e.g., if user wants iOS 27, they can add .ns-ios-27 specifiers
sdkVersionClasses.push(`${platformPrefix}-${majorVersion}`);
}

// Apply the SDK version classes to root views
applySdkVersionClass(rootView);
}

function applySdkVersionClass(rootView: View): void {
if (!sdkVersionClasses.length) {
return;
}

if (!rootView) {
return;
}

// Batch apply all SDK version classes to root view for better performance
const classesToAdd = sdkVersionClasses.filter((className) => !rootView.cssClasses.has(className));
classesToAdd.forEach((className) => rootView.cssClasses.add(className));

// Apply to modal views only if there are any
const rootModalViews = <Array<View>>rootView._getRootModalViews();
if (rootModalViews.length > 0) {
rootModalViews.forEach((rootModalView) => {
const modalClassesToAdd = sdkVersionClasses.filter((className) => !rootModalView.cssClasses.has(className));
modalClassesToAdd.forEach((className) => rootModalView.cssClasses.add(className));
});
}
}

const globalEvents = getNativeScriptGlobals().events;

// Scene lifecycle event names
Expand Down Expand Up @@ -353,6 +305,12 @@ export class ApplicationCommon {

if (platform) {
CSSUtils.pushToSystemCssClasses(`${CSSUtils.CLASS_PREFIX}${platform}`);

// SDK Version CSS classes
// Add exact version class (e.g., .ns-ios-26 or .ns-android-36)
// this acts like 'gte' for that major version range
// e.g., if user wants iOS 27, they can add .ns-ios-27 specifiers
CSSUtils.pushToSystemCssClasses(`${CSSUtils.CLASS_PREFIX}${platform}-${Math.floor(SDK_VERSION)}`);
}

if (deviceType) {
Expand Down
9 changes: 3 additions & 6 deletions packages/core/application/application.android.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { View } from '../ui/core/view';
import { AndroidActivityCallbacks, NavigationEntry } from '../ui/frame/frame-common';
import { SDK_VERSION } from '../utils/constants';
import { android as androidUtils } from '../utils';
import { ApplicationCommon, initializeSdkVersionClass } from './application-common';
import { ApplicationCommon } from './application-common';
import type { AndroidActivityBundleEventData, AndroidActivityEventData, ApplicationEventData } from './application-interfaces';
import { Observable } from '../data/observable';
import { Trace } from '../trace';
Expand Down Expand Up @@ -819,17 +819,14 @@ export class AccessibilityServiceEnabledObservable extends CommonA11YServiceEnab
}

let accessibilityServiceObservable: AccessibilityServiceEnabledObservable;
export function ensureClasses() {
export function ensureA11yClasses() {
if (accessibilityServiceObservable) {
return;
}

setFontScaleCssClasses(new Map(VALID_FONT_SCALES.map((fs) => [fs, `a11y-fontscale-${Number(fs * 100).toFixed(0)}`])));

accessibilityServiceObservable = new AccessibilityServiceEnabledObservable();

// Initialize SDK version CSS class once
initializeSdkVersionClass(Application.getRootView());
}

export function updateCurrentHelperClasses(applyRootCssClass: (cssClasses: string[], newCssClass: string) => void): void {
Expand Down Expand Up @@ -884,7 +881,7 @@ export function updateCurrentHelperClasses(applyRootCssClass: (cssClasses: strin
}

export function initAccessibilityCssHelper(): void {
ensureClasses();
ensureA11yClasses();
updateCurrentHelperClasses(applyRootCssClass);
applyFontScaleToRootViews();

Expand Down
9 changes: 3 additions & 6 deletions packages/core/application/application.ios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { NavigationEntry } from '../ui/frame/frame-interfaces';
import { getWindow } from '../utils/native-helper';
import { SDK_VERSION } from '../utils/constants';
import { ios as iosUtils, dataSerialize } from '../utils/native-helper';
import { ApplicationCommon, initializeSdkVersionClass, SceneEvents } from './application-common';
import { ApplicationCommon, SceneEvents } from './application-common';
import { ApplicationEventData, SceneEventData } from './application-interfaces';
import { Observable } from '../data/observable';
import type { iOSApplication as IiOSApplication } from './application';
Expand Down Expand Up @@ -1666,17 +1666,14 @@ export class AccessibilityServiceEnabledObservable extends CommonA11YServiceEnab
}

let accessibilityServiceObservable: AccessibilityServiceEnabledObservable;
export function ensureClasses() {
export function ensureA11yClasses() {
if (accessibilityServiceObservable) {
return;
}

setFontScaleCssClasses(new Map(VALID_FONT_SCALES.map((fs) => [fs, `a11y-fontscale-${Number(fs * 100).toFixed(0)}`])));

accessibilityServiceObservable = new AccessibilityServiceEnabledObservable();

// Initialize SDK version CSS class once
initializeSdkVersionClass(Application.getRootView());
}

export function updateCurrentHelperClasses(applyRootCssClass: (cssClasses: string[], newCssClass: string) => void): void {
Expand Down Expand Up @@ -1757,7 +1754,7 @@ function applyFontScaleToRootViews(): void {
}

export function initAccessibilityCssHelper(): void {
ensureClasses();
ensureA11yClasses();
updateCurrentHelperClasses(applyRootCssClass);
applyFontScaleToRootViews();

Expand Down
2 changes: 0 additions & 2 deletions packages/core/ui/action-bar/index.ios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -509,8 +509,6 @@ export class ActionBar extends ActionBarBase {
return;
}

console.log('ActionBar._onTitlePropertyChanged', this.title);

if (page.frame) {
page.frame._updateActionBar(page);
}
Expand Down
1 change: 0 additions & 1 deletion packages/core/ui/styling/css-selector.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { parse as convertToCSSWhatSelector, Selector as CSSWhatSelector, DataType as CSSWhatDataType } from 'css-what';
import '../../globals';
import { isCssVariable } from '../core/properties';
import { Trace, CoreTypes } from './styling-shared';
import { isNullOrUndefined } from '../../utils/types';

import * as ReworkCSS from '../../css';
Expand Down
Loading