@triniwiz/nativescript-masonkit 1.0.0-beta.105 → 1.0.0-beta.107

package/style.js

@@ -606,26 +606,8 @@ const getUint8 = (view, offset) => {
 const setUint8 = (view, offset, value) => {
     view.setUint8(offset, value);
 };
-const splitBigIntToInt64Parts = (value) => {
-    const MASK64 = (1n << 64n) - 1n;
-    const LOW = value & MASK64;
-    let HIGH = value >> 64n;
-    // Ensure HIGH fits into signed 64-bit range
-    const SIGN_BIT = 1n << 63n;
-    if ((HIGH & SIGN_BIT) !== 0n) {
-        // convert to signed representation
-        HIGH = HIGH - (1n << 64n);
-    }
-    let lowSigned = LOW;
-    if ((LOW & SIGN_BIT) !== 0n) {
-        lowSigned = LOW - (1n << 64n);
-    }
-    return [lowSigned.toString(), HIGH.toString()];
-};
-// Android-only fast path for syncStyle(): splits the 128-bit dirty mask into
-// four signed 32-bit words (plain {N} int marshalling) instead of two 64-bit
-// decimal strings. Recombined via (high32 << 32) | (low32 & 0xffffffff) in
-// Element.syncStyleParts.
+// Splits the 128-bit dirty mask into four signed 32-bit words (plain {N} int
+// marshalling) for Element.syncStyleParts on Android and mason_syncStyleParts on iOS.
 const splitBigIntToInt32Parts = (value) => {
     const MASK64 = (1n << 64n) - 1n;
     const MASK32 = 0xffffffffn;
@@ -1152,6 +1134,21 @@ function queueStyleSync(style) {
         queueMicrotask(flushStyleSyncs);
     }
 }
+let nodeHelperShared;
+export function nodeHelper() {
+    return (nodeHelperShared ?? (nodeHelperShared = org.nativescript.mason.masonkit.NodeHelper.getShared()));
+}
+function androidWritableStyleBuffer(nativeView) {
+    if (typeof nativeView?.getWritableStyleBuffer === 'function') {
+        return nativeView.getWritableStyleBuffer();
+    }
+    let style = nativeView?.getStyle?.();
+    if (!style) {
+        // if a non mason view is passed
+        style = org.nativescript.mason.masonkit.Mason.getShared().styleForViewOrNode(nativeView);
+    }
+    return typeof style.getWritableValue === 'function' ? style.getWritableValue() : style.getValues();
+}
 function windowsStyleValues(nativeView) {
     if (nativeView?.Node)
         return masonEngine().StyleValues(nativeView);
@@ -1189,13 +1186,7 @@ export class Style {
         ret.view_ = view;
         ret.nativeView = nativeView;
         if (__ANDROID__) {
-            let style = nativeView?.getStyle?.();
-            if (!style) {
-                // if a non mason view is passed
-                style = org.nativescript.mason.masonkit.Mason.getShared().styleForViewOrNode(nativeView);
-            }
-            const styleBuffer = typeof style.getWritableValue === 'function' ? style.getWritableValue() : style.getValues();
-            const buffer = ArrayBuffer.from(styleBuffer);
+            const buffer = ArrayBuffer.from(androidWritableStyleBuffer(nativeView));
             ret.style_view = new DataView(buffer);
             ret.i8View = new Int8Array(buffer);
             ret.u8View = new Uint8Array(buffer);
@@ -1494,7 +1485,7 @@ export class Style {
         }
     }
     setBorderColor(value) {
-        if (!(__WINDOWS__ || __ANDROID__) || !this.style_view)
+        if (!(__WINDOWS__ || __ANDROID__ || __APPLE__) || !this.style_view)
             return;
         const c = parseSidesColorShorthand(String(value ?? ''));
         this.writeBorderSide('top', null, null, c.t);
@@ -1535,11 +1526,11 @@ export class Style {
             view.syncStyleParts(lowLow, lowHigh, highLow, highHigh);
         }
         else if (__APPLE__) {
-            const [low, high] = splitBigIntToInt64Parts(this.isDirty);
+            const [lowLow, lowHigh, highLow, highHigh] = splitBigIntToInt32Parts(this.isDirty);
             //@ts-ignore
             const view = this.view?.ios ?? this.view._view;
             // @ts-ignore
-            view.mason_syncStyle(low, high);
+            view.mason_syncStyleParts(lowLow, lowHigh, highLow, highHigh);
         }
         else if (__WINDOWS__) {
             // The Windows elements re-read the whole buffer, so the dirty bits aren't passed.
@@ -1633,14 +1624,7 @@ export class Style {
                 this.u8View = new Uint8Array(buffer);
             }
             if (__ANDROID__) {
-                let style = this.nativeView?.getStyle?.();
-                if (!style) {
-                    // if a non mason view is passed
-                    style = org.nativescript.mason.masonkit.Mason.getShared().styleForViewOrNode(this.nativeView);
-                }
-                style.prepareMut();
-                const styleBuffer = style.getValues();
-                const buffer = ArrayBuffer.from(styleBuffer);
+                const buffer = ArrayBuffer.from(androidWritableStyleBuffer(this.nativeView));
                 this.style_view = new DataView(buffer);
                 this.i8View = new Int8Array(buffer);
                 this.u8View = new Uint8Array(buffer);
@@ -3715,7 +3699,7 @@ export class Style {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridAutoRows(this.nativeView);
+            return nodeHelper().getGridAutoRows(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.gridAutoRows;
@@ -3729,7 +3713,7 @@ export class Style {
         // A bare number can't marshal over JNI into the native String setter.
         value = value == null ? '' : String(value);
         if (__ANDROID__) {
-            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridAutoRows(this.nativeView, value);
+            nodeHelper().setGridAutoRows(this.nativeView, value);
         }
         if (__APPLE__) {
             this.nativeView.style.gridAutoRows = value;
@@ -3743,7 +3727,7 @@ export class Style {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridAutoColumns(this.nativeView);
+            return nodeHelper().getGridAutoColumns(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.gridAutoColumns;
@@ -3757,7 +3741,7 @@ export class Style {
         // See gridAutoRows above.
         value = value == null ? '' : String(value);
         if (__ANDROID__) {
-            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridAutoColumns(this.nativeView, value);
+            nodeHelper().setGridAutoColumns(this.nativeView, value);
         }
         if (__APPLE__) {
             this.nativeView.style.gridAutoColumns = value;
@@ -3805,7 +3789,7 @@ export class Style {
         // See gridAutoRows above.
         value = value == null ? '' : String(value);
         if (__ANDROID__) {
-            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridColumn(this.nativeView, value);
+            nodeHelper().setGridColumn(this.nativeView, value);
         }
         if (__APPLE__) {
             this.nativeView.style.gridColumn = value;
@@ -3819,7 +3803,7 @@ export class Style {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridColumn(this.nativeView);
+            return nodeHelper().getGridColumn(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.gridColumn;
@@ -3831,7 +3815,7 @@ export class Style {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridColumnStart(this.nativeView);
+            return nodeHelper().getGridColumnStart(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.gridColumnStart;
@@ -3845,7 +3829,7 @@ export class Style {
         // See gridAutoRows above.
         value = value == null ? '' : String(value);
         if (__ANDROID__) {
-            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridColumnStart(this.nativeView, value);
+            nodeHelper().setGridColumnStart(this.nativeView, value);
         }
         if (__APPLE__) {
             this.nativeView.style.gridColumnStart = value;
@@ -3859,7 +3843,7 @@ export class Style {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridColumnEnd(this.nativeView);
+            return nodeHelper().getGridColumnEnd(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.gridColumnEnd;
@@ -3873,7 +3857,7 @@ export class Style {
         // See gridAutoRows above.
         value = value == null ? '' : String(value);
         if (__ANDROID__) {
-            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridColumnEnd(this.nativeView, value);
+            nodeHelper().setGridColumnEnd(this.nativeView, value);
         }
         if (__APPLE__) {
             this.nativeView.style.gridColumnEnd = value;
@@ -3889,7 +3873,7 @@ export class Style {
         // See gridAutoRows above.
         value = value == null ? '' : String(value);
         if (__ANDROID__) {
-            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridRow(this.nativeView, value);
+            nodeHelper().setGridRow(this.nativeView, value);
         }
         if (__APPLE__) {
             this.nativeView.style.gridRow = value;
@@ -3903,7 +3887,7 @@ export class Style {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridRow(this.nativeView);
+            return nodeHelper().getGridRow(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.gridRow;
@@ -3915,7 +3899,7 @@ export class Style {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridRowStart(this.nativeView);
+            return nodeHelper().getGridRowStart(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.gridRowStart;
@@ -3929,7 +3913,7 @@ export class Style {
         // See gridAutoRows above.
         value = value == null ? '' : String(value);
         if (__ANDROID__) {
-            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridRowStart(this.nativeView, value);
+            nodeHelper().setGridRowStart(this.nativeView, value);
         }
         if (__APPLE__) {
             this.nativeView.style.gridRowStart = value;
@@ -3943,7 +3927,7 @@ export class Style {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridRowEnd(this.nativeView);
+            return nodeHelper().getGridRowEnd(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.gridRowEnd;
@@ -3957,7 +3941,7 @@ export class Style {
         // See gridAutoRows above.
         value = value == null ? '' : String(value);
         if (__ANDROID__) {
-            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridRowEnd(this.nativeView, value);
+            nodeHelper().setGridRowEnd(this.nativeView, value);
         }
         if (__APPLE__) {
             this.nativeView.style.gridRowEnd = value;
@@ -3973,7 +3957,7 @@ export class Style {
         // See gridAutoRows above.
         value = value == null ? '' : String(value);
         if (__ANDROID__) {
-            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridArea(this.nativeView, value);
+            nodeHelper().setGridArea(this.nativeView, value);
         }
         if (__APPLE__) {
             this.nativeView.style.gridArea = value;
@@ -3987,7 +3971,7 @@ export class Style {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridArea(this.nativeView);
+            return nodeHelper().getGridArea(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.gridArea;
@@ -4001,7 +3985,7 @@ export class Style {
         // null clears the template; also guards against a bare number (see gridAutoRows above).
         value = value == null ? '' : String(value);
         if (__ANDROID__) {
-            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridTemplateRows(this.nativeView, value);
+            nodeHelper().setGridTemplateRows(this.nativeView, value);
         }
         if (__APPLE__) {
             this.nativeView.style.gridTemplateRows = value;
@@ -4015,7 +3999,7 @@ export class Style {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridTemplateRows(this.nativeView);
+            return nodeHelper().getGridTemplateRows(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.gridTemplateRows;
@@ -4027,7 +4011,7 @@ export class Style {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridTemplateColumns(this.nativeView);
+            return nodeHelper().getGridTemplateColumns(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.gridTemplateColumns;
@@ -4041,7 +4025,7 @@ export class Style {
         // null clears the template; also guards against a bare number (see gridAutoRows above).
         value = value == null ? '' : String(value);
         if (__ANDROID__) {
-            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridTemplateColumns(this.nativeView, value);
+            nodeHelper().setGridTemplateColumns(this.nativeView, value);
         }
         if (__APPLE__) {
             this.nativeView.style.gridTemplateColumns = value;
@@ -4055,7 +4039,7 @@ export class Style {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridTemplateAreas(this.nativeView);
+            return nodeHelper().getGridTemplateAreas(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.gridTemplateAreas;
@@ -4069,7 +4053,7 @@ export class Style {
         // null clears it; also guards against a bare number (see gridAutoRows above).
         value = value == null ? '' : String(value);
         if (__ANDROID__) {
-            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridTemplateAreas(this.nativeView, value);
+            nodeHelper().setGridTemplateAreas(this.nativeView, value);
         }
         if (__APPLE__) {
             this.nativeView.style.gridTemplateAreas = value;
@@ -4241,7 +4225,8 @@ export class Style {
             // length — TYPE 0 means "multiply by the resolved font size".
             const unitless = /^-?[\d.]+$/.test(t);
             this.prepareMut();
-            setFloat32(this.style_view, StyleKeys.LINE_HEIGHT, unitless ? finite(parseFloat(t) || 0) : tokenToDevicePx(t, parseFloat(t) || 0));
+            // An absolute line-height is stored in CSS px (iOS points, Android dip), as the number path.
+            setFloat32(this.style_view, StyleKeys.LINE_HEIGHT, unitless ? finite(parseFloat(t) || 0) : layout.toDeviceIndependentPixels(tokenToDevicePx(t, parseFloat(t) || 0)));
             setUint8(this.style_view, StyleKeys.LINE_HEIGHT_STATE, 1);
             setUint8(this.style_view, StyleKeys.LINE_HEIGHT_TYPE, unitless ? 0 : 1);
             this.commitState(StateKeys.LINE_HEIGHT);
@@ -4259,14 +4244,14 @@ export class Style {
             switch (value.unit) {
                 case 'dip':
                     this.prepareMut();
-                    setFloat32(this.style_view, StyleKeys.LINE_HEIGHT, layout.toDevicePixels(value.value));
+                    setFloat32(this.style_view, StyleKeys.LINE_HEIGHT, value.value);
                     setUint8(this.style_view, StyleKeys.LINE_HEIGHT_STATE, 1);
                     setUint8(this.style_view, StyleKeys.LINE_HEIGHT_TYPE, 1);
                     this.commitState(StateKeys.LINE_HEIGHT);
                     break;
                 case 'px':
                     this.prepareMut();
-                    setFloat32(this.style_view, StyleKeys.LINE_HEIGHT, layout.toDevicePixels(value.value));
+                    setFloat32(this.style_view, StyleKeys.LINE_HEIGHT, layout.toDeviceIndependentPixels(value.value));
                     setUint8(this.style_view, StyleKeys.LINE_HEIGHT_STATE, 1);
                     setUint8(this.style_view, StyleKeys.LINE_HEIGHT_TYPE, 1);
                     this.commitState(StateKeys.LINE_HEIGHT);
@@ -4421,7 +4406,7 @@ export class Style {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getBackground(this.nativeView);
+            return nodeHelper().getBackground(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.background;
@@ -4430,14 +4415,14 @@ export class Style {
     }
     set background(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('background', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBackground(this.nativeView, value), () => (this.nativeView.style.background = value));
+        this.setPseudoCssStringValue('background', value, () => nodeHelper().setBackground(this.nativeView, value), () => (this.nativeView.style.background = value));
     }
     get backgroundImage() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getBackgroundImage(this.nativeView);
+            return nodeHelper().getBackgroundImage(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.backgroundImage;
@@ -4446,14 +4431,14 @@ export class Style {
     }
     set backgroundImage(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('background-image', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBackgroundImage(this.nativeView, value), () => (this.nativeView.style.backgroundImage = value));
+        this.setPseudoCssStringValue('background-image', value, () => nodeHelper().setBackgroundImage(this.nativeView, value), () => (this.nativeView.style.backgroundImage = value));
     }
     get backgroundRepeat() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getBackgroundRepeat(this.nativeView);
+            return nodeHelper().getBackgroundRepeat(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.backgroundRepeat;
@@ -4462,14 +4447,14 @@ export class Style {
     }
     set backgroundRepeat(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('background-repeat', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBackgroundRepeat(this.nativeView, value), () => (this.nativeView.style.backgroundRepeat = value));
+        this.setPseudoCssStringValue('background-repeat', value, () => nodeHelper().setBackgroundRepeat(this.nativeView, value), () => (this.nativeView.style.backgroundRepeat = value));
     }
     get backgroundPosition() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getBackgroundPosition(this.nativeView);
+            return nodeHelper().getBackgroundPosition(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.backgroundPosition;
@@ -4478,14 +4463,14 @@ export class Style {
     }
     set backgroundPosition(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('background-position', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBackgroundPosition(this.nativeView, value), () => (this.nativeView.style.backgroundPosition = value));
+        this.setPseudoCssStringValue('background-position', value, () => nodeHelper().setBackgroundPosition(this.nativeView, value), () => (this.nativeView.style.backgroundPosition = value));
     }
     get backgroundSize() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getBackgroundSize(this.nativeView);
+            return nodeHelper().getBackgroundSize(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.backgroundSize;
@@ -4494,14 +4479,14 @@ export class Style {
     }
     set backgroundSize(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('background-size', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBackgroundSize(this.nativeView, value), () => (this.nativeView.style.backgroundSize = value));
+        this.setPseudoCssStringValue('background-size', value, () => nodeHelper().setBackgroundSize(this.nativeView, value), () => (this.nativeView.style.backgroundSize = value));
     }
     get backgroundClip() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getBackgroundClip(this.nativeView);
+            return nodeHelper().getBackgroundClip(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.backgroundClip;
@@ -4510,14 +4495,14 @@ export class Style {
     }
     set backgroundClip(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('background-clip', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBackgroundClip(this.nativeView, value), () => (this.nativeView.style.backgroundClip = value));
+        this.setPseudoCssStringValue('background-clip', value, () => nodeHelper().setBackgroundClip(this.nativeView, value), () => (this.nativeView.style.backgroundClip = value));
     }
     get backgroundPositionX() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getBackgroundPositionX(this.nativeView);
+            return nodeHelper().getBackgroundPositionX(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.backgroundPositionX;
@@ -4526,14 +4511,14 @@ export class Style {
     }
     set backgroundPositionX(value) {
         value = cssInitialIfReset(this.coerceCssStringValue(value), '0%');
-        this.setPseudoCssStringValue('background-position-x', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBackgroundPositionX(this.nativeView, value), () => (this.nativeView.style.backgroundPositionX = value));
+        this.setPseudoCssStringValue('background-position-x', value, () => nodeHelper().setBackgroundPositionX(this.nativeView, value), () => (this.nativeView.style.backgroundPositionX = value));
     }
     get backgroundPositionY() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getBackgroundPositionY(this.nativeView);
+            return nodeHelper().getBackgroundPositionY(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.backgroundPositionY;
@@ -4542,14 +4527,14 @@ export class Style {
     }
     set backgroundPositionY(value) {
         value = cssInitialIfReset(this.coerceCssStringValue(value), '0%');
-        this.setPseudoCssStringValue('background-position-y', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBackgroundPositionY(this.nativeView, value), () => (this.nativeView.style.backgroundPositionY = value));
+        this.setPseudoCssStringValue('background-position-y', value, () => nodeHelper().setBackgroundPositionY(this.nativeView, value), () => (this.nativeView.style.backgroundPositionY = value));
     }
     get backgroundOrigin() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getBackgroundOrigin(this.nativeView);
+            return nodeHelper().getBackgroundOrigin(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.backgroundOrigin;
@@ -4558,14 +4543,14 @@ export class Style {
     }
     set backgroundOrigin(value) {
         value = cssInitialIfReset(this.coerceCssStringValue(value), 'padding-box');
-        this.setPseudoCssStringValue('background-origin', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBackgroundOrigin(this.nativeView, value), () => (this.nativeView.style.backgroundOrigin = value));
+        this.setPseudoCssStringValue('background-origin', value, () => nodeHelper().setBackgroundOrigin(this.nativeView, value), () => (this.nativeView.style.backgroundOrigin = value));
     }
     get backgroundAttachment() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getBackgroundAttachment(this.nativeView);
+            return nodeHelper().getBackgroundAttachment(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.backgroundAttachment;
@@ -4574,14 +4559,14 @@ export class Style {
     }
     set backgroundAttachment(value) {
         value = cssInitialIfReset(this.coerceCssStringValue(value), 'scroll');
-        this.setPseudoCssStringValue('background-attachment', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBackgroundAttachment(this.nativeView, value), () => (this.nativeView.style.backgroundAttachment = value));
+        this.setPseudoCssStringValue('background-attachment', value, () => nodeHelper().setBackgroundAttachment(this.nativeView, value), () => (this.nativeView.style.backgroundAttachment = value));
     }
     get backgroundBlendMode() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getBackgroundBlendMode(this.nativeView);
+            return nodeHelper().getBackgroundBlendMode(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.backgroundBlendMode;
@@ -4590,17 +4575,27 @@ export class Style {
     }
     set backgroundBlendMode(value) {
         value = cssInitialIfReset(this.coerceCssStringValue(value), 'normal');
-        this.setPseudoCssStringValue('background-blend-mode', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBackgroundBlendMode(this.nativeView, value), () => (this.nativeView.style.backgroundBlendMode = value));
+        this.setPseudoCssStringValue('background-blend-mode', value, () => nodeHelper().setBackgroundBlendMode(this.nativeView, value), () => (this.nativeView.style.backgroundBlendMode = value));
+    }
+    hasBorderRadius() {
+        const view = this.style_view;
+        if (!view)
+            return true;
+        for (const [, keys] of RADIUS_KEYS) {
+            if (getFloat32(view, keys.xValue) !== 0 || getFloat32(view, keys.yValue) !== 0)
+                return true;
+        }
+        return false;
     }
     get borderRadius() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return this._borderRadiusCss ?? org.nativescript.mason.masonkit.NodeHelper.getShared().getBorderRadius(this.nativeView);
+            return this._borderRadiusCss ?? nodeHelper().getBorderRadius(this.nativeView);
         }
         if (__APPLE__) {
-            return this.nativeView.style.borderRadius;
+            return this._borderRadiusCss ?? this.nativeView.style.borderRadius;
         }
         if (__WINDOWS__ && this.style_view) {
             // Read back so a single corner longhand keeps the other three instead of resetting them to 0.
@@ -4613,12 +4608,29 @@ export class Style {
     }
     set borderRadius(value) {
         value = this.coerceCssStringValue(value);
-        if (__ANDROID__ && this.nativeView && !this._pseudo && this._writeBorderRadius(value, deviceScale())) {
+        if ((__ANDROID__ || __APPLE__) && this.nativeView && !this._pseudo && this._writeBorderRadius(value, deviceScale())) {
             return;
         }
         if (!this._pseudo)
             this._borderRadiusCss = undefined;
-        this.setPseudoCssStringValue('border-radius', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBorderRadius(this.nativeView, value), () => (this.nativeView.style.borderRadius = value));
+        this.setPseudoCssStringValue('border-radius', value, () => nodeHelper().setBorderRadius(this.nativeView, value), () => (this.nativeView.style.borderRadius = value));
+    }
+    _writeCornerRadius(corner, radius, shorthand, scale = deviceScale()) {
+        if (!this.nativeView || this._pseudo || !this.style_view)
+            return false;
+        const h = fastRadiusTokens(radius[0], scale);
+        const v = radius[1] === radius[0] ? h : fastRadiusTokens(radius[1], scale);
+        if (!h || h.length !== 1 || !v || v.length !== 1)
+            return false;
+        this._borderRadiusCss = shorthand;
+        this.prepareMut();
+        const keys = RADIUS_KEYS[corner][1];
+        setUint8(this.style_view, keys.xType, h[0].type);
+        setFloat32(this.style_view, keys.xValue, h[0].value);
+        setUint8(this.style_view, keys.yType, v[0].type);
+        setFloat32(this.style_view, keys.yValue, v[0].value);
+        this.commitState(StateKeys.BORDER_RADIUS);
+        return true;
     }
     _writeBorderRadius(value, scale) {
         let cleaned = value.trim();
@@ -4709,7 +4721,7 @@ export class Style {
         if (!this.nativeView)
             return '';
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getFontFamily(this.nativeView);
+            return nodeHelper().getFontFamily(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.fontFamily;
@@ -4720,18 +4732,18 @@ export class Style {
     // style-buffer field, so it can't be written through the shared buffer.
     set fontFamily(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('font-family', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setFontFamily(this.nativeView, value), () => (this.nativeView.style.fontFamily = value));
+        this.setPseudoCssStringValue('font-family', value, () => nodeHelper().setFontFamily(this.nativeView, value), () => (this.nativeView.style.fontFamily = value));
     }
     set textDecoration(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('text-decoration', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setTextDecoration(this.nativeView, value), () => this.nativeView.style.setTextDecoration(value));
+        this.setPseudoCssStringValue('text-decoration', value, () => nodeHelper().setTextDecoration(this.nativeView, value), () => this.nativeView.style.setTextDecoration(value));
     }
     get textDecorationLine() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getTextDecorationLine(this.nativeView);
+            return nodeHelper().getTextDecorationLine(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.textDecorationLine;
@@ -4743,14 +4755,14 @@ export class Style {
     }
     set textDecorationLine(value) {
         value = cssInitialIfReset(this.coerceCssStringValue(value), 'none');
-        this.setPseudoCssStringValue('text-decoration-line', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setTextDecorationLine(this.nativeView, value), () => (this.nativeView.style.textDecorationLine = value));
+        this.setPseudoCssStringValue('text-decoration-line', value, () => nodeHelper().setTextDecorationLine(this.nativeView, value), () => (this.nativeView.style.textDecorationLine = value));
     }
     get textDecorationStyle() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getTextDecorationStyle(this.nativeView);
+            return nodeHelper().getTextDecorationStyle(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.textDecorationStyle;
@@ -4762,14 +4774,14 @@ export class Style {
     }
     set textDecorationStyle(value) {
         value = cssInitialIfReset(this.coerceCssStringValue(value), 'solid');
-        this.setPseudoCssStringValue('text-decoration-style', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setTextDecorationStyle(this.nativeView, value), () => (this.nativeView.style.textDecorationStyle = value));
+        this.setPseudoCssStringValue('text-decoration-style', value, () => nodeHelper().setTextDecorationStyle(this.nativeView, value), () => (this.nativeView.style.textDecorationStyle = value));
     }
     get textDecorationColor() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getTextDecorationColor(this.nativeView);
+            return nodeHelper().getTextDecorationColor(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.textDecorationColor;
@@ -4782,14 +4794,14 @@ export class Style {
     }
     set textDecorationColor(value) {
         value = cssInitialIfReset(this.coerceCssStringValue(value), 'currentcolor');
-        this.setPseudoCssStringValue('text-decoration-color', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setTextDecorationColor(this.nativeView, value), () => (this.nativeView.style.textDecorationColor = value));
+        this.setPseudoCssStringValue('text-decoration-color', value, () => nodeHelper().setTextDecorationColor(this.nativeView, value), () => (this.nativeView.style.textDecorationColor = value));
     }
     get border() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getBorder(this.nativeView);
+            return nodeHelper().getBorder(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.border;
@@ -4798,13 +4810,13 @@ export class Style {
     }
     set border(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('border', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBorder(this.nativeView, value), () => (this.nativeView.style.border = value));
+        this.setPseudoCssStringValue('border', value, () => nodeHelper().setBorder(this.nativeView, value), () => (this.nativeView.style.border = value));
     }
     get paddingCss() {
         if (!this.nativeView)
             return '';
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getPaddingCssValue(this.nativeView);
+            return nodeHelper().getPaddingCssValue(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.paddingCss;
@@ -4815,13 +4827,13 @@ export class Style {
         // a bare number is dip, matching other numeric setters; Android's
         // native parser treats "px" as unscaled device pixels, "dip" as scaled
         const strValue = typeof value === 'number' ? `${value}dip` : value;
-        this.setPseudoCssStringValue('padding', strValue, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setPaddingCss(this.nativeView, strValue), () => (this.nativeView.style.paddingCss = strValue));
+        this.setPseudoCssStringValue('padding', strValue, () => nodeHelper().setPaddingCss(this.nativeView, strValue), () => (this.nativeView.style.paddingCss = strValue));
     }
     get marginCss() {
         if (!this.nativeView)
             return '';
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getMarginCssValue(this.nativeView);
+            return nodeHelper().getMarginCssValue(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.marginCss;
@@ -4831,13 +4843,13 @@ export class Style {
     set marginCss(value) {
         // See the comment on `paddingCss` above — same dip-vs-px mislabeling fix.
         const strValue = typeof value === 'number' ? `${value}dip` : value;
-        this.setPseudoCssStringValue('margin', strValue, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setMarginCss(this.nativeView, strValue), () => (this.nativeView.style.marginCss = strValue));
+        this.setPseudoCssStringValue('margin', strValue, () => nodeHelper().setMarginCss(this.nativeView, strValue), () => (this.nativeView.style.marginCss = strValue));
     }
     get insetCss() {
         if (!this.nativeView)
             return '';
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getInsetCssValue(this.nativeView);
+            return nodeHelper().getInsetCssValue(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.insetCss;
@@ -4847,42 +4859,42 @@ export class Style {
     set insetCss(value) {
         // See the comment on `paddingCss` above — same dip-vs-px mislabeling fix.
         const strValue = typeof value === 'number' ? `${value}dip` : value;
-        this.setPseudoCssStringValue('inset', strValue, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setInsetCss(this.nativeView, strValue), () => (this.nativeView.style.insetCss = strValue));
+        this.setPseudoCssStringValue('inset', strValue, () => nodeHelper().setInsetCss(this.nativeView, strValue), () => (this.nativeView.style.insetCss = strValue));
     }
     get borderLeft() {
         return '';
     }
     set borderLeft(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('border-left', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBorderLeft(this.nativeView, value), () => (this.nativeView.style.borderLeft = value));
+        this.setPseudoCssStringValue('border-left', value, () => nodeHelper().setBorderLeft(this.nativeView, value), () => (this.nativeView.style.borderLeft = value));
     }
     get borderTop() {
         return '';
     }
     set borderTop(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('border-top', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBorderTop(this.nativeView, value), () => (this.nativeView.style.borderTop = value));
+        this.setPseudoCssStringValue('border-top', value, () => nodeHelper().setBorderTop(this.nativeView, value), () => (this.nativeView.style.borderTop = value));
     }
     get borderRight() {
         return '';
     }
     set borderRight(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('border-right', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBorderRight(this.nativeView, value), () => (this.nativeView.style.borderRight = value));
+        this.setPseudoCssStringValue('border-right', value, () => nodeHelper().setBorderRight(this.nativeView, value), () => (this.nativeView.style.borderRight = value));
     }
     get borderBottom() {
         return '';
     }
     set borderBottom(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('border-bottom', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBorderBottom(this.nativeView, value), () => (this.nativeView.style.borderBottom = value));
+        this.setPseudoCssStringValue('border-bottom', value, () => nodeHelper().setBorderBottom(this.nativeView, value), () => (this.nativeView.style.borderBottom = value));
     }
     get filter() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getFilter(this.nativeView);
+            return nodeHelper().getFilter(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.filter;
@@ -4891,14 +4903,14 @@ export class Style {
     }
     set filter(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('filter', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setFilter(this.nativeView, value), () => (this.nativeView.style.filter = value));
+        this.setPseudoCssStringValue('filter', value, () => nodeHelper().setFilter(this.nativeView, value), () => (this.nativeView.style.filter = value));
     }
     get boxShadow() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getBoxShadow(this.nativeView);
+            return nodeHelper().getBoxShadow(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.boxShadow;
@@ -4913,14 +4925,14 @@ export class Style {
     }
     set boxShadow(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('box-shadow', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBoxShadow(this.nativeView, value), () => (this.nativeView.style.boxShadow = value));
+        this.setPseudoCssStringValue('box-shadow', value, () => nodeHelper().setBoxShadow(this.nativeView, value), () => (this.nativeView.style.boxShadow = value));
     }
     get transform() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getTransform(this.nativeView);
+            return nodeHelper().getTransform(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.transform;
@@ -4929,7 +4941,7 @@ export class Style {
     }
     set transform(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('transform', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setTransform(this.nativeView, value), () => (this.nativeView.style.transform = value));
+        this.setPseudoCssStringValue('transform', value, () => nodeHelper().setTransform(this.nativeView, value), () => (this.nativeView.style.transform = value));
     }
     get verticalAlign() {
         const isPercent = getUint8(this.style_view, StyleKeys.VERTICAL_ALIGN_IS_PERCENT_OFFSET) == 1;
@@ -5084,7 +5096,7 @@ export class Style {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getTextShadow(this.nativeView);
+            return nodeHelper().getTextShadow(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.textShadow;
@@ -5093,7 +5105,7 @@ export class Style {
     }
     set textShadow(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('text-shadow', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setTextShadow(this.nativeView, value), () => (this.nativeView.style.textShadow = value));
+        this.setPseudoCssStringValue('text-shadow', value, () => nodeHelper().setTextShadow(this.nativeView, value), () => (this.nativeView.style.textShadow = value));
     }
     get zIndex() {
         return getInt32(this.style_view, StyleKeys.Z_INDEX);
@@ -5175,14 +5187,14 @@ export class Style {
     }
     set cornerShape(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('corner-shape', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setCornerShape(this.nativeView, value), () => (this.nativeView.style.cornerShape = value));
+        this.setPseudoCssStringValue('corner-shape', value, () => nodeHelper().setCornerShape(this.nativeView, value), () => (this.nativeView.style.cornerShape = value));
     }
     get cornerShape() {
         if (!this.nativeView) {
             return '';
         }
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getCornerShape(this.nativeView);
+            return nodeHelper().getCornerShape(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.cornerShape;
@@ -5193,7 +5205,7 @@ export class Style {
         if (!this.nativeView)
             return '';
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getCornerShapeTopLeft(this.nativeView);
+            return nodeHelper().getCornerShapeTopLeft(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.cornerShapeTopLeft;
@@ -5202,13 +5214,13 @@ export class Style {
     }
     set cornerShapeTopLeft(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('corner-shape-top-left', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setCornerShapeTopLeft(this.nativeView, value), () => (this.nativeView.style.cornerShapeTopLeft = value));
+        this.setPseudoCssStringValue('corner-shape-top-left', value, () => nodeHelper().setCornerShapeTopLeft(this.nativeView, value), () => (this.nativeView.style.cornerShapeTopLeft = value));
     }
     get cornerShapeTopRight() {
         if (!this.nativeView)
             return '';
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getCornerShapeTopRight(this.nativeView);
+            return nodeHelper().getCornerShapeTopRight(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.cornerShapeTopRight;
@@ -5217,13 +5229,13 @@ export class Style {
     }
     set cornerShapeTopRight(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('corner-shape-top-right', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setCornerShapeTopRight(this.nativeView, value), () => (this.nativeView.style.cornerShapeTopRight = value));
+        this.setPseudoCssStringValue('corner-shape-top-right', value, () => nodeHelper().setCornerShapeTopRight(this.nativeView, value), () => (this.nativeView.style.cornerShapeTopRight = value));
     }
     get cornerShapeBottomRight() {
         if (!this.nativeView)
             return '';
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getCornerShapeBottomRight(this.nativeView);
+            return nodeHelper().getCornerShapeBottomRight(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.cornerShapeBottomRight;
@@ -5232,13 +5244,13 @@ export class Style {
     }
     set cornerShapeBottomRight(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('corner-shape-bottom-right', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setCornerShapeBottomRight(this.nativeView, value), () => (this.nativeView.style.cornerShapeBottomRight = value));
+        this.setPseudoCssStringValue('corner-shape-bottom-right', value, () => nodeHelper().setCornerShapeBottomRight(this.nativeView, value), () => (this.nativeView.style.cornerShapeBottomRight = value));
     }
     get cornerShapeBottomLeft() {
         if (!this.nativeView)
             return '';
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getCornerShapeBottomLeft(this.nativeView);
+            return nodeHelper().getCornerShapeBottomLeft(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.cornerShapeBottomLeft;
@@ -5247,7 +5259,7 @@ export class Style {
     }
     set cornerShapeBottomLeft(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('corner-shape-bottom-left', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setCornerShapeBottomLeft(this.nativeView, value), () => (this.nativeView.style.cornerShapeBottomLeft = value));
+        this.setPseudoCssStringValue('corner-shape-bottom-left', value, () => nodeHelper().setCornerShapeBottomLeft(this.nativeView, value), () => (this.nativeView.style.cornerShapeBottomLeft = value));
     }
     get objectPosition() {
         if (!this.style_view)
@@ -5386,7 +5398,7 @@ export class Style {
         if (!this.nativeView)
             return '';
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getBorderImage(this.nativeView);
+            return nodeHelper().getBorderImage(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.borderImage;
@@ -5395,7 +5407,7 @@ export class Style {
     }
     set borderImage(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('border-image', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBorderImage(this.nativeView, value), () => (this.nativeView.style.borderImage = value));
+        this.setPseudoCssStringValue('border-image', value, () => nodeHelper().setBorderImage(this.nativeView, value), () => (this.nativeView.style.borderImage = value));
     }
     set 'border-image'(value) {
         this.borderImage = value;
@@ -5433,7 +5445,7 @@ export class Style {
         if (!this.nativeView)
             return 'normal';
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getFontFeatureSettings(this.nativeView);
+            return nodeHelper().getFontFeatureSettings(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.fontFeatureSettings;
@@ -5442,7 +5454,7 @@ export class Style {
     }
     set fontFeatureSettings(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('font-feature-settings', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setFontFeatureSettings(this.nativeView, value), () => (this.nativeView.style.fontFeatureSettings = value));
+        this.setPseudoCssStringValue('font-feature-settings', value, () => nodeHelper().setFontFeatureSettings(this.nativeView, value), () => (this.nativeView.style.fontFeatureSettings = value));
     }
     set 'font-feature-settings'(value) {
         this.fontFeatureSettings = value;
@@ -5539,7 +5551,7 @@ export class Style {
         if (!this.nativeView)
             return '';
         if (__ANDROID__) {
-            return org.nativescript.mason.masonkit.NodeHelper.getShared().getBackdropFilter(this.nativeView);
+            return nodeHelper().getBackdropFilter(this.nativeView);
         }
         if (__APPLE__) {
             return this.nativeView.style.backdropFilter;
@@ -5548,7 +5560,7 @@ export class Style {
     }
     set backdropFilter(value) {
         value = this.coerceCssStringValue(value);
-        this.setPseudoCssStringValue('backdrop-filter', value, () => org.nativescript.mason.masonkit.NodeHelper.getShared().setBackdropFilter(this.nativeView, value), () => (this.nativeView.style.backdropFilter = value));
+        this.setPseudoCssStringValue('backdrop-filter', value, () => nodeHelper().setBackdropFilter(this.nativeView, value), () => (this.nativeView.style.backdropFilter = value));
     }
     set 'backdrop-filter'(value) {
         this.backdropFilter = value;