npm - @triniwiz/nativescript-masonkit - Versions diffs - 1.0.0-alpha.4 → 1.0.0-alpha.6 - Mend

@triniwiz/nativescript-masonkit 1.0.0-alpha.4 → 1.0.0-alpha.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (345) hide show

package/helpers.js CHANGED Viewed

@@ -1,9 +1,11 @@
-import { Length, Utils } from '@nativescript/core';
-export let JSIEnabled = false;
+import { Length, Utils, isIOS } from '@nativescript/core';
+import { parseUnit } from '@nativescript/core/css/parser';
+export let UseV8Module = false;
 if (global.isAndroid) {
     try {
+        java.lang.System.loadLibrary('masonnative');
         __non_webpack_require__('system_lib://libmasonnativev8.so');
-        // JSIEnabled = true;
+        UseV8Module = true;
     }
     catch (error) {
         console.warn('Failed to enable on FastAPI');
@@ -11,12 +13,11 @@ if (global.isAndroid) {
 }
 if (global.isIOS) {
     TSCMason.alwaysEnable = true;
-    if (!JSIEnabled) {
+    if (!UseV8Module) {
         try {
-            //@ts-ignore
-            const module = new global.JSIModule();
-            // module.install()
-            // JSIEnabled = true;
+            const installer = global.MasonV8ModuleInstaller.new();
+            installer.install();
+            UseV8Module = true;
         }
         catch (error) {
             console.warn('Failed to enable on FastAPI');
@@ -35,8 +36,8 @@ export function _forceStyleUpdate(instance) {
     if (!instance._hasNativeView) {
         return;
     }
-    if (JSIEnabled) {
-        global.__Mason_updateNodeAndStyle(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr);
+    if (UseV8Module) {
+        MasonV8Module.updateNodeAndStyle(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr);
     }
     else {
         if (global.isAndroid) {
@@ -52,8 +53,8 @@ export function _markDirty(instance) {
     if (!instance._hasNativeView) {
         return;
     }
-    if (JSIEnabled) {
-        global.__Mason_markDirty(instance._masonPtr, instance._masonNodePtr);
+    if (UseV8Module) {
+        MasonV8Module.markDirty(instance._masonPtr, instance._masonNodePtr);
     }
     else {
         if (global.isAndroid) {
@@ -74,8 +75,8 @@ export function _isDirty(instance) {
     if (!instance._hasNativeView) {
         return;
     }
-    if (JSIEnabled) {
-        return global.__Mason_isDirty(instance._masonPtr, instance._masonNodePtr);
+    if (UseV8Module) {
+        return MasonV8Module.isDirty(instance._masonPtr, instance._masonNodePtr);
     }
     else {
         if (global.isAndroid) {
@@ -179,7 +180,14 @@ export function _toMasonDimension(value) {
     if (value === 'auto') {
         return { value: 0, type: 'auto', native_type: 0 /* MasonDimensionCompatType.Auto */ };
     }
-    const typeOf = typeof value;
+    let typeOf = typeof value;
+    if (typeOf === 'number') {
+        return { value: Utils.layout.toDevicePixels(value), type: 'points', native_type: 1 /* MasonDimensionCompatType.Points */ };
+    }
+    if (typeOf === 'string') {
+        value = parseUnit(value).value;
+        typeOf = 'object';
+    }
     if (typeOf === 'object') {
         switch (value?.unit) {
             case '%':
@@ -190,9 +198,6 @@ export function _toMasonDimension(value) {
                 return { value: Utils.layout.toDevicePixels(value.value), type: 'points', native_type: 1 /* MasonDimensionCompatType.Points */ };
         }
     }
-    if (typeOf === 'number') {
-        return { value: Utils.layout.toDevicePixels(value), type: 'points', native_type: 1 /* MasonDimensionCompatType.Points */ };
-    }
     return { value: value, type: 'points', native_type: 1 /* MasonDimensionCompatType.Points */ };
 }
 export function _intoMasonDimension(value) {
@@ -295,7 +300,7 @@ export function _setDisplay(value, instance, initial = false) {
         return;
     }
     if (instance._hasNativeView) {
-        if (JSIEnabled) {
+        if (UseV8Module) {
             let nativeValue = -1;
             switch (value) {
                 case 'none':
@@ -307,9 +312,12 @@ export function _setDisplay(value, instance, initial = false) {
                 case 'grid':
                     nativeValue = 2 /* Display.Grid */;
                     break;
+                case 'block':
+                    nativeValue = 3 /* Display.Block */;
+                    break;
             }
             if (nativeValue !== -1) {
-                global.__Mason_setDisplay(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
+                MasonV8Module.setDisplay(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
             }
         }
         else {
@@ -322,11 +330,14 @@ export function _setDisplay(value, instance, initial = false) {
                     case 'grid':
                         nativeValue = org.nativescript.mason.masonkit.Display.Grid;
                         break;
+                    case 'block':
+                        nativeValue = org.nativescript.mason.masonkit.Display.Block;
+                        break;
                     case 'none':
                         nativeValue = org.nativescript.mason.masonkit.Display.None;
                         break;
                 }
-                if (nativeValue) {
+                if (!Utils.isNullOrUndefined(nativeValue)) {
                     const nodeOrView = getMasonInstance(instance);
                     if (instance._isMasonChild) {
                         org.nativescript.mason.masonkit.NodeHelper.INSTANCE.setDisplay(nodeOrView, nativeValue);
@@ -345,6 +356,9 @@ export function _setDisplay(value, instance, initial = false) {
                     case 'grid':
                         nativeValue = 2 /* Display.Grid */;
                         break;
+                    case 'block':
+                        nativeValue = 3 /* Display.Block */;
+                        break;
                     case 'none':
                         nativeValue = 0 /* Display.None */;
                         break;
@@ -360,8 +374,8 @@ export function _getDisplay(instance) {
     if (!instance._hasNativeView) {
         return instance.style.display;
     }
-    if (JSIEnabled) {
-        const value = global.__Mason_getDisplay(instance._masonStylePtr);
+    if (UseV8Module) {
+        const value = MasonV8Module.getDisplay(instance._masonStylePtr);
         switch (value) {
             case 0:
                 return 'none';
@@ -369,6 +383,8 @@ export function _getDisplay(instance) {
                 return 'flex';
             case 2:
                 return 'grid';
+            case 3:
+                return 'block';
         }
     }
     else {
@@ -388,6 +404,8 @@ export function _getDisplay(instance) {
                     return 'flex';
                 case org.nativescript.mason.masonkit.Display.Grid:
                     return 'grid';
+                case org.nativescript.mason.masonkit.Display.Block:
+                    return 'block';
             }
         }
         if (global.isIOS) {
@@ -398,6 +416,8 @@ export function _getDisplay(instance) {
                     return 'flex';
                 case 2 /* Display.Grid */:
                     return 'grid';
+                case 3 /* Display.Block */:
+                    return 'block';
             }
         }
     }
@@ -408,8 +428,8 @@ export function _setMinWidth(value, instance, initial = false) {
         return;
     }
     const val = _toMasonDimension(value);
-    if (JSIEnabled) {
-        global.__Mason_setMinWidth(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setMinWidth(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -430,8 +450,8 @@ export function _getMinWidth(instance) {
     if (!instance._hasNativeView) {
         return instance.style.minWidth;
     }
-    if (JSIEnabled) {
-        return global.__Mason_getMinWidth(instance._masonStylePtr);
+    if (UseV8Module) {
+        return MasonV8Module.getMinWidth(instance._masonStylePtr);
     }
     else {
         if (global.isAndroid) {
@@ -455,8 +475,8 @@ export function _setMinHeight(value, instance, initial = false) {
         return;
     }
     const val = _toMasonDimension(value);
-    if (JSIEnabled) {
-        global.__Mason_setMinHeight(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setMinHeight(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -477,8 +497,8 @@ export function _getMinHeight(instance) {
     if (!instance._hasNativeView) {
         return instance.style.minHeight;
     }
-    if (JSIEnabled) {
-        return global.__Mason_getMinHeight(instance._masonStylePtr);
+    if (UseV8Module) {
+        return MasonV8Module.getMinHeight(instance._masonStylePtr);
     }
     else {
         if (global.isAndroid) {
@@ -502,8 +522,8 @@ export function _setWidth(value, instance, initial = false) {
         return;
     }
     const val = _toMasonDimension(value);
-    if (JSIEnabled) {
-        global.__Mason_setWidth(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setWidth(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -524,8 +544,8 @@ export function _getWidth(instance) {
     if (!instance._hasNativeView) {
         return instance.style.width;
     }
-    if (JSIEnabled) {
-        return global.__Mason_getWidth(instance._masonStylePtr);
+    if (UseV8Module) {
+        return MasonV8Module.getWidth(instance._masonStylePtr);
     }
     else {
         if (global.isAndroid) {
@@ -549,8 +569,8 @@ export function _setHeight(value, instance, initial = false) {
         return;
     }
     const val = _toMasonDimension(value);
-    if (JSIEnabled) {
-        global.__Mason_setHeight(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setHeight(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -571,8 +591,8 @@ export function _getHeight(instance) {
     if (!instance._hasNativeView) {
         return instance.style.height;
     }
-    if (JSIEnabled) {
-        return global.__Mason_getHeight(instance._masonStylePtr);
+    if (UseV8Module) {
+        return MasonV8Module.getHeight(instance._masonStylePtr);
     }
     else {
         if (global.isAndroid) {
@@ -596,8 +616,8 @@ export function _setMaxWidth(value, instance, initial = false) {
         return;
     }
     const val = _toMasonDimension(value);
-    if (JSIEnabled) {
-        global.__Mason_setMaxWidth(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setMaxWidth(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -618,8 +638,8 @@ export function _getMaxWidth(instance) {
     if (!instance._hasNativeView) {
         return instance.style.maxWidth;
     }
-    if (JSIEnabled) {
-        return global.__Mason_getMaxWidth(instance._masonStylePtr);
+    if (UseV8Module) {
+        return MasonV8Module.getMaxWidth(instance._masonStylePtr);
     }
     else {
         if (global.isAndroid) {
@@ -643,8 +663,8 @@ export function _setMaxHeight(value, instance, initial = false) {
         return;
     }
     const val = _toMasonDimension(value);
-    if (JSIEnabled) {
-        global.__Mason_setMaxHeight(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setMaxHeight(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -665,8 +685,8 @@ export function _getMaxHeight(instance) {
     if (!instance._hasNativeView) {
         return instance.style.maxHeight;
     }
-    if (JSIEnabled) {
-        return global.__Mason_getMaxHeight(instance._masonStylePtr);
+    if (UseV8Module) {
+        return MasonV8Module.getMaxHeight(instance._masonStylePtr);
     }
     else {
         if (global.isAndroid) {
@@ -693,7 +713,7 @@ export function _setFlexDirection(value, instance, initial = false) {
         let nativeValue = null;
         switch (value) {
             case 'column':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 1 /* FlexDirection.Column */;
                 }
                 else {
@@ -706,7 +726,7 @@ export function _setFlexDirection(value, instance, initial = false) {
                 }
                 break;
             case 'row':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 0 /* FlexDirection.Row */;
                 }
                 else {
@@ -719,7 +739,7 @@ export function _setFlexDirection(value, instance, initial = false) {
                 }
                 break;
             case 'column-reverse':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 3 /* FlexDirection.ColumnReverse */;
                 }
                 else {
@@ -732,7 +752,7 @@ export function _setFlexDirection(value, instance, initial = false) {
                 }
                 break;
             case 'row-reverse':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 2 /* FlexDirection.RowReverse */;
                 }
                 else {
@@ -745,9 +765,9 @@ export function _setFlexDirection(value, instance, initial = false) {
                 }
                 break;
         }
-        if (nativeValue) {
-            if (JSIEnabled) {
-                global.__Mason_setFlexDirection(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
+        if (!Utils.isNullOrUndefined(nativeValue)) {
+            if (UseV8Module) {
+                MasonV8Module.setFlexDirection(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
             }
             else {
                 if (global.isAndroid) {
@@ -768,8 +788,8 @@ export function _setFlexDirection(value, instance, initial = false) {
 }
 export function _getFlexDirection(instance) {
     if (instance._hasNativeView) {
-        if (JSIEnabled) {
-            const value = global.__Mason_getFlexDirection(instance._masonStylePtr);
+        if (UseV8Module) {
+            const value = MasonV8Module.getFlexDirection(instance._masonStylePtr);
             switch (value) {
                 case 0 /* FlexDirection.Row */:
                     return 'row';
@@ -823,8 +843,8 @@ export function _getPosition(instance) {
     if (!instance._hasNativeView) {
         return instance.style.position;
     }
-    if (JSIEnabled) {
-        const value = global.__Mason_getPosition(instance._masonStylePtr);
+    if (UseV8Module) {
+        const value = MasonV8Module.getPosition(instance._masonStylePtr);
         switch (value) {
             case 0:
                 return 'relative';
@@ -850,7 +870,7 @@ export function _getPosition(instance) {
             }
         }
         if (global.isIOS) {
-            switch (instance.ios.position) {
+            switch (instance.ios._position) {
                 case 1 /* Position.Absolute */:
                     return 'absolute';
                 case 0 /* Position.Relative */:
@@ -867,25 +887,35 @@ export function _setPosition(value, instance, initial = false) {
         let nativeValue = null;
         switch (value) {
             case 'absolute':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 1 /* PositionType.Absolute */;
                 }
                 else {
-                    nativeValue = org.nativescript.mason.masonkit.Position.Absolute;
+                    if (global.isAndroid) {
+                        nativeValue = org.nativescript.mason.masonkit.Position.Absolute;
+                    }
+                    else {
+                        nativeValue = 1;
+                    }
                 }
                 break;
             case 'relative':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 0 /* PositionType.Relative */;
                 }
                 else {
-                    nativeValue = org.nativescript.mason.masonkit.Position.Relative;
+                    if (global.isAndroid) {
+                        nativeValue = org.nativescript.mason.masonkit.Position.Relative;
+                    }
+                    else {
+                        nativeValue = 0;
+                    }
                 }
                 break;
         }
-        if (nativeValue) {
-            if (JSIEnabled) {
-                global.__Mason_setPosition(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
+        if (!Utils.isNullOrUndefined(nativeValue)) {
+            if (UseV8Module) {
+                MasonV8Module.setPosition(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
             }
             else {
                 if (global.isAndroid) {
@@ -898,7 +928,7 @@ export function _setPosition(value, instance, initial = false) {
                     }
                 }
                 if (global.isIOS) {
-                    instance.ios.position = nativeValue;
+                    instance.ios._position = nativeValue;
                 }
             }
         }
@@ -912,7 +942,7 @@ export function _setFlexWrap(value, instance, initial = false) {
         let nativeValue = null;
         switch (value) {
             case 'no-wrap':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 0 /* FlexWrap.NoWrap */;
                 }
                 else {
@@ -925,7 +955,7 @@ export function _setFlexWrap(value, instance, initial = false) {
                 }
                 break;
             case 'wrap':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 1 /* FlexWrap.Wrap */;
                 }
                 else {
@@ -938,7 +968,7 @@ export function _setFlexWrap(value, instance, initial = false) {
                 }
                 break;
             case 'wrap-reverse':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 2 /* FlexWrap.WrapReverse */;
                 }
                 else {
@@ -951,9 +981,9 @@ export function _setFlexWrap(value, instance, initial = false) {
                 }
                 break;
         }
-        if (nativeValue) {
-            if (JSIEnabled) {
-                global.__Mason_setFlexWrap(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
+        if (!Utils.isNullOrUndefined(nativeValue)) {
+            if (UseV8Module) {
+                MasonV8Module.setFlexWrap(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
             }
             else {
                 if (global.isAndroid) {
@@ -974,8 +1004,8 @@ export function _setFlexWrap(value, instance, initial = false) {
 }
 export function _getFlexWrap(instance) {
     if (instance._hasNativeView) {
-        if (JSIEnabled) {
-            const value = global.__Mason_getFlexWrap(instance._masonStylePtr);
+        if (UseV8Module) {
+            const value = MasonV8Module.getFlexWrap(instance._masonStylePtr);
             switch (value) {
                 case 0:
                     return 'no-wrap';
@@ -1027,7 +1057,7 @@ export function _setAlignItems(value, instance, initial = false) {
         let nativeValue = null;
         switch (value) {
             case 'normal':
-                if (JSIEnabled || global.isIOS) {
+                if (UseV8Module || global.isIOS) {
                     nativeValue = -1 /* AlignItems.Normal */;
                 }
                 else {
@@ -1035,7 +1065,7 @@ export function _setAlignItems(value, instance, initial = false) {
                 }
                 break;
             case 'baseline':
-                if (JSIEnabled || global.isIOS) {
+                if (UseV8Module || global.isIOS) {
                     nativeValue = 3 /* AlignItems.Baseline */;
                 }
                 else {
@@ -1043,7 +1073,7 @@ export function _setAlignItems(value, instance, initial = false) {
                 }
                 break;
             case 'center':
-                if (JSIEnabled || global.isIOS) {
+                if (UseV8Module || global.isIOS) {
                     nativeValue = 2 /* AlignItems.Center */;
                 }
                 else {
@@ -1051,8 +1081,15 @@ export function _setAlignItems(value, instance, initial = false) {
                 }
                 break;
             case 'flex-end':
+                if (UseV8Module || global.isIOS) {
+                    nativeValue = 6 /* AlignItems.FlexEnd */;
+                }
+                else {
+                    nativeValue = org.nativescript.mason.masonkit.AlignItems.FlexEnd;
+                }
+                break;
             case 'end':
-                if (JSIEnabled || global.isIOS) {
+                if (UseV8Module || global.isIOS) {
                     nativeValue = 1 /* AlignItems.End */;
                 }
                 else {
@@ -1060,8 +1097,15 @@ export function _setAlignItems(value, instance, initial = false) {
                 }
                 break;
             case 'flex-start':
+                if (UseV8Module || global.isIOS) {
+                    nativeValue = 5 /* AlignItems.FlexStart */;
+                }
+                else {
+                    nativeValue = org.nativescript.mason.masonkit.AlignItems.FlexStart;
+                }
+                break;
             case 'start':
-                if (JSIEnabled || global.isIOS) {
+                if (UseV8Module || global.isIOS) {
                     nativeValue = 0 /* AlignItems.Start */;
                 }
                 else {
@@ -1069,7 +1113,7 @@ export function _setAlignItems(value, instance, initial = false) {
                 }
                 break;
             case 'stretch':
-                if (JSIEnabled || global.isIOS) {
+                if (UseV8Module || global.isIOS) {
                     nativeValue = 4 /* AlignItems.Stretch */;
                 }
                 else {
@@ -1077,9 +1121,9 @@ export function _setAlignItems(value, instance, initial = false) {
                 }
                 break;
         }
-        if (nativeValue) {
-            if (JSIEnabled) {
-                global.__Mason_setAlignItems(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
+        if (!Utils.isNullOrUndefined(nativeValue)) {
+            if (UseV8Module) {
+                MasonV8Module.setAlignItems(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
             }
             else {
                 if (global.isAndroid) {
@@ -1100,8 +1144,8 @@ export function _setAlignItems(value, instance, initial = false) {
 }
 export function _getAlignItems(instance) {
     if (instance._hasNativeView) {
-        if (JSIEnabled) {
-            const value = global.__Mason_getAlignItems(instance._masonStylePtr);
+        if (UseV8Module) {
+            const value = MasonV8Module.getAlignItems(instance._masonStylePtr);
             switch (value) {
                 case -1 /* AlignItems.Normal */:
                     return 'normal';
@@ -1171,7 +1215,7 @@ export function _setAlignSelf(value, instance, initial = false) {
         let nativeValue = null;
         switch (value) {
             case 'normal':
-                if (JSIEnabled || global.isIOS) {
+                if (UseV8Module || global.isIOS) {
                     nativeValue = -1 /* AlignSelf.Normal */;
                 }
                 else {
@@ -1179,7 +1223,7 @@ export function _setAlignSelf(value, instance, initial = false) {
                 }
                 break;
             case 'baseline':
-                if (JSIEnabled || global.isIOS) {
+                if (UseV8Module || global.isIOS) {
                     nativeValue = 3 /* AlignSelf.Baseline */;
                 }
                 else {
@@ -1187,7 +1231,7 @@ export function _setAlignSelf(value, instance, initial = false) {
                 }
                 break;
             case 'center':
-                if (JSIEnabled || global.isIOS) {
+                if (UseV8Module || global.isIOS) {
                     nativeValue = 2 /* AlignSelf.Center */;
                 }
                 else {
@@ -1195,8 +1239,15 @@ export function _setAlignSelf(value, instance, initial = false) {
                 }
                 break;
             case 'flex-end':
+                if (UseV8Module || global.isIOS) {
+                    nativeValue = 6 /* AlignSelf.FlexEnd */;
+                }
+                else {
+                    nativeValue = org.nativescript.mason.masonkit.AlignSelf.FlexEnd;
+                }
+                break;
             case 'end':
-                if (JSIEnabled || global.isIOS) {
+                if (UseV8Module || global.isIOS) {
                     nativeValue = 1 /* AlignSelf.End */;
                 }
                 else {
@@ -1204,8 +1255,15 @@ export function _setAlignSelf(value, instance, initial = false) {
                 }
                 break;
             case 'flex-start':
+                if (UseV8Module || global.isIOS) {
+                    nativeValue = 5 /* AlignSelf.FlexStart */;
+                }
+                else {
+                    nativeValue = org.nativescript.mason.masonkit.AlignSelf.FlexStart;
+                }
+                break;
             case 'start':
-                if (JSIEnabled || global.isIOS) {
+                if (UseV8Module || global.isIOS) {
                     nativeValue = 0 /* AlignSelf.Start */;
                 }
                 else {
@@ -1213,7 +1271,7 @@ export function _setAlignSelf(value, instance, initial = false) {
                 }
                 break;
             case 'stretch':
-                if (JSIEnabled || global.isIOS) {
+                if (UseV8Module || global.isIOS) {
                     nativeValue = 4 /* AlignSelf.Stretch */;
                 }
                 else {
@@ -1221,9 +1279,9 @@ export function _setAlignSelf(value, instance, initial = false) {
                 }
                 break;
         }
-        if (nativeValue) {
-            if (JSIEnabled) {
-                global.__Mason_setAlignSelf(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
+        if (!Utils.isNullOrUndefined(nativeValue)) {
+            if (UseV8Module) {
+                MasonV8Module.setAlignSelf(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
             }
             else {
                 if (global.isAndroid) {
@@ -1244,8 +1302,8 @@ export function _setAlignSelf(value, instance, initial = false) {
 }
 export function _getAlignSelf(instance) {
     if (instance._hasNativeView) {
-        if (JSIEnabled) {
-            const value = global.__Mason_getAlignSelf(instance._masonStylePtr);
+        if (UseV8Module) {
+            const value = MasonV8Module.getAlignSelf(instance._masonStylePtr);
             switch (value) {
                 case -1 /* AlignSelf.Normal */:
                     return 'normal';
@@ -1315,7 +1373,7 @@ export function _setAlignContent(value, instance, initial = false) {
         let nativeValue = null;
         switch (value) {
             case 'normal':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = -1 /* AlignContent.Normal */;
                 }
                 else {
@@ -1328,7 +1386,7 @@ export function _setAlignContent(value, instance, initial = false) {
                 }
                 break;
             case 'space-around':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 5 /* AlignContent.SpaceAround */;
                 }
                 else {
@@ -1341,7 +1399,7 @@ export function _setAlignContent(value, instance, initial = false) {
                 }
                 break;
             case 'space-between':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 4 /* AlignContent.SpaceBetween */;
                 }
                 else {
@@ -1354,7 +1412,7 @@ export function _setAlignContent(value, instance, initial = false) {
                 }
                 break;
             case 'space-evenly':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 6 /* AlignContent.SpaceEvenly */;
                 }
                 else {
@@ -1367,7 +1425,7 @@ export function _setAlignContent(value, instance, initial = false) {
                 }
                 break;
             case 'center':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 2 /* AlignContent.Center */;
                 }
                 else {
@@ -1380,8 +1438,20 @@ export function _setAlignContent(value, instance, initial = false) {
                 }
                 break;
             case 'flex-end':
+                if (UseV8Module) {
+                    nativeValue = 8 /* AlignContent.FlexEnd */;
+                }
+                else {
+                    if (global.isAndroid) {
+                        nativeValue = org.nativescript.mason.masonkit.AlignContent.FlexEnd;
+                    }
+                    if (global.isIOS) {
+                        nativeValue = 8 /* AlignContent.FlexEnd */;
+                    }
+                }
+                break;
             case 'end':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 1 /* AlignContent.End */;
                 }
                 else {
@@ -1394,8 +1464,20 @@ export function _setAlignContent(value, instance, initial = false) {
                 }
                 break;
             case 'flex-start':
+                if (UseV8Module) {
+                    nativeValue = 7 /* AlignContent.FlexStart */;
+                }
+                else {
+                    if (global.isAndroid) {
+                        nativeValue = org.nativescript.mason.masonkit.AlignContent.FlexStart;
+                    }
+                    if (global.isIOS) {
+                        nativeValue = 7 /* AlignContent.FlexStart */;
+                    }
+                }
+                break;
             case 'start':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 0 /* AlignContent.Start */;
                 }
                 else {
@@ -1408,7 +1490,7 @@ export function _setAlignContent(value, instance, initial = false) {
                 }
                 break;
             case 'stretch':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 3 /* AlignContent.Stretch */;
                 }
                 else {
@@ -1421,9 +1503,9 @@ export function _setAlignContent(value, instance, initial = false) {
                 }
                 break;
         }
-        if (nativeValue) {
-            if (JSIEnabled) {
-                global.__Mason_setAlignContent(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
+        if (!Utils.isNullOrUndefined(nativeValue)) {
+            if (UseV8Module) {
+                MasonV8Module.setAlignContent(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
             }
             else {
                 if (global.isAndroid) {
@@ -1444,8 +1526,8 @@ export function _setAlignContent(value, instance, initial = false) {
 }
 export function _getAlignContent(instance) {
     if (instance._hasNativeView) {
-        if (JSIEnabled) {
-            const value = global.__Mason_getAlignContent(instance._masonStylePtr);
+        if (UseV8Module) {
+            const value = MasonV8Module.getAlignContent(instance._masonStylePtr);
             switch (value) {
                 case -1 /* AlignContent.Normal */:
                     return 'normal';
@@ -1527,7 +1609,7 @@ export function _setJustifyItems(value, instance, initial = false) {
         let nativeValue = null;
         switch (value) {
             case 'normal':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = -1 /* JustifyItems.Normal */;
                 }
                 else {
@@ -1535,7 +1617,7 @@ export function _setJustifyItems(value, instance, initial = false) {
                 }
                 break;
             case 'baseline':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 3 /* JustifyItems.Baseline */;
                 }
                 else {
@@ -1543,7 +1625,7 @@ export function _setJustifyItems(value, instance, initial = false) {
                 }
                 break;
             case 'center':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 2 /* JustifyItems.Center */;
                 }
                 else {
@@ -1551,8 +1633,15 @@ export function _setJustifyItems(value, instance, initial = false) {
                 }
                 break;
             case 'flex-end':
+                if (UseV8Module) {
+                    nativeValue = 6 /* JustifyItems.FlexEnd */;
+                }
+                else {
+                    nativeValue = org.nativescript.mason.masonkit.JustifyItems.FlexEnd;
+                }
+                break;
             case 'end':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 1 /* JustifyItems.End */;
                 }
                 else {
@@ -1560,8 +1649,15 @@ export function _setJustifyItems(value, instance, initial = false) {
                 }
                 break;
             case 'flex-start':
+                if (UseV8Module) {
+                    nativeValue = 5 /* JustifyItems.FlexStart */;
+                }
+                else {
+                    nativeValue = org.nativescript.mason.masonkit.JustifyItems.FlexStart;
+                }
+                break;
             case 'start':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 0 /* JustifyItems.Start */;
                 }
                 else {
@@ -1569,7 +1665,7 @@ export function _setJustifyItems(value, instance, initial = false) {
                 }
                 break;
             case 'stretch':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 4 /* JustifyItems.Stretch */;
                 }
                 else {
@@ -1577,9 +1673,9 @@ export function _setJustifyItems(value, instance, initial = false) {
                 }
                 break;
         }
-        if (nativeValue) {
-            if (JSIEnabled) {
-                global.__Mason_setJustifyItems(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
+        if (!Utils.isNullOrUndefined(nativeValue)) {
+            if (UseV8Module) {
+                MasonV8Module.setJustifyItems(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
             }
             else {
                 if (global.isAndroid) {
@@ -1600,8 +1696,8 @@ export function _setJustifyItems(value, instance, initial = false) {
 }
 export function _getJustifyItems(instance) {
     if (instance._hasNativeView) {
-        if (JSIEnabled) {
-            const value = global.__Mason_getJustifyItems(instance._masonStylePtr);
+        if (UseV8Module) {
+            const value = MasonV8Module.getJustifyItems(instance._masonStylePtr);
             switch (value) {
                 case -1 /* JustifyItems.Normal */:
                     return 'normal';
@@ -1671,7 +1767,7 @@ export function _setJustifySelf(value, instance, initial = false) {
         let nativeValue = null;
         switch (value) {
             case 'normal':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = -1 /* JustifySelf.Normal */;
                 }
                 else {
@@ -1679,7 +1775,7 @@ export function _setJustifySelf(value, instance, initial = false) {
                 }
                 break;
             case 'baseline':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 3 /* JustifySelf.Baseline */;
                 }
                 else {
@@ -1687,7 +1783,7 @@ export function _setJustifySelf(value, instance, initial = false) {
                 }
                 break;
             case 'center':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 2 /* JustifySelf.Center */;
                 }
                 else {
@@ -1695,8 +1791,15 @@ export function _setJustifySelf(value, instance, initial = false) {
                 }
                 break;
             case 'flex-end':
+                if (UseV8Module) {
+                    nativeValue = 6 /* JustifySelf.FlexEnd */;
+                }
+                else {
+                    nativeValue = org.nativescript.mason.masonkit.JustifySelf.FlexEnd;
+                }
+                break;
             case 'end':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 1 /* JustifySelf.End */;
                 }
                 else {
@@ -1704,8 +1807,15 @@ export function _setJustifySelf(value, instance, initial = false) {
                 }
                 break;
             case 'flex-start':
+                if (UseV8Module) {
+                    nativeValue = 5 /* JustifySelf.FlexStart */;
+                }
+                else {
+                    nativeValue = org.nativescript.mason.masonkit.JustifySelf.FlexStart;
+                }
+                break;
             case 'start':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 0 /* JustifySelf.Start */;
                 }
                 else {
@@ -1713,7 +1823,7 @@ export function _setJustifySelf(value, instance, initial = false) {
                 }
                 break;
             case 'stretch':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 4 /* JustifySelf.Stretch */;
                 }
                 else {
@@ -1721,9 +1831,9 @@ export function _setJustifySelf(value, instance, initial = false) {
                 }
                 break;
         }
-        if (nativeValue) {
-            if (JSIEnabled) {
-                global.__Mason_setJustifySelf(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
+        if (!Utils.isNullOrUndefined(nativeValue)) {
+            if (UseV8Module) {
+                MasonV8Module.setJustifySelf(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
             }
             else {
                 if (global.isAndroid) {
@@ -1744,8 +1854,8 @@ export function _setJustifySelf(value, instance, initial = false) {
 }
 export function _getJustifySelf(instance) {
     if (instance._hasNativeView) {
-        if (JSIEnabled) {
-            const value = global.__Mason_getJustifySelf(instance._masonStylePtr);
+        if (UseV8Module) {
+            const value = MasonV8Module.getJustifySelf(instance._masonStylePtr);
             switch (value) {
                 case -1 /* JustifySelf.Normal */:
                     return 'normal';
@@ -1811,11 +1921,13 @@ export function _setJustifyContent(value, instance, initial = false) {
     if (initial && value === 'normal') {
         return;
     }
+    if (!value)
+        value = 'normal';
     if (instance._hasNativeView) {
         let nativeValue = null;
         switch (value) {
             case 'normal':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = -1 /* JustifyContent.Normal */;
                 }
                 else {
@@ -1828,7 +1940,7 @@ export function _setJustifyContent(value, instance, initial = false) {
                 }
                 break;
             case 'space-around':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 5 /* JustifyContent.SpaceAround */;
                 }
                 else {
@@ -1841,7 +1953,7 @@ export function _setJustifyContent(value, instance, initial = false) {
                 }
                 break;
             case 'space-between':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 4 /* JustifyContent.SpaceBetween */;
                 }
                 else {
@@ -1854,7 +1966,7 @@ export function _setJustifyContent(value, instance, initial = false) {
                 }
                 break;
             case 'space-evenly':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 6 /* JustifyContent.SpaceEvenly */;
                 }
                 else {
@@ -1867,7 +1979,7 @@ export function _setJustifyContent(value, instance, initial = false) {
                 }
                 break;
             case 'center':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 2 /* JustifyContent.Center */;
                 }
                 else {
@@ -1880,8 +1992,20 @@ export function _setJustifyContent(value, instance, initial = false) {
                 }
                 break;
             case 'flex-end':
+                if (UseV8Module) {
+                    nativeValue = 8 /* JustifyContent.FlexEnd */;
+                }
+                else {
+                    if (global.isAndroid) {
+                        nativeValue = org.nativescript.mason.masonkit.JustifyContent.FlexEnd;
+                    }
+                    if (global.isIOS) {
+                        nativeValue = 8 /* JustifyContent.FlexEnd */;
+                    }
+                }
+                break;
             case 'end':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 1 /* JustifyContent.End */;
                 }
                 else {
@@ -1894,8 +2018,20 @@ export function _setJustifyContent(value, instance, initial = false) {
                 }
                 break;
             case 'flex-start':
+                if (UseV8Module) {
+                    nativeValue = 7 /* JustifyContent.FlexStart */;
+                }
+                else {
+                    if (global.isAndroid) {
+                        nativeValue = org.nativescript.mason.masonkit.JustifyContent.FlexStart;
+                    }
+                    if (global.isIOS) {
+                        nativeValue = 7 /* JustifyContent.FlexStart */;
+                    }
+                }
+                break;
             case 'start':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 0 /* JustifyContent.Start */;
                 }
                 else {
@@ -1908,7 +2044,7 @@ export function _setJustifyContent(value, instance, initial = false) {
                 }
                 break;
             case 'stretch':
-                if (JSIEnabled) {
+                if (UseV8Module) {
                     nativeValue = 3 /* JustifyContent.Stretch */;
                 }
                 else {
@@ -1921,31 +2057,29 @@ export function _setJustifyContent(value, instance, initial = false) {
                 }
                 break;
         }
-        if (nativeValue) {
-            if (JSIEnabled) {
-                global.__Mason_setJustifyContent(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
-            }
-            else {
-                if (global.isAndroid) {
-                    const nodeOrView = getMasonInstance(instance);
-                    if (instance._isMasonChild) {
-                        org.nativescript.mason.masonkit.NodeHelper.INSTANCE.setJustifyContent(nodeOrView, nativeValue);
-                    }
-                    else {
-                        nodeOrView.setJustifyContent(nativeValue);
-                    }
+        if (UseV8Module) {
+            MasonV8Module.setJustifyContent(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
+        }
+        else {
+            if (global.isAndroid) {
+                const nodeOrView = getMasonInstance(instance);
+                if (instance._isMasonChild) {
+                    org.nativescript.mason.masonkit.NodeHelper.INSTANCE.setJustifyContent(nodeOrView, nativeValue);
                 }
-                if (global.isIOS) {
-                    instance.ios.justifyContent = nativeValue;
+                else {
+                    nodeOrView.setJustifyContent(nativeValue);
                 }
             }
+            if (global.isIOS) {
+                instance.ios.justifyContent = nativeValue;
+            }
         }
     }
 }
 export function _getJustifyContent(instance) {
     if (instance._hasNativeView) {
-        if (JSIEnabled) {
-            const value = global.__Mason_getJustifyContent(instance._masonStylePtr);
+        if (UseV8Module) {
+            const value = MasonV8Module.getJustifyContent(instance._masonStylePtr);
             switch (value) {
                 case -1 /* JustifyContent.Normal */:
                     return 'normal';
@@ -2022,8 +2156,8 @@ export function _setLeft(value, instance, initial = false) {
         return;
     }
     const val = _toLengthPercentageAuto(value);
-    if (JSIEnabled) {
-        global.__Mason_setInsetLeft(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setInsetLeft(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2045,8 +2179,8 @@ export function _setRight(value, instance, initial = false) {
         return;
     }
     const val = _toLengthPercentageAuto(value);
-    if (JSIEnabled) {
-        global.__Mason_setInsetRight(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setInsetRight(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2068,8 +2202,8 @@ export function _setTop(value, instance, initial = false) {
         return;
     }
     const val = _toLengthPercentageAuto(value);
-    if (JSIEnabled) {
-        global.__Mason_setInsetTop(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setInsetTop(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2091,8 +2225,8 @@ export function _setBottom(value, instance, initial = false) {
         return;
     }
     const val = _toLengthPercentageAuto(value);
-    if (JSIEnabled) {
-        global.__Mason_setInsetBottom(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setInsetBottom(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2114,8 +2248,8 @@ export function _setMarginLeft(value, instance, initial = false) {
         return;
     }
     const val = _toLengthPercentageAuto(value);
-    if (JSIEnabled) {
-        global.__Mason_setMarginLeft(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setMarginLeft(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2137,8 +2271,8 @@ export function _setMarginRight(value, instance, initial = false) {
         return;
     }
     const val = _toLengthPercentageAuto(value);
-    if (JSIEnabled) {
-        global.__Mason_setMarginRight(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setMarginRight(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2160,8 +2294,8 @@ export function _setMarginTop(value, instance, initial = false) {
         return;
     }
     const val = _toLengthPercentageAuto(value);
-    if (JSIEnabled) {
-        global.__Mason_setMarginTop(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setMarginTop(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2183,8 +2317,8 @@ export function _setMarginBottom(value, instance, initial = false) {
         return;
     }
     const val = _toLengthPercentageAuto(value);
-    if (JSIEnabled) {
-        global.__Mason_setMarginBottom(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setMarginBottom(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2206,8 +2340,8 @@ export function _setPaddingLeft(value, instance, initial = false) {
         return;
     }
     const val = _toLengthPercentage(value);
-    if (JSIEnabled) {
-        global.__Mason_setPaddingLeft(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setPaddingLeft(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2229,8 +2363,8 @@ export function _setPaddingRight(value, instance, initial = false) {
         return;
     }
     const val = _toLengthPercentage(value);
-    if (JSIEnabled) {
-        global.__Mason_setPaddingRight(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setPaddingRight(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2252,8 +2386,8 @@ export function _setPaddingTop(value, instance, initial = false) {
         return;
     }
     const val = _toLengthPercentage(value);
-    if (JSIEnabled) {
-        global.__Mason_setPaddingTop(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setPaddingTop(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2275,8 +2409,8 @@ export function _setPaddingBottom(value, instance, initial = false) {
         return;
     }
     const val = _toLengthPercentage(value);
-    if (JSIEnabled) {
-        global.__Mason_setPaddingBottom(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setPaddingBottom(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2298,8 +2432,8 @@ export function _setBorderLeft(value, instance, initial = false) {
         return;
     }
     const val = _toLengthPercentage(value);
-    if (JSIEnabled) {
-        global.__Mason_setBorderLeft(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setBorderLeft(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2321,8 +2455,8 @@ export function _setBorderRight(value, instance, initial = false) {
         return;
     }
     const val = _toLengthPercentage(value);
-    if (JSIEnabled) {
-        global.__Mason_setBorderRight(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setBorderRight(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2344,8 +2478,8 @@ export function _setBorderTop(value, instance, initial = false) {
         return;
     }
     const val = _toLengthPercentage(value);
-    if (JSIEnabled) {
-        global.__Mason_setBorderTop(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setBorderTop(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2367,8 +2501,8 @@ export function _setBorderBottom(value, instance, initial = false) {
         return;
     }
     const val = _toLengthPercentage(value);
-    if (JSIEnabled) {
-        global.__Mason_setBorderBottom(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setBorderBottom(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2389,9 +2523,9 @@ export function _setFlexBasis(value, instance, initial = false) {
     if (!instance._hasNativeView) {
         return;
     }
-    if (JSIEnabled) {
+    if (UseV8Module) {
         const val = _toMasonDimension(value);
-        global.__Mason_setFlexBasis(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+        MasonV8Module.setFlexBasis(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2413,8 +2547,8 @@ export function _getFlexBasis(instance) {
     if (!instance._hasNativeView) {
         return instance.style.flexBasis;
     }
-    if (JSIEnabled) {
-        return global.__Mason_getFlexBasis(instance._masonStylePtr);
+    if (UseV8Module) {
+        return MasonV8Module.getFlexBasis(instance._masonStylePtr);
     }
     else {
         if (global.isAndroid) {
@@ -2440,8 +2574,8 @@ export function _setGap(value, instance, initial = false) {
     }
     const width = _toLengthPercentage(value.width);
     const height = _toLengthPercentage(value.height);
-    if (JSIEnabled) {
-        global.__Mason_setGap(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, width.value, width.native_type, height.value, height.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setGap(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, width.value, width.native_type, height.value, height.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2462,8 +2596,8 @@ export function _getGap(instance) {
     if (!instance._hasNativeView) {
         return instance.style.gap;
     }
-    if (JSIEnabled) {
-        return global.__Mason_getGap(instance._masonStylePtr);
+    if (UseV8Module) {
+        return MasonV8Module.getGap(instance._masonStylePtr);
     }
     else {
         if (global.isAndroid) {
@@ -2487,12 +2621,255 @@ export function _getGap(instance) {
         }
     }
 }
+function toOverflowValue(value) {
+    let nativeValue = 0;
+    switch (value) {
+        case 0:
+            nativeValue = 0 /* Overflow.Visible */;
+            break;
+        case 1:
+            nativeValue = 1 /* Overflow.Hidden */;
+            break;
+        case 2:
+            nativeValue = 2 /* Overflow.Scroll */;
+            break;
+        default:
+            nativeValue = 0 /* Overflow.Visible */;
+    }
+    return nativeValue;
+}
+function toOverflowJSValue(value) {
+    if (__IOS__) {
+        switch (value) {
+            case 0 /* Overflow.Visible */:
+                return 'visible';
+            case 1 /* Overflow.Hidden */:
+                return 'hidden';
+            case 2 /* Overflow.Scroll */:
+                return 'scroll';
+            default:
+                return 'visible';
+        }
+    }
+    switch (value) {
+        case org.nativescript.mason.masonkit.Overflow.Visible:
+            return 'visible';
+        case org.nativescript.mason.masonkit.Overflow.Hidden:
+            return 'hidden';
+        case org.nativescript.mason.masonkit.Overflow.Scroll:
+            return 'scroll';
+        default:
+            return 'visible';
+    }
+}
+function toOverflowJavaValue(value) {
+    let nativeValue = org.nativescript.mason.masonkit.Overflow.Visible;
+    switch (value) {
+        case 0:
+            nativeValue = org.nativescript.mason.masonkit.Overflow.Visible;
+            break;
+        case 1:
+            nativeValue = org.nativescript.mason.masonkit.Overflow.Hidden;
+            break;
+        case 2:
+            nativeValue = org.nativescript.mason.masonkit.Overflow.Scroll;
+            break;
+        default:
+            nativeValue = org.nativescript.mason.masonkit.Overflow.Visible;
+    }
+    return nativeValue;
+}
+export function _setOverflow(value, instance) {
+    if (!instance._hasNativeView) {
+        return;
+    }
+    if (UseV8Module) {
+        const nativeValue = toOverflowValue(value);
+        MasonV8Module.setOverflow(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
+    }
+    else {
+        if (global.isAndroid) {
+            const nodeOrView = getMasonInstance(instance);
+            if (instance._isMasonChild) {
+                org.nativescript.mason.masonkit.NodeHelper.INSTANCE.setOverflow(nodeOrView, toOverflowJavaValue(value));
+            }
+            else {
+                nodeOrView.setOverflow(toOverflowJavaValue(value));
+            }
+        }
+        if (global.isIOS) {
+            const nativeValue = toOverflowValue(value);
+            instance.ios.overflow = nativeValue;
+        }
+    }
+}
+export function _getOverflow(instance) {
+    if (!instance._hasNativeView) {
+        return instance.style.flexGrow;
+    }
+    if (UseV8Module) {
+        return MasonV8Module.getOverflow(instance._masonStylePtr);
+    }
+    else {
+        if (global.isAndroid) {
+            const nodeOrView = getMasonInstance(instance);
+            if (instance._isMasonChild) {
+                return toOverflowJSValue(org.nativescript.mason.masonkit.NodeHelper.INSTANCE.getOverflow(nodeOrView));
+            }
+            else {
+                return toOverflowJSValue(nodeOrView.getOverflow());
+            }
+        }
+        if (global.isIOS) {
+            return toOverflowJSValue(instance.ios.overflow);
+        }
+    }
+}
+export function _setOverflowX(value, instance) {
+    if (!instance._hasNativeView) {
+        return;
+    }
+    if (UseV8Module) {
+        const nativeValue = toOverflowValue(value);
+        MasonV8Module.setOverflowX(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
+    }
+    else {
+        if (global.isAndroid) {
+            const nodeOrView = getMasonInstance(instance);
+            if (instance._isMasonChild) {
+                org.nativescript.mason.masonkit.NodeHelper.INSTANCE.setOverflowX(nodeOrView, toOverflowJavaValue(value));
+            }
+            else {
+                nodeOrView.setOverflowX(toOverflowJavaValue(value));
+            }
+        }
+        if (global.isIOS) {
+            const nativeValue = toOverflowValue(value);
+            // TODO
+            instance.ios.overflowX = nativeValue;
+        }
+    }
+}
+export function _getOverflowX(instance) {
+    if (!instance._hasNativeView) {
+        return instance.style.flexGrow;
+    }
+    if (UseV8Module) {
+        return MasonV8Module.getOverflowX(instance._masonStylePtr);
+    }
+    else {
+        if (global.isAndroid) {
+            const nodeOrView = getMasonInstance(instance);
+            if (instance._isMasonChild) {
+                return toOverflowJSValue(org.nativescript.mason.masonkit.NodeHelper.INSTANCE.getOverflowX(nodeOrView));
+            }
+            else {
+                return toOverflowJSValue(nodeOrView.getOverflowX());
+            }
+        }
+        if (global.isIOS) {
+            return toOverflowJSValue(instance.ios.overflowX);
+        }
+    }
+}
+export function _setOverflowY(value, instance, initial = false) {
+    if (!instance._hasNativeView) {
+        return;
+    }
+    if (UseV8Module) {
+        const nativeValue = toOverflowValue(value);
+        MasonV8Module.setOverflowY(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
+    }
+    else {
+        if (global.isAndroid) {
+            const nodeOrView = getMasonInstance(instance);
+            if (instance._isMasonChild) {
+                org.nativescript.mason.masonkit.NodeHelper.INSTANCE.setOverflowY(nodeOrView, toOverflowJavaValue(value));
+            }
+            else {
+                nodeOrView.setOverflowY(toOverflowJavaValue(value));
+            }
+        }
+        if (global.isIOS) {
+            const nativeValue = toOverflowValue(value);
+            // TODO
+            instance.ios.overflowY = nativeValue;
+        }
+    }
+}
+export function _getOverflowY(instance) {
+    if (!instance._hasNativeView) {
+        return instance.style.flexGrow;
+    }
+    if (UseV8Module) {
+        return MasonV8Module.getOverflowY(instance._masonStylePtr);
+    }
+    else {
+        if (global.isAndroid) {
+            const nodeOrView = getMasonInstance(instance);
+            if (instance._isMasonChild) {
+                return toOverflowJSValue(org.nativescript.mason.masonkit.NodeHelper.INSTANCE.getOverflowY(nodeOrView));
+            }
+            else {
+                return toOverflowJSValue(nodeOrView.getOverflowY());
+            }
+        }
+        if (global.isIOS) {
+            return toOverflowJSValue(instance.ios.overflowY);
+        }
+    }
+}
+export function _setScrollbarWidth(value, instance, initial = false) {
+    if (!instance._hasNativeView) {
+        return;
+    }
+    value = _toMasonDimension(value).value;
+    if (UseV8Module) {
+        MasonV8Module.setScrollbarWidth(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, value, !instance._inBatch);
+    }
+    else {
+        if (global.isAndroid) {
+            const nodeOrView = getMasonInstance(instance);
+            if (instance._isMasonChild) {
+                return org.nativescript.mason.masonkit.NodeHelper.INSTANCE.setScrollBarWidth(nodeOrView, value);
+            }
+            else {
+                return nodeOrView.setScrollBarWidth(value);
+            }
+        }
+        if (global.isIOS) {
+            instance.ios.scrollBarWidthCompat = MasonDimensionCompat.alloc().initWithPoints(value);
+        }
+    }
+}
+export function getScrollbarWidth(instance) {
+    if (!instance._hasNativeView) {
+        return instance.style.flexGrow;
+    }
+    if (UseV8Module) {
+        return MasonV8Module.getScrollbarWidth(instance._masonStylePtr);
+    }
+    else {
+        if (global.isAndroid) {
+            const nodeOrView = getMasonInstance(instance);
+            if (instance._isMasonChild) {
+                return org.nativescript.mason.masonkit.NodeHelper.INSTANCE.getScrollBarWidth(nodeOrView);
+            }
+            else {
+                return nodeOrView.getScrollBarWidth();
+            }
+        }
+        if (global.isIOS) {
+            return _parseDimension(instance.ios.scrollBarWidthCompat);
+        }
+    }
+}
 export function _setFlexGrow(value, instance, initial = false) {
     if (!instance._hasNativeView) {
         return;
     }
-    if (JSIEnabled) {
-        global.__Mason_setFlexGrow(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, value, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setFlexGrow(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, value, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2513,8 +2890,8 @@ export function _getFlexGrow(instance) {
     if (!instance._hasNativeView) {
         return instance.style.flexGrow;
     }
-    if (JSIEnabled) {
-        return global.__Mason_getFlexGrow(instance._masonStylePtr);
+    if (UseV8Module) {
+        return MasonV8Module.getFlexGrow(instance._masonStylePtr);
     }
     else {
         if (global.isAndroid) {
@@ -2538,8 +2915,8 @@ export function _setFlexShrink(value, instance, initial = false) {
     if (!instance._hasNativeView) {
         return;
     }
-    if (JSIEnabled) {
-        global.__Mason_setFlexShrink(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, value, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setFlexShrink(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, value, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2560,8 +2937,8 @@ export function _getFlexShrink(instance) {
     if (!instance._hasNativeView) {
         return instance.style.flexShrink;
     }
-    if (JSIEnabled) {
-        return global.__Mason_getFlexShrink(instance._masonStylePtr);
+    if (UseV8Module) {
+        return MasonV8Module.getFlexShrink(instance._masonStylePtr);
     }
     else {
         if (global.isAndroid) {
@@ -2585,8 +2962,8 @@ export function _setAspectRatio(value, instance, initial = false) {
     if (!instance._hasNativeView) {
         return;
     }
-    if (JSIEnabled) {
-        global.__Mason_setAspectRatio(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, value, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setAspectRatio(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, value, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2608,8 +2985,8 @@ export function _getAspectRatio(instance) {
     if (!instance._hasNativeView) {
         return instance.style.aspectRatio;
     }
-    if (JSIEnabled) {
-        return global.__Mason_getAspectRatio(instance._masonStylePtr);
+    if (UseV8Module) {
+        return MasonV8Module.getAspectRatio(instance._masonStylePtr);
     }
     else {
         if (global.isAndroid) {
@@ -2634,76 +3011,83 @@ function _parseGridLine(value) {
     let parsedValue = undefined;
     let parsedType = undefined;
     let nativeValue = undefined;
+    if (value === 'auto' || value === undefined) {
+        parsedValue = 0;
+        parsedType = 0 /* GridPlacementCompatType.Auto */;
+    }
     if (typeof value === 'string') {
-        if (value === 'auto') {
-            parsedValue = 0;
-            parsedType = 0 /* GridPlacementCompatType.Auto */;
-            if (!JSIEnabled) {
-                if (global.isAndroid) {
-                    parsedType = org.nativescript.mason.masonkit.GridPlacement.Auto;
-                    nativeValue = org.nativescript.mason.masonkit.GridPlacement.Auto;
-                }
-                if (global.isIOS) {
-                    parsedType = 0 /* GridPlacementCompatType.Auto */;
-                    nativeValue = GridPlacementCompat.Auto;
-                }
-            }
-        }
         if (value.startsWith('span')) {
             parsedValue = Number(value.replace('span', '').trim());
             parsedType = 2 /* GridPlacementCompatType.Span */;
-            if (!JSIEnabled) {
-                const isValid = !Number.isNaN(parsedValue);
-                if (global.isAndroid) {
-                    parsedType = org.nativescript.mason.masonkit.GridPlacement.Span;
-                    if (isValid) {
-                        nativeValue = new org.nativescript.mason.masonkit.GridPlacement.Span(parsedValue);
-                    }
-                }
-                if (global.isIOS) {
-                    parsedType = 2 /* GridPlacementCompatType.Span */;
-                    if (isValid) {
-                        nativeValue = GridPlacementCompat.alloc().initWithSpan(parsedValue);
-                    }
-                }
-            }
         }
         else {
             parsedValue = Number(value.trim());
-            parsedType = 1 /* GridPlacementCompatType.Line */;
-            if (!JSIEnabled) {
-                const isValid = !Number.isNaN(parsedValue);
-                if (global.isAndroid) {
-                    parsedType = org.nativescript.mason.masonkit.GridPlacement.Line;
-                    if (isValid) {
-                        nativeValue = new org.nativescript.mason.masonkit.GridPlacement.Line(parsedValue);
-                    }
-                }
-                if (global.isIOS) {
-                    parsedType = 1 /* GridPlacementCompatType.Line */;
-                    if (isValid) {
-                        nativeValue = GridPlacementCompat.alloc().initWithLine(parsedValue);
-                    }
-                }
+            if (parsedValue < 1) {
+                parsedValue = 0;
+                parsedType = 0 /* GridPlacementCompatType.Auto */;
+            }
+            else {
+                parsedType = 1 /* GridPlacementCompatType.Line */;
             }
         }
-        return { value: Number.isNaN(parsedValue) ? undefined : parsedValue, type: parsedType, native_value: nativeValue };
     }
     if (typeof value === 'number') {
         parsedValue = value;
-        parsedType = 1 /* GridPlacementCompatType.Line */;
-        if (!JSIEnabled) {
+        if (parsedValue < 1) {
+            parsedValue = 0;
+            parsedType = 0 /* GridPlacementCompatType.Auto */;
+        }
+        else {
+            parsedType = 1 /* GridPlacementCompatType.Line */;
+        }
+    }
+    if (parsedType === 0) {
+        if (!UseV8Module) {
+            if (global.isAndroid) {
+                parsedType = org.nativescript.mason.masonkit.GridPlacement.Auto;
+                nativeValue = org.nativescript.mason.masonkit.GridPlacement.Auto.INSTANCE;
+            }
+            if (global.isIOS) {
+                parsedType = 0 /* GridPlacementCompatType.Auto */;
+                nativeValue = GridPlacementCompat.Auto;
+            }
+        }
+    }
+    else if (parsedType === 1) {
+        if (!UseV8Module) {
+            const isValid = !Number.isNaN(parsedValue);
             if (global.isAndroid) {
                 parsedType = org.nativescript.mason.masonkit.GridPlacement.Line;
-                nativeValue = new org.nativescript.mason.masonkit.GridPlacement.Line(parsedValue);
+                if (isValid) {
+                    nativeValue = new org.nativescript.mason.masonkit.GridPlacement.Line(parsedValue);
+                }
             }
             if (global.isIOS) {
                 parsedType = 1 /* GridPlacementCompatType.Line */;
-                nativeValue = GridPlacementCompat.alloc().initWithLine(parsedValue);
+                if (isValid) {
+                    nativeValue = GridPlacementCompat.alloc().initWithLine(parsedValue);
+                }
             }
         }
     }
-    return { value: parsedValue, type: parsedType, native_value: nativeValue };
+    else {
+        if (!UseV8Module) {
+            const isValid = !Number.isNaN(parsedValue);
+            if (global.isAndroid) {
+                parsedType = org.nativescript.mason.masonkit.GridPlacement.Span;
+                if (isValid) {
+                    nativeValue = new org.nativescript.mason.masonkit.GridPlacement.Span(parsedValue);
+                }
+            }
+            if (global.isIOS) {
+                parsedType = 2 /* GridPlacementCompatType.Span */;
+                if (isValid) {
+                    nativeValue = GridPlacementCompat.alloc().initWithSpan(parsedValue);
+                }
+            }
+        }
+    }
+    return { value: Number.isNaN(parsedValue) ? undefined : parsedValue, type: parsedType, native_value: nativeValue };
 }
 export function _setGridColumnStart(value, instance, initial = false) {
     if (!instance._hasNativeView) {
@@ -2713,8 +3097,8 @@ export function _setGridColumnStart(value, instance, initial = false) {
     if (val.value === undefined || val.type === undefined) {
         return;
     }
-    if (JSIEnabled) {
-        global.__Mason_setColumnStart(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setColumnStart(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2739,8 +3123,8 @@ export function _setGridColumnEnd(value, instance, initial = false) {
     if (val.value === undefined || val.type === undefined) {
         return;
     }
-    if (JSIEnabled) {
-        global.__Mason_setColumnEnd(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setColumnEnd(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2765,8 +3149,8 @@ export function _setGridRowStart(value, instance, initial = false) {
     if (val.value === undefined || val.type === undefined) {
         return;
     }
-    if (JSIEnabled) {
-        global.__Mason_setRowStart(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setRowStart(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2791,8 +3175,8 @@ export function _setGridRowEnd(value, instance, initial = false) {
     if (val.value === undefined || val.type === undefined) {
         return;
     }
-    if (JSIEnabled) {
-        global.__Mason_setRowEnd(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setRowEnd(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2817,8 +3201,8 @@ export function _setRowGap(value, instance, initial = false) {
     if (val.value === undefined || val.type === undefined) {
         return;
     }
-    if (JSIEnabled) {
-        global.__Mason_setRowGap(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setRowGap(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2839,8 +3223,8 @@ export function _getRowGap(instance) {
     if (!instance._hasNativeView) {
         return instance.style.gap;
     }
-    if (JSIEnabled) {
-        return global.__Mason_getRowGap(instance._masonStylePtr);
+    if (UseV8Module) {
+        return MasonV8Module.getRowGap(instance._masonStylePtr);
     }
     else {
         if (global.isAndroid) {
@@ -2868,8 +3252,8 @@ export function _setColumnGap(value, instance, initial = false) {
     if (val.value === undefined || val.type === undefined) {
         return;
     }
-    if (JSIEnabled) {
-        global.__Mason_setColumnGap(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setColumnGap(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, val.value, val.native_type, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -2890,8 +3274,8 @@ export function _getColumnGap(instance) {
     if (!instance._hasNativeView) {
         return instance.style.gap;
     }
-    if (JSIEnabled) {
-        return global.__Mason_getColumnGap(instance._masonStylePtr);
+    if (UseV8Module) {
+        return MasonV8Module.getColumnGap(instance._masonStylePtr);
     }
     else {
         if (global.isAndroid) {
@@ -2941,8 +3325,8 @@ export function _parseMinMaxValue(value) {
                 max_value: 0,
             };
         }
-        else if (value.startsWith('flex')) {
-            const flex = parseInt(value.replace('flex(', '').replace(')', '').replace('fr', '').trim());
+        else if (value.indexOf('fr') > -1) {
+            const flex = parseInt(value.replace('fr', '').trim());
             return {
                 min_type: 0 /* MinSizingType.Auto */,
                 min_value: 0,
@@ -3106,8 +3490,8 @@ export function _setGridTemplateRows(value, instance, initial = false) {
     if (!instance._hasNativeView) {
         return;
     }
-    if (JSIEnabled) {
-        global.__Mason_setGridTemplateRows(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, value, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setGridTemplateRows(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, value, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -3200,8 +3584,8 @@ export function _setGridTemplateColumns(value, instance, initial = false) {
     if (!instance._hasNativeView) {
         return;
     }
-    if (JSIEnabled) {
-        global.__Mason_setGridTemplateColumns(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, value, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setGridTemplateColumns(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, value, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -3237,7 +3621,8 @@ export function _setGridTemplateColumns(value, instance, initial = false) {
                 }
                 else {
                     const single = item.value;
-                    const trackSizingFunction = new org.nativescript.mason.masonkit.TrackSizingFunction.Single(org.nativescript.mason.masonkit.MinMax.fromTypeValue(single.min_type, single.min_value, single.max_type, single.max_value));
+                    const minMax = single ? org.nativescript.mason.masonkit.MinMax.fromTypeValue(single.min_type, single.min_value, single.max_type, single.max_value) : org.nativescript.mason.masonkit.MinMax.Auto.INSTANCE;
+                    const trackSizingFunction = new org.nativescript.mason.masonkit.TrackSizingFunction.Single(minMax);
                     array[i] = trackSizingFunction;
                 }
             }
@@ -3305,13 +3690,114 @@ export function _parseGridAutoRowsColumns(value) {
     }
     return array;
 }
+function toGridAutoFlow(value) {
+    if (isIOS || UseV8Module) {
+        switch (value) {
+            case 'row':
+                return 0 /* FlexGridAutoFlowWrap.Row */;
+            case 'column':
+                return 1 /* FlexGridAutoFlowWrap.Column */;
+            case 'row dense':
+                return 2 /* FlexGridAutoFlowWrap.RowDense */;
+            case 'column dense':
+                return 3 /* FlexGridAutoFlowWrap.ColumnDense */;
+            default:
+                return 0 /* FlexGridAutoFlowWrap.Row */;
+        }
+    }
+    switch (value) {
+        case 'row':
+            return org.nativescript.mason.masonkit.GridAutoFlow.Row;
+        case 'column':
+            return org.nativescript.mason.masonkit.GridAutoFlow.Column;
+        case 'row dense':
+            return org.nativescript.mason.masonkit.GridAutoFlow.RowDense;
+        case 'column dense':
+            return org.nativescript.mason.masonkit.GridAutoFlow.ColumnDense;
+        default:
+            return org.nativescript.mason.masonkit.GridAutoFlow.Row;
+    }
+}
+export function _setGridAutoFlow(value, instance) {
+    if (!instance._hasNativeView) {
+        return;
+    }
+    const nativeValue = toGridAutoFlow(value);
+    if (UseV8Module) {
+        MasonV8Module.setGridAutoFlow(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, nativeValue, !instance._inBatch);
+    }
+    else {
+        if (global.isAndroid) {
+            const nodeOrView = getMasonInstance(instance);
+            if (instance._isMasonChild) {
+                org.nativescript.mason.masonkit.NodeHelper.INSTANCE.setGridAutoFlow(nodeOrView, nativeValue);
+            }
+            else {
+                nodeOrView.setGridAutoFlow(nativeValue);
+            }
+        }
+        if (isIOS) {
+            instance.ios.gridAutoFlow = nativeValue;
+        }
+    }
+}
+function parseGridAutoFlow(value) {
+    if (isIOS || UseV8Module) {
+        switch (value) {
+            case 0 /* FlexGridAutoFlowWrap.Row */:
+                return 'row';
+            case 1 /* FlexGridAutoFlowWrap.Column */:
+                return 'column';
+            case 2 /* FlexGridAutoFlowWrap.RowDense */:
+                return 'row dense';
+            case 3 /* FlexGridAutoFlowWrap.ColumnDense */:
+                return 'column dense';
+            default:
+                return 'row';
+        }
+    }
+    switch (value) {
+        case org.nativescript.mason.masonkit.GridAutoFlow.Row:
+            return 'row';
+        case org.nativescript.mason.masonkit.GridAutoFlow.Column:
+            return 'column';
+        case org.nativescript.mason.masonkit.GridAutoFlow.RowDense:
+            return 'row dense';
+        case org.nativescript.mason.masonkit.GridAutoFlow.ColumnDense:
+            return 'column dense';
+        default:
+            return 'row';
+    }
+}
+export function _getGridAutoFlow(instance) {
+    if (!instance._hasNativeView) {
+        return;
+    }
+    if (UseV8Module) {
+        return parseGridAutoFlow(MasonV8Module.getGridAutoFlow(instance._masonStylePtr));
+    }
+    else {
+        if (global.isAndroid) {
+            const nodeOrView = getMasonInstance(instance);
+            if (instance._isMasonChild) {
+                return parseGridAutoFlow(org.nativescript.mason.masonkit.NodeHelper.INSTANCE.getGridAutoFlow(nodeOrView));
+            }
+            else {
+                return parseGridAutoFlow(nodeOrView.getGridAutoFlow());
+            }
+        }
+        if (isIOS) {
+            return parseGridAutoFlow(instance.ios.gridAutoFlow);
+        }
+    }
+}
 export function _setGridAutoRows(value, instance, initial = false) {
     if (!instance._hasNativeView) {
         return;
     }
     const values = _parseGridAutoRowsColumns(value);
-    if (JSIEnabled) {
-        global.__Mason_setGridAutoRows(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, values, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setGridAutoRows(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, values, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {
@@ -3347,8 +3833,8 @@ export function _setGridAutoColumns(value, instance, initial = false) {
         return;
     }
     const values = _parseGridAutoRowsColumns(value);
-    if (JSIEnabled) {
-        global.__Mason_setGridAutoColumns(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, values, !instance._inBatch);
+    if (UseV8Module) {
+        MasonV8Module.setGridAutoColumns(instance._masonPtr, instance._masonNodePtr, instance._masonStylePtr, values, !instance._inBatch);
     }
     else {
         if (global.isAndroid) {