@nativescript/core 9.1.0-alpha.9 → 9.1.0-dev.0

package/ui/styling/font.windows.js

@@ -0,0 +1,213 @@
+import { Font as FontBase, parseFontFamily, genericFontFamilies, FontWeight } from './font-common';
+export * from './font-common';
+export const fontFamilyCache = new Map();
+// Maps lowercase font family name / filename stem → ms-appx:///app/fonts/<file>#<face> URI.
+// `score` resolves conflicts when several files share a family (e.g. Muli-*.ttf all expose
+// family "Muli"): exact stem==family match > "regular" styles > anything else.
+const _fontNameToUri = new Map();
+let _scanStarted = false;
+let _scanCompleted = false;
+const _onScanReady = [];
+function _completeScan() {
+    if (_scanCompleted)
+        return;
+    _scanCompleted = true;
+    const cbs = _onScanReady.splice(0);
+    for (const cb of cbs)
+        cb();
+}
+function _registerFont(key, uri, score) {
+    const k = key.toLowerCase();
+    const existing = _fontNameToUri.get(k);
+    if (!existing || score > existing.score) {
+        _fontNameToUri.set(k, { uri, score });
+    }
+}
+// Scans the app package's app/fonts/ directory once, synchronously, via the C++ FontHelper
+// (DirectWrite font-set enumeration). XAML FontFamily URIs need the font's REAL family name
+// after '#' (Muli-Regular.ttf must be referenced as ...Muli-Regular.ttf#Muli), so each font
+// registers three lookup keys:
+//   filename stem      → uri#win32Family  (matches Android's filename-based lookup)
+//   win32 family       → uri#win32Family  (e.g. "Muli Black")
+//   typographic family → uri#typoFamily   (e.g. "Muli" — groups all weights)
+function ensureFontsScan() {
+    if (_scanStarted)
+        return;
+    _scanStarted = true;
+    try {
+        const root = Windows.ApplicationModel.Package.Current.InstalledLocation.Path;
+        const listing = NativeScript.Widgets.FontHelper.ScanFontsDirectory(root + '\\app\\fonts');
+        const norm = (s) => s.toLowerCase().replace(/[\s_-]/g, '');
+        for (const line of String(listing || '').split('\n')) {
+            if (!line)
+                continue;
+            const [fileName, win32Family, typoFamily] = line.split('|');
+            if (!fileName)
+                continue;
+            const stem = fileName.replace(/\.[^.]+$/, '');
+            const baseUri = `ms-appx:///app/fonts/${fileName}`;
+            const legacy = win32Family || typoFamily || stem;
+            // Exact stem↔family match (Pacifico.ttf#Pacifico) outranks "regular" styles
+            // (Muli-Regular.ttf for family "Muli"), which outrank Bold/Italic variants.
+            // Scored per KEY: Muli-Black.ttf scores 3 for "Muli Black" but only 1 for "Muli",
+            // so the plain "Muli" key ends up at Muli-Regular.ttf, not the Black variant.
+            const scoreFor = (key) => (norm(stem) === norm(key) ? 3 : (/regular/i.test(stem) ? 2 : 1));
+            _registerFont(stem, `${baseUri}#${legacy}`, 3); // stem key is unique per file
+            _registerFont(legacy, `${baseUri}#${legacy}`, scoreFor(legacy));
+            if (typoFamily && norm(typoFamily) !== norm(legacy)) {
+                _registerFont(typoFamily, `${baseUri}#${typoFamily}`, scoreFor(typoFamily));
+            }
+        }
+    }
+    catch (_e) { }
+    _completeScan();
+}
+export var windows;
+(function (windows) {
+    function triggerFontScan() {
+        ensureFontsScan();
+    }
+    windows.triggerFontScan = triggerFontScan;
+    function whenFontScanReady(callback) {
+        if (_scanCompleted) {
+            callback();
+        }
+        else {
+            _onScanReady.push(callback);
+        }
+    }
+    windows.whenFontScanReady = whenFontScanReady;
+})(windows || (windows = {}));
+// CSS generic families → Windows system fonts.
+const _genericFamilyMap = new Map([
+    [genericFontFamilies.sansSerif, 'Segoe UI'],
+    [genericFontFamilies.serif, 'Times New Roman'],
+    [genericFontFamilies.monospace, 'Consolas'],
+    [genericFontFamilies.system, 'Segoe UI'],
+    ['system-ui', 'Segoe UI'],
+]);
+// Resolves one CSS font-family token to a XAML-usable source: app-font URI, system font name,
+// or ms-appx path. Returns null for empty tokens.
+function _resolveFamilyToken(raw) {
+    let f = String(raw || '').trim();
+    if ((f.startsWith('"') && f.endsWith('"')) || (f.startsWith("'") && f.endsWith("'"))) {
+        f = f.substring(1, f.length - 1).trim();
+    }
+    if (!f)
+        return null;
+    // NativeScript tilde path: ~/fonts/Foo.ttf#Foo → app/fonts/Foo.ttf#Foo.
+    if (f.startsWith('~/')) {
+        f = 'app/' + f.substring(2);
+    }
+    // Strip non-ms-appx URI scheme prefixes (e.g. font://, sys://).
+    if (!/^ms-appx/i.test(f)) {
+        f = f.replace(/^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//, '');
+    }
+    if (f.includes('/') || f.includes('\\')) {
+        // Path (with or without #face) — normalise to ms-appx.
+        return /^ms-appx/i.test(f) ? f : 'ms-appx:///' + f.replace(/^\/+/, '');
+    }
+    const generic = _genericFamilyMap.get(f.toLowerCase());
+    if (generic)
+        return generic;
+    // Bare family name: app-packaged font URI when scanned, else system font name.
+    return _fontNameToUri.get(f.toLowerCase())?.uri ?? f;
+}
+// Builds the XAML FontFamily source string for a CSS font-family list. XAML FontFamily natively
+// supports comma-separated fallbacks ("ms-appx:///app/fonts/Muli.ttf#Muli, Segoe UI"), so all
+// resolvable candidates are kept in order.
+function _resolveFamilySource(fontFamilyValue) {
+    const tokens = parseFontFamily(String(fontFamilyValue || ''));
+    const resolved = [];
+    for (const token of tokens) {
+        const source = _resolveFamilyToken(token);
+        if (source && !resolved.includes(source)) {
+            resolved.push(source);
+        }
+    }
+    return resolved.join(', ');
+}
+function createFontFamilyCandidate(candidate) {
+    if (!candidate)
+        return null;
+    try {
+        if (fontFamilyCache.has(candidate)) {
+            return fontFamilyCache.get(candidate) ?? null;
+        }
+        const ff = new Microsoft.UI.Xaml.Media.FontFamily(candidate);
+        fontFamilyCache.set(candidate, ff);
+        return ff;
+    }
+    catch (err) {
+        fontFamilyCache.set(candidate, null);
+        return null;
+    }
+}
+export function getFontFamilyCached(family) {
+    windows.triggerFontScan();
+    const source = _resolveFamilySource(family);
+    if (!source)
+        return null;
+    return createFontFamilyCandidate(source);
+}
+export function applyFontFamilyTo(target, fontFamilyValue) {
+    if (!target || !fontFamilyValue)
+        return;
+    const ff = getFontFamilyCached(fontFamilyValue);
+    if (ff) {
+        try {
+            target.FontFamily = ff;
+        }
+        catch (_e) { }
+    }
+}
+export function clearFontFamilyCache() {
+    fontFamilyCache.clear();
+}
+export class Font extends FontBase {
+    constructor(family, size, style, weight, scale, variationSettings) {
+        super(family, size, style, weight, scale, variationSettings ?? undefined);
+    }
+    withFontFamily(family) {
+        return new Font(family, this.fontSize, this.fontStyle, this.fontWeight, 1, this.fontVariationSettings ?? undefined);
+    }
+    withFontStyle(style) {
+        return new Font(this.fontFamily, this.fontSize, style, this.fontWeight, this.fontScale, this.fontVariationSettings ?? undefined);
+    }
+    withFontWeight(weight) {
+        return new Font(this.fontFamily, this.fontSize, this.fontStyle, weight, this.fontScale, this.fontVariationSettings ?? undefined);
+    }
+    withFontSize(size) {
+        return new Font(this.fontFamily, size, this.fontStyle, this.fontWeight, this.fontScale, this.fontVariationSettings ?? undefined);
+    }
+    withFontScale(scale) {
+        return new Font(this.fontFamily, this.fontSize, this.fontStyle, this.fontWeight, scale, this.fontVariationSettings ?? undefined);
+    }
+    withFontVariationSettings(variationSettings) {
+        return new Font(this.fontFamily, this.fontSize, this.fontStyle, this.fontWeight, this.fontScale, variationSettings ?? undefined);
+    }
+    getAndroidTypeface() {
+        return undefined;
+    }
+    getWindowsFontDescriptor(defaultFont) {
+        const families = parseFontFamily(this.fontFamily);
+        const fontSize = this.fontSize ? this.fontSize * (this.fontScale ?? 1) : (defaultFont?.pointSize ?? 0);
+        return {
+            fontFamily: families,
+            fontFamilyNative: getFontFamilyCached(this.fontFamily),
+            fontSize,
+            fontWeight: this.fontWeight ?? FontWeight.NORMAL,
+            fontVariationSettings: this.fontVariationSettings ?? undefined,
+            isBold: this.isBold,
+            isItalic: this.isItalic,
+        };
+    }
+    applyWindowsFont(target) {
+        applyFontFamilyTo(target, this.fontFamily);
+    }
+    getUIFont(defaultFont) {
+        return undefined;
+    }
+}
+Font.default = new Font(undefined, undefined);
+//# sourceMappingURL=font.windows.js.map

package/ui/styling/font.windows.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"font.windows.js","sourceRoot":"","sources":["../../../../../packages/core/ui/styling/font.windows.ts"],"names":[],"mappings":"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"}

package/ui/styling/style/index.d.ts

@@ -45,7 +45,6 @@ export declare class Style extends Observable {
      */
     fontScaleInternal: number;
     backgroundInternal: Background;
-    paddingInternal: string;
     rotate: number;
     rotateX: number;
     rotateY: number;

package/ui/styling/style/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/core/ui/styling/style/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/core/ui/styling/style/index.ts"],"names":[],"mappings":"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"}

package/ui/styling/style-properties.d.ts

@@ -14,7 +14,6 @@ export declare const marginLeftProperty: CssProperty<Style, CoreTypes.PercentLen
 export declare const marginRightProperty: CssProperty<Style, CoreTypes.PercentLengthType>;
 export declare const marginTopProperty: CssProperty<Style, CoreTypes.PercentLengthType>;
 export declare const marginBottomProperty: CssProperty<Style, CoreTypes.PercentLengthType>;
-export declare const paddingInternalProperty: CssProperty<Style, string>;
 export declare const paddingLeftProperty: CssProperty<Style, CoreTypes.LengthType>;
 export declare const paddingRightProperty: CssProperty<Style, CoreTypes.LengthType>;
 export declare const paddingTopProperty: CssProperty<Style, CoreTypes.LengthType>;

package/ui/styling/style-properties.js

@@ -243,7 +243,7 @@ export const minWidthProperty = new CssProperty({
     name: 'minWidth',
     cssName: 'min-width',
     defaultValue: CoreTypes.zeroLength,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     equalityComparer: Length.equals,
     valueChanged: (target, oldValue, newValue) => {
         const view = target.viewRef.get();
@@ -261,7 +261,7 @@ export const minHeightProperty = new CssProperty({
     name: 'minHeight',
     cssName: 'min-height',
     defaultValue: CoreTypes.zeroLength,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     equalityComparer: Length.equals,
     valueChanged: (target, oldValue, newValue) => {
         const view = target.viewRef.get();
@@ -283,7 +283,7 @@ export const widthProperty = new CssAnimationProperty({
     // TODO: CSSAnimationProperty was needed for keyframe (copying other impls), but `affectsLayout` does not exist
     //       on the animation property, so fake it here. x_x
     valueChanged: (target, oldValue, newValue) => {
-        if (__APPLE__) {
+        if (global.isIOS) {
             const view = target.viewRef.get();
             if (view) {
                 view.requestLayout();
@@ -301,7 +301,7 @@ export const heightProperty = new CssAnimationProperty({
     // TODO: CSSAnimationProperty was needed for keyframe (copying other impls), but `affectsLayout` does not exist
     //       on the animation property, so fake it here. -_-
     valueChanged: (target, oldValue, newValue) => {
-        if (__APPLE__) {
+        if (global.isIOS) {
             const view = target.viewRef.get();
             if (view) {
                 view.requestLayout();
@@ -327,7 +327,7 @@ export const marginLeftProperty = new CssProperty({
     name: 'marginLeft',
     cssName: 'margin-left',
     defaultValue: CoreTypes.zeroLength,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     equalityComparer: Length.equals,
     valueConverter: PercentLength.parse,
 });
@@ -336,7 +336,7 @@ export const marginRightProperty = new CssProperty({
     name: 'marginRight',
     cssName: 'margin-right',
     defaultValue: CoreTypes.zeroLength,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     equalityComparer: Length.equals,
     valueConverter: PercentLength.parse,
 });
@@ -345,7 +345,7 @@ export const marginTopProperty = new CssProperty({
     name: 'marginTop',
     cssName: 'margin-top',
     defaultValue: CoreTypes.zeroLength,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     equalityComparer: Length.equals,
     valueConverter: PercentLength.parse,
 });
@@ -354,16 +354,11 @@ export const marginBottomProperty = new CssProperty({
     name: 'marginBottom',
     cssName: 'margin-bottom',
     defaultValue: CoreTypes.zeroLength,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     equalityComparer: Length.equals,
     valueConverter: PercentLength.parse,
 });
 marginBottomProperty.register(Style);
-export const paddingInternalProperty = new CssProperty({
-    name: 'paddingInternal',
-    cssName: '_paddingInternal',
-});
-paddingInternalProperty.register(Style);
 const paddingProperty = new ShorthandProperty({
     name: 'padding',
     cssName: 'padding',
@@ -380,13 +375,12 @@ export const paddingLeftProperty = new CssProperty({
     name: 'paddingLeft',
     cssName: 'padding-left',
     defaultValue: CoreTypes.zeroLength,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     equalityComparer: Length.equals,
     valueChanged: (target, oldValue, newValue) => {
         const view = target.viewRef.get();
         if (view) {
-            view.effectivePaddingLeft = paddingLeftProperty.isSet(target) ? Length.toDevicePixels(newValue, 0) : null;
-            target.paddingInternal = view.getEffectivePaddingShorthand();
+            view.effectivePaddingLeft = Length.toDevicePixels(newValue, 0);
         }
         else {
             Trace.write(`${newValue} not set to view's property because ".viewRef" is cleared`, Trace.categories.Style, Trace.messageType.warn);
@@ -399,13 +393,12 @@ export const paddingRightProperty = new CssProperty({
     name: 'paddingRight',
     cssName: 'padding-right',
     defaultValue: CoreTypes.zeroLength,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     equalityComparer: Length.equals,
     valueChanged: (target, oldValue, newValue) => {
         const view = target.viewRef.get();
         if (view) {
-            view.effectivePaddingRight = paddingRightProperty.isSet(target) ? Length.toDevicePixels(newValue, 0) : null;
-            target.paddingInternal = view.getEffectivePaddingShorthand();
+            view.effectivePaddingRight = Length.toDevicePixels(newValue, 0);
         }
         else {
             Trace.write(`${newValue} not set to view's property because ".viewRef" is cleared`, Trace.categories.Style, Trace.messageType.warn);
@@ -418,13 +411,12 @@ export const paddingTopProperty = new CssProperty({
     name: 'paddingTop',
     cssName: 'padding-top',
     defaultValue: CoreTypes.zeroLength,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     equalityComparer: Length.equals,
     valueChanged: (target, oldValue, newValue) => {
         const view = target.viewRef.get();
         if (view) {
-            view.effectivePaddingTop = paddingTopProperty.isSet(target) ? Length.toDevicePixels(newValue, 0) : null;
-            target.paddingInternal = view.getEffectivePaddingShorthand();
+            view.effectivePaddingTop = Length.toDevicePixels(newValue, 0);
         }
         else {
             Trace.write(`${newValue} not set to view's property because ".viewRef" is cleared`, Trace.categories.Style, Trace.messageType.warn);
@@ -437,13 +429,12 @@ export const paddingBottomProperty = new CssProperty({
     name: 'paddingBottom',
     cssName: 'padding-bottom',
     defaultValue: CoreTypes.zeroLength,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     equalityComparer: Length.equals,
     valueChanged: (target, oldValue, newValue) => {
         const view = target.viewRef.get();
         if (view) {
-            view.effectivePaddingBottom = paddingBottomProperty.isSet(target) ? Length.toDevicePixels(newValue, 0) : null;
-            target.paddingInternal = view.getEffectivePaddingShorthand();
+            view.effectivePaddingBottom = Length.toDevicePixels(newValue, 0);
         }
         else {
             Trace.write(`${newValue} not set to view's property because ".viewRef" is cleared`, Trace.categories.Style, Trace.messageType.warn);
@@ -456,7 +447,7 @@ export const horizontalAlignmentProperty = new CssProperty({
     name: 'horizontalAlignment',
     cssName: 'horizontal-align',
     defaultValue: CoreTypes.HorizontalAlignment.stretch,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     valueConverter: CoreTypes.HorizontalAlignment.parse,
 });
 horizontalAlignmentProperty.register(Style);
@@ -464,7 +455,7 @@ export const verticalAlignmentProperty = new CssProperty({
     name: 'verticalAlignment',
     cssName: 'vertical-align',
     defaultValue: CoreTypes.VerticalAlignmentText.stretch,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     valueConverter: CoreTypes.VerticalAlignmentText.parse,
 });
 verticalAlignmentProperty.register(Style);
@@ -739,7 +730,7 @@ export const borderTopWidthProperty = new CssProperty({
     name: 'borderTopWidth',
     cssName: 'border-top-width',
     defaultValue: CoreTypes.zeroLength,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     equalityComparer: Length.equals,
     valueChanged: (target, oldValue, newValue) => {
         const value = Length.toDevicePixels(newValue, 0);
@@ -762,7 +753,7 @@ export const borderRightWidthProperty = new CssProperty({
     name: 'borderRightWidth',
     cssName: 'border-right-width',
     defaultValue: CoreTypes.zeroLength,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     equalityComparer: Length.equals,
     valueChanged: (target, oldValue, newValue) => {
         const value = Length.toDevicePixels(newValue, 0);
@@ -785,7 +776,7 @@ export const borderBottomWidthProperty = new CssProperty({
     name: 'borderBottomWidth',
     cssName: 'border-bottom-width',
     defaultValue: CoreTypes.zeroLength,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     equalityComparer: Length.equals,
     valueChanged: (target, oldValue, newValue) => {
         const value = Length.toDevicePixels(newValue, 0);
@@ -808,7 +799,7 @@ export const borderLeftWidthProperty = new CssProperty({
     name: 'borderLeftWidth',
     cssName: 'border-left-width',
     defaultValue: CoreTypes.zeroLength,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     equalityComparer: Length.equals,
     valueChanged: (target, oldValue, newValue) => {
         const value = Length.toDevicePixels(newValue, 0);
@@ -862,7 +853,7 @@ export const borderTopLeftRadiusProperty = new CssProperty({
     name: 'borderTopLeftRadius',
     cssName: 'border-top-left-radius',
     defaultValue: 0,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     valueChanged: (target, oldValue, newValue) => {
         const value = Length.toDevicePixels(newValue, 0);
         if (!isNonNegativeFiniteNumber(value)) {
@@ -878,7 +869,7 @@ export const borderTopRightRadiusProperty = new CssProperty({
     name: 'borderTopRightRadius',
     cssName: 'border-top-right-radius',
     defaultValue: 0,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     valueChanged: (target, oldValue, newValue) => {
         const value = Length.toDevicePixels(newValue, 0);
         if (!isNonNegativeFiniteNumber(value)) {
@@ -894,7 +885,7 @@ export const borderBottomRightRadiusProperty = new CssProperty({
     name: 'borderBottomRightRadius',
     cssName: 'border-bottom-right-radius',
     defaultValue: 0,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     valueChanged: (target, oldValue, newValue) => {
         const value = Length.toDevicePixels(newValue, 0);
         if (!isNonNegativeFiniteNumber(value)) {
@@ -910,7 +901,7 @@ export const borderBottomLeftRadiusProperty = new CssProperty({
     name: 'borderBottomLeftRadius',
     cssName: 'border-bottom-left-radius',
     defaultValue: 0,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     valueChanged: (target, oldValue, newValue) => {
         const value = Length.toDevicePixels(newValue, 0);
         if (!isNonNegativeFiniteNumber(value)) {
@@ -1020,7 +1011,7 @@ fontInternalProperty.register(Style);
 export const fontFamilyProperty = new InheritedCssProperty({
     name: 'fontFamily',
     cssName: 'font-family',
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     valueChanged: (target, oldValue, newValue) => {
         const currentFont = target.fontInternal || Font.default;
         if (currentFont.fontFamily !== newValue) {
@@ -1040,7 +1031,7 @@ fontScaleInternalProperty.register(Style);
 export const fontSizeProperty = new InheritedCssProperty({
     name: 'fontSize',
     cssName: 'font-size',
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     valueChanged: (target, oldValue, newValue) => {
         if (target.viewRef['handleFontSize'] === true) {
             return;
@@ -1057,7 +1048,7 @@ fontSizeProperty.register(Style);
 export const fontStyleProperty = new InheritedCssProperty({
     name: 'fontStyle',
     cssName: 'font-style',
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     defaultValue: FontStyle.NORMAL,
     valueConverter: FontStyle.parse,
     valueChanged: (target, oldValue, newValue) => {
@@ -1072,7 +1063,7 @@ fontStyleProperty.register(Style);
 export const fontWeightProperty = new InheritedCssProperty({
     name: 'fontWeight',
     cssName: 'font-weight',
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     defaultValue: FontWeight.NORMAL,
     valueConverter: FontWeight.parse,
     valueChanged: (target, oldValue, newValue) => {
@@ -1115,7 +1106,7 @@ fontProperty.register(Style);
 export const fontVariationSettingsProperty = new InheritedCssProperty({
     name: 'fontVariationSettings',
     cssName: 'font-variation-settings',
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     valueChanged: (target, oldValue, newValue) => {
         const currentFont = target.fontInternal || Font.default;
         if (currentFont.fontVariationSettings !== newValue) {
@@ -1132,7 +1123,7 @@ export const visibilityProperty = new CssProperty({
     name: 'visibility',
     cssName: 'visibility',
     defaultValue: CoreTypes.Visibility.visible,
-    affectsLayout: __APPLE__,
+    affectsLayout: global.isIOS,
     valueConverter: CoreTypes.Visibility.parse,
     valueChanged: (target, oldValue, newValue) => {
         const view = target.viewRef.get();