@triniwiz/nativescript-masonkit 1.0.0-alpha.33 → 1.0.0-alpha.35

package/style.js

@@ -1,6 +1,5 @@
 import { layout } from '@nativescript/core/utils';
 import { Length as CoreLength } from '@nativescript/core';
-import { _setGridAutoRows, _setGridAutoColumns, _parseGridLine, _parseGridTemplates, _setGridTemplateColumns, _setGridTemplateRows, _getGridTemplateRows, _getGridTemplateColumns } from './utils';
 var StyleKeys;
 (function (StyleKeys) {
     StyleKeys[StyleKeys["DISPLAY"] = 0] = "DISPLAY";
@@ -280,6 +279,7 @@ export class Style {
         //console.time('fromView');
         const ret = new Style();
         ret.view_ = view;
+        ret.nativeView = nativeView;
         if (__ANDROID__) {
             let style = nativeView?.getStyle?.();
             if (!style) {
@@ -1882,24 +1882,28 @@ export class Style {
         this.setOrAppendState(StateKeys.JUSTIFY_CONTENT);
     }
     get gridAutoRows() {
-        return '';
+        if (!this.nativeView) {
+            return '';
+        }
+        return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridAutoRows(this.nativeView);
     }
     set gridAutoRows(value) {
-        if (typeof value === 'string') {
-            _setGridAutoRows(value, this.view_);
-        }
-        else {
+        if (!this.nativeView) {
+            return;
         }
+        org.nativescript.mason.masonkit.NodeHelper.getShared().setGridAutoRows(this.nativeView, value);
     }
     get gridAutoColumns() {
-        return '';
+        if (!this.nativeView) {
+            return '';
+        }
+        return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridAutoColumns(this.nativeView);
     }
     set gridAutoColumns(value) {
-        if (typeof value === 'string') {
-            _setGridAutoColumns(value, this.view_);
-        }
-        else {
+        if (!this.nativeView) {
+            return;
         }
+        org.nativescript.mason.masonkit.NodeHelper.getShared().setGridAutoColumns(this.nativeView, value);
     }
     get gridAutoFlow() {
         switch (getInt32(this.style_view, StyleKeys.GRID_AUTO_FLOW)) {
@@ -1942,231 +1946,174 @@ export class Style {
     set gridColumnGap(value) {
         this.columnGap = value;
     }
-    // gridArea: string;
+    set gridColumn(value) {
+        if (!this.nativeView) {
+            return;
+        }
+        if (__ANDROID__) {
+            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridColumn(this.nativeView, value);
+        }
+    }
     get gridColumn() {
-        if (this.gridColumnStart === this.gridColumnEnd) {
-            return `${this.gridColumnStart}`;
+        if (!this.nativeView) {
+            return '';
+        }
+        if (__ANDROID__) {
+            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridColumn(this.nativeView);
         }
-        return `${this.gridColumnStart} / ${this.gridColumnEnd}`;
+        return '';
     }
     get gridColumnStart() {
-        switch (getInt32(this.style_view, StyleKeys.GRID_COLUMN_START_TYPE)) {
-            case 0:
-                return 'auto';
-            case 1: {
-                const value = getInt16(this.style_view, StyleKeys.GRID_COLUMN_START_VALUE);
-                // if (value === 1) {
-                //   return 'auto';
-                // }
-                return `${value}`;
-            }
-            case 2: {
-                const value = getInt16(this.style_view, StyleKeys.GRID_COLUMN_START_VALUE);
-                if (value === 0) {
-                    return 'span';
-                }
-                return `span ${value}`;
-            }
+        if (!this.nativeView) {
+            return '';
+        }
+        if (__ANDROID__) {
+            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridColumnStart(this.nativeView);
         }
+        return '';
     }
     set gridColumnStart(value) {
-        const line = _parseGridLine(value);
-        if (line === null) {
+        if (!this.nativeView) {
             return;
         }
-        switch (line.type) {
-            case 'auto':
-            case 0:
-                setInt32(this.style_view, StyleKeys.GRID_COLUMN_START_TYPE, 0);
-                setInt16(this.style_view, StyleKeys.GRID_COLUMN_START_VALUE, 1);
-                break;
-            case 'line':
-            case 1:
-                if (line.value !== undefined) {
-                    setInt32(this.style_view, StyleKeys.GRID_COLUMN_START_TYPE, 1);
-                    setInt16(this.style_view, StyleKeys.GRID_COLUMN_START_VALUE, line.value);
-                }
-                break;
-            case 'span':
-            case 2:
-                if (line.value !== undefined) {
-                    setInt32(this.style_view, StyleKeys.GRID_COLUMN_START_TYPE, 2);
-                    setInt16(this.style_view, StyleKeys.GRID_COLUMN_START_VALUE, line.value);
-                }
-                break;
+        if (__ANDROID__) {
+            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridColumnStart(this.nativeView, value);
         }
-        this.setOrAppendState(StateKeys.GRID_COLUMN);
     }
     get gridColumnEnd() {
-        switch (getInt32(this.style_view, StyleKeys.GRID_COLUMN_END_TYPE)) {
-            case 0:
-                return 'auto';
-            case 1: {
-                const value = getInt16(this.style_view, StyleKeys.GRID_COLUMN_END_VALUE);
-                // if (value === 1) {
-                //   return 'auto';
-                // }
-                return `${value}`;
-            }
-            case 2: {
-                const value = getInt16(this.style_view, StyleKeys.GRID_COLUMN_END_VALUE);
-                if (value === 0) {
-                    return 'span';
-                }
-                return `span ${value}`;
-            }
+        if (!this.nativeView) {
+            return '';
         }
+        if (__ANDROID__) {
+            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridColumnEnd(this.nativeView);
+        }
+        return '';
     }
     set gridColumnEnd(value) {
-        const line = _parseGridLine(value);
-        if (line === null) {
+        if (!this.nativeView) {
             return;
         }
-        switch (line.type) {
-            case 'auto':
-            case 0:
-                setInt32(this.style_view, StyleKeys.GRID_COLUMN_END_TYPE, 0);
-                setInt16(this.style_view, StyleKeys.GRID_COLUMN_END_VALUE, 1);
-                break;
-            case 'line':
-            case 1:
-                if (line.value !== undefined) {
-                    setInt32(this.style_view, StyleKeys.GRID_COLUMN_END_TYPE, 1);
-                    setInt16(this.style_view, StyleKeys.GRID_COLUMN_END_VALUE, line.value);
-                }
-                break;
-            case 'span':
-            case 2:
-                if (line.value !== undefined) {
-                    setInt32(this.style_view, StyleKeys.GRID_COLUMN_END_TYPE, 2);
-                    setInt16(this.style_view, StyleKeys.GRID_COLUMN_END_VALUE, line.value);
-                }
-                break;
+        if (__ANDROID__) {
+            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridColumnEnd(this.nativeView, value);
+        }
+    }
+    set gridRow(value) {
+        if (!this.nativeView) {
+            return;
+        }
+        if (__ANDROID__) {
+            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridRow(this.nativeView, value);
         }
-        this.setOrAppendState(StateKeys.GRID_COLUMN);
     }
     get gridRow() {
-        if (this.gridRowStart === this.gridRowEnd) {
-            return `${this.gridRowStart}`;
+        if (!this.nativeView) {
+            return '';
         }
-        return `${this.gridRowStart} / ${this.gridRowEnd}`;
+        if (__ANDROID__) {
+            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridRow(this.nativeView);
+        }
+        return '';
     }
     get gridRowStart() {
-        switch (getInt32(this.style_view, StyleKeys.GRID_ROW_START_TYPE)) {
-            case 0:
-                return 'auto';
-            case 1: {
-                const value = getInt16(this.style_view, StyleKeys.GRID_ROW_START_VALUE);
-                // if (value === 1) {
-                //   return 'auto';
-                // }
-                return `${value}`;
-            }
-            case 2: {
-                const value = getInt16(this.style_view, StyleKeys.GRID_ROW_START_VALUE);
-                if (value === 0) {
-                    return 'span';
-                }
-                return `span ${value}`;
-            }
+        if (!this.nativeView) {
+            return '';
+        }
+        if (__ANDROID__) {
+            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridRowStart(this.nativeView);
         }
+        return '';
     }
     set gridRowStart(value) {
-        const line = _parseGridLine(value);
-        if (line === null) {
+        if (!this.nativeView) {
             return;
         }
-        switch (line.type) {
-            case 'auto':
-            case 0:
-                setInt32(this.style_view, StyleKeys.GRID_ROW_START_TYPE, 0);
-                setInt16(this.style_view, StyleKeys.GRID_ROW_START_VALUE, 1);
-                break;
-            case 'line':
-            case 1:
-                if (line.value !== undefined) {
-                    setInt32(this.style_view, StyleKeys.GRID_ROW_START_TYPE, 1);
-                    setInt16(this.style_view, StyleKeys.GRID_ROW_START_VALUE, line.value);
-                }
-                break;
-            case 'span':
-            case 2:
-                if (line.value !== undefined) {
-                    setInt32(this.style_view, StyleKeys.GRID_ROW_START_TYPE, 2);
-                    setInt16(this.style_view, StyleKeys.GRID_ROW_START_VALUE, line.value);
-                }
-                break;
+        if (__ANDROID__) {
+            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridRowStart(this.nativeView, value);
         }
-        this.setOrAppendState(StateKeys.GRID_ROW);
     }
     get gridRowEnd() {
-        switch (getInt32(this.style_view, StyleKeys.GRID_ROW_END_TYPE)) {
-            case 0:
-                return 'auto';
-            case 1: {
-                const value = getInt16(this.style_view, StyleKeys.GRID_ROW_END_VALUE);
-                // if (value === 1) {
-                //   return 'auto';
-                // }
-                return `${value}`;
-            }
-            case 2: {
-                const value = getInt16(this.style_view, StyleKeys.GRID_ROW_END_VALUE);
-                if (value === 0) {
-                    return 'span';
-                }
-                return `span ${value}`;
-            }
+        if (!this.nativeView) {
+            return '';
         }
+        if (__ANDROID__) {
+            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridRowEnd(this.nativeView);
+        }
+        return '';
     }
     set gridRowEnd(value) {
-        const line = _parseGridLine(value);
-        if (line === null) {
+        if (!this.nativeView) {
             return;
         }
-        switch (line.type) {
-            case 'auto':
-            case 0:
-                setInt32(this.style_view, StyleKeys.GRID_ROW_END_TYPE, 0);
-                setInt16(this.style_view, StyleKeys.GRID_ROW_END_VALUE, 1);
-                break;
-            case 'line':
-            case 1:
-                if (line.value !== undefined) {
-                    setInt32(this.style_view, StyleKeys.GRID_ROW_END_TYPE, 1);
-                    setInt16(this.style_view, StyleKeys.GRID_ROW_END_VALUE, line.value);
-                }
-                break;
-            case 'span':
-            case 2:
-                if (line.value !== undefined) {
-                    setInt32(this.style_view, StyleKeys.GRID_ROW_END_TYPE, 2);
-                    setInt16(this.style_view, StyleKeys.GRID_ROW_END_VALUE, line.value);
-                }
-                break;
+        if (__ANDROID__) {
+            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridRowEnd(this.nativeView, value);
         }
-        this.setOrAppendState(StateKeys.GRID_ROW);
+    }
+    set gridArea(value) {
+        if (!this.nativeView) {
+            return;
+        }
+        if (__ANDROID__) {
+            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridArea(this.nativeView, value);
+        }
+    }
+    get gridArea() {
+        if (!this.nativeView) {
+            return '';
+        }
+        if (__ANDROID__) {
+            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridArea(this.nativeView);
+        }
+        return '';
     }
     set gridTemplateRows(value) {
-        if (Array.isArray(value)) {
-            _setGridTemplateRows(value, this.view);
+        if (!this.nativeView) {
+            return;
         }
-        else {
-            _setGridTemplateRows(_parseGridTemplates(value), this.view);
+        if (__ANDROID__) {
+            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridTemplateRows(this.nativeView, value);
         }
     }
     get gridTemplateRows() {
-        return _getGridTemplateRows(this.view);
+        if (!this.nativeView) {
+            return '';
+        }
+        if (__ANDROID__) {
+            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridTemplateRows(this.nativeView);
+        }
+        return '';
     }
     get gridTemplateColumns() {
-        return _getGridTemplateColumns(this.view);
+        if (!this.nativeView) {
+            return '';
+        }
+        if (__ANDROID__) {
+            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridTemplateColumns(this.nativeView);
+        }
+        return '';
     }
     set gridTemplateColumns(value) {
-        if (Array.isArray(value)) {
-            _setGridTemplateColumns(value, this.view);
+        if (!this.nativeView) {
+            return;
         }
-        else {
-            _setGridTemplateColumns(_parseGridTemplates(value), this.view);
+        if (__ANDROID__) {
+            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridTemplateColumns(this.nativeView, value);
+        }
+    }
+    get gridTemplateAreas() {
+        if (!this.nativeView) {
+            return '';
+        }
+        if (__ANDROID__) {
+            return org.nativescript.mason.masonkit.NodeHelper.getShared().getGridTemplateAreas(this.nativeView);
+        }
+        return '';
+    }
+    set gridTemplateAreas(value) {
+        if (!this.nativeView) {
+            return;
+        }
+        if (__ANDROID__) {
+            org.nativescript.mason.masonkit.NodeHelper.getShared().setGridTemplateAreas(this.nativeView, value);
         }
     }
     get overflow() {
@@ -2258,6 +2205,14 @@ export class Style {
                 dirty = true;
                 setInt32(this.style_view, StyleKeys.OVERFLOW_X, 2);
                 break;
+            case 'clip':
+                dirty = true;
+                setInt32(this.style_view, StyleKeys.OVERFLOW_X, 3);
+                break;
+            case 'auto':
+                dirty = true;
+                setInt32(this.style_view, StyleKeys.OVERFLOW_X, 4);
+                break;
         }
         if (dirty) {
             this.setOrAppendState(StateKeys.OVERFLOW_X);
@@ -2271,6 +2226,10 @@ export class Style {
                 return 'hidden';
             case 2:
                 return 'scroll';
+            case 3:
+                return 'clip';
+            case 4:
+                return 'auto';
         }
     }
     set overflowY(value) {
@@ -2286,6 +2245,15 @@ export class Style {
                 break;
             case 'scroll':
                 setInt32(this.style_view, StyleKeys.OVERFLOW_Y, 2);
+                org.nativescript.mason.masonkit.NodeHelper.getShared().setOverflowX(this.nativeView, org.nativescript.mason.masonkit.enums.Overflow.Scroll);
+                dirty = true;
+                break;
+            case 'clip':
+                setInt32(this.style_view, StyleKeys.OVERFLOW_Y, 3);
+                dirty = true;
+                break;
+            case 'auto':
+                setInt32(this.style_view, StyleKeys.OVERFLOW_Y, 4);
                 dirty = true;
                 break;
         }
@@ -2539,6 +2507,7 @@ export class Style {
             flexShrink: this.flexShrink,
             scrollBarWidth: this.scrollBarWidth,
             gap: this.gap,
+            gridArea: this.gridArea,
             gridAutoFlow: this.gridAutoFlow,
             gridAutoColumns: this.gridAutoColumns,
             gridAutoRows: this.gridAutoRows,