@triniwiz/nativescript-masonkit 1.0.0-alpha.5 → 1.0.0-alpha.7

package/index.d.ts

@@ -1,6 +1,7 @@
 import { CoreTypes } from '@nativescript/core';
 
 import { TSCViewBase } from './common';
+import { LengthPercentage } from '@nativescript/core/css/parser';
 
 export type Length = CoreTypes.dip | CoreTypes.LengthDipUnit | CoreTypes.LengthPxUnit;
 
@@ -10,7 +11,9 @@ export type SizeLength = { width: LengthType; height: LengthType };
 
 export type Position = 'absolute' | 'relative';
 
-export type Display = 'none' | 'flex' | 'grid';
+export type Display = 'none' | 'flex' | 'grid' | 'block';
+
+export type Overflow = 'visible' | 'hidden' | 'scroll';
 
 export type FlexWrap = 'no-wrap' | 'wrap' | 'wrap-reverse';
 
@@ -32,16 +35,63 @@ export type JustifySelf = AlignSelf;
 
 export type JustifyContent = AlignContent;
 
-export type GridAutoFlow = 'row' | 'column' | 'row-dense' | 'column-dense';
+export type GridAutoFlow = 'row' | 'column' | 'row dense' | 'column dense';
 
 export { applyMixins } from './helpers';
 
-export class TSCView extends TSCViewBase {}
+export class TSCView extends TSCViewBase {
+  display: Display;
+  position: Position;
+  flexDirection: FlexDirection;
+  flexWrap: FlexWrap;
+  flex: string | 'auto' | 'none' | number | 'initial';
+  flexFlow: string;
+  width: Length;
+  height: Length;
+  maxWidth: Length;
+  maxHeight: Length;
+  left: Length;
+  right: Length;
+  top: Length;
+  bottom: Length;
+  gridGap: Gap;
+  gap: Gap;
+  rowGap: Length;
+  columnGap: Length;
+  aspectRatio: number;
+  flexBasis: Length;
+  alignItems: AlignItems;
+  alignSelf: import('@nativescript/core/ui/layouts/flexbox-layout').AlignSelf;
+  alignContent: AlignContent;
+  justifyItems: JustifyItems;
+  justifySelf: JustifySelf;
+  justifyContent: JustifyContent;
+  gridAutoRows: string;
+  gridAutoColumns: string;
+  gridAutoFlow: GridAutoFlow;
+  gridRowGap: Gap;
+  gridColumnGap: Gap;
+  gridArea: string;
+  gridColumn: string;
+  gridColumnStart: string;
+  gridColumnEnd: string;
+  gridRow: string;
+  gridRowStart: string;
+  gridRowEnd: string;
+  gridTemplateRows: string;
+  gridTemplateColumns: string;
+  overflow: Overflow;
+  overflowX: Overflow;
+  overflowY: Overflow;
+  scrollBarWidth: number | CoreTypes.LengthType;
+}
 
 export class Grid extends TSCView {}
 
 export class Flex extends TSCView {}
 
+export class Box extends TSCView {}
+
 export class Container extends TSCView {}
 
 declare module '@nativescript/core/ui/styling/style' {
@@ -50,10 +100,12 @@ declare module '@nativescript/core/ui/styling/style' {
     position: Position;
     flexDirection: FlexDirection;
     flexWrap: FlexWrap;
-    width: Length;
-    height: Length;
-    maxWidth: Length;
-    maxHeight: Length;
+    flex: string | 'auto' | 'none' | number | 'initial';
+    flexFlow: string;
+    width: LengthPercentage | string | number;
+    height: LengthPercentage | string | number;
+    maxWidth: LengthPercentage | string | number;
+    maxHeight: LengthPercentage | string | number;
     left: Length;
     right: Length;
     top: Length;
@@ -63,6 +115,7 @@ declare module '@nativescript/core/ui/styling/style' {
     rowGap: Length;
     columnGap: Length;
     aspectRatio: number;
+    flexBasis: LengthPercentage | string | number;
     alignItems: AlignItems;
     alignSelf: AlignSelf;
     alignContent: AlignContent;
@@ -83,5 +136,9 @@ declare module '@nativescript/core/ui/styling/style' {
     gridRowEnd: string;
     gridTemplateRows: string;
     gridTemplateColumns: string;
+    overflow: Overflow;
+    overflowX: Overflow;
+    overflowY: Overflow;
+    scrollBarWidth: number | CoreTypes.LengthType;
   }
 }

package/index.ios.d.ts

@@ -1,12 +1,12 @@
 import { ViewBase } from '@nativescript/core';
 import { TSCViewBase } from './common';
 export declare class TSCView extends TSCViewBase {
-    __masonStylePtr: number;
-    get _masonStylePtr(): number;
-    __masonNodePtr: number;
-    get _masonNodePtr(): number;
-    __masonPtr: number;
-    get _masonPtr(): number;
+    __masonStylePtr: bigint;
+    __masonNodePtr: bigint;
+    __masonPtr: bigint;
+    get _masonStylePtr(): bigint;
+    get _masonNodePtr(): bigint;
+    get _masonPtr(): bigint;
     _hasNativeView: boolean;
     createNativeView(): UIView;
     disposeNativeView(): void;
@@ -23,5 +23,8 @@ export declare class Grid extends TSCView {
 export declare class Flex extends TSCView {
     createNativeView(): any;
 }
+export declare class Box extends TSCView {
+    createNativeView(): any;
+}
 export declare class Container extends TSCView {
 }

package/index.ios.js

@@ -1,5 +1,6 @@
 import { CSSType, Utils, View } from '@nativescript/core';
 import { TSCViewBase } from './common';
+const BigIntZero = BigInt(0);
 function parseLength(length, parent = 0) {
     switch (length.unit) {
         case '%':
@@ -13,26 +14,26 @@ function parseLength(length, parent = 0) {
 export class TSCView extends TSCViewBase {
     constructor() {
         super(...arguments);
-        this.__masonStylePtr = 0;
-        this.__masonNodePtr = 0;
-        this.__masonPtr = 0;
+        this.__masonStylePtr = BigIntZero;
+        this.__masonNodePtr = BigIntZero;
+        this.__masonPtr = BigIntZero;
         this._hasNativeView = false;
     }
     get _masonStylePtr() {
-        if (this.__masonStylePtr === 0) {
-            this.__masonStylePtr = String(this.ios?.masonStylePtr ?? 0); // cast as string for now
+        if (this.__masonStylePtr === BigIntZero) {
+            this.__masonStylePtr = BigInt(String(this.ios?.masonStylePtr ?? 0));
         }
         return this.__masonStylePtr;
     }
     get _masonNodePtr() {
-        if (this.__masonNodePtr === 0) {
-            this.__masonNodePtr = String(this.ios?.masonNodePtr ?? 0); // cast as string for now
+        if (this.__masonNodePtr === BigIntZero) {
+            this.__masonNodePtr = BigInt(this.ios?.masonNodePtr ?? 0);
         }
         return this.__masonNodePtr;
     }
     get _masonPtr() {
-        if (this.__masonPtr === 0) {
-            this.__masonPtr = String(UIView.masonPtr ?? 0); // cast as string for now
+        if (this.__masonPtr === BigIntZero) {
+            this.__masonPtr = BigInt(UIView.masonPtr ?? 0);
         }
         return this.__masonPtr;
     }
@@ -46,6 +47,7 @@ export class TSCView extends TSCViewBase {
         this._hasNativeView = false;
         super.disposeNativeView();
     }
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     //@ts-ignore
     get ios() {
         return this.nativeViewProtected;
@@ -54,11 +56,14 @@ export class TSCView extends TSCViewBase {
         super.onLayout(left, top, right, bottom);
         const nativeView = this.nativeView;
         if (nativeView) {
+            const insets = this.getSafeAreaInsets();
             this.eachLayoutChild((child) => {
                 const layout = child.ios.mason.layout();
-                child.setMeasuredDimension(layout.width, layout.height);
-                View.layoutChild(this, child, layout.x, layout.y, layout.width, layout.height);
-                return true;
+                // child.setMeasuredDimension(layout.width, layout.height);
+                const left = layout.x + insets.left;
+                const top = layout.y + insets.top;
+                View.layoutChild(this, child, left, top, layout.width + left, layout.height + top);
+                //    return true;
             });
         }
     }
@@ -83,11 +88,12 @@ export class TSCView extends TSCViewBase {
                 else {
                     let width;
                     switch (typeof this.width) {
-                        case 'object':
+                        case 'object': {
                             const parent = this.parent;
                             const mw = parent?.getMeasuredWidth?.() || Utils.layout.toDevicePixels(parent?.nativeView?.frame?.size?.width ?? 0) || specWidth;
                             width = parseLength(this.width, mw);
                             break;
+                        }
                         case 'string':
                             width = -2;
                             break;
@@ -97,11 +103,12 @@ export class TSCView extends TSCViewBase {
                     }
                     let height;
                     switch (typeof this.height) {
-                        case 'object':
+                        case 'object': {
                             const parent = this.parent;
                             const mh = parent?.getMeasuredHeight?.() || Utils.layout.toDevicePixels(parent?.nativeView?.frame?.size?.height ?? 0) || specHeight;
                             height = parseLength(this.height, mh);
                             break;
+                        }
                         case 'string':
                             height = -2;
                             break;
@@ -113,7 +120,9 @@ export class TSCView extends TSCViewBase {
                 }
             }
             const layout = this.ios.mason.layout();
-            this.setMeasuredDimension(layout.width, layout.height);
+            const w = Utils.layout.makeMeasureSpec(layout.width, Utils.layout.EXACTLY);
+            const h = Utils.layout.makeMeasureSpec(layout.height, Utils.layout.EXACTLY);
+            this.setMeasuredDimension(w, h);
         }
     }
     layoutNativeView() {
@@ -123,15 +132,11 @@ export class TSCView extends TSCViewBase {
         const nativeView = this.nativeView;
         view._masonParent = this;
         super._addViewToNativeVisualTree(view, atIndex);
-        // if (nativeView && view.nativeViewProtected) {
-        //   console.log(view.nativeViewProtected);
-        //   nativeView.addSubview(view.nativeViewProtected);
-        // }
         const index = atIndex ?? Infinity;
         if (nativeView && view.nativeViewProtected) {
             view['_hasNativeView'] = true;
-            view['_isMasonChild'] = true;
-            if (index >= nativeView.subviews.count) {
+            view['_isMasonChild'] = !!view._masonParent;
+            if (index >= this._children.length) {
                 nativeView.addSubview(view.nativeViewProtected);
             }
             else {
@@ -146,10 +151,8 @@ export class TSCView extends TSCViewBase {
         view._isMasonView = false;
         view._isMasonChild = false;
         super._removeViewFromNativeVisualTree(view);
-        if (view.nativeViewProtected) {
-            if (view.nativeViewProtected.superview === nativeView) {
-                view.nativeViewProtected.removeFromSuperview();
-            }
+        if (view.nativeViewProtected && view.nativeViewProtected.superview === nativeView) {
+            view.nativeViewProtected.removeFromSuperview();
         }
     }
 }
@@ -175,6 +178,17 @@ Flex = __decorate([
     CSSType('Flex')
 ], Flex);
 export { Flex };
+let Box = class Box extends TSCView {
+    createNativeView() {
+        const view = UIView.createBlockView();
+        this._hasNativeView = true;
+        return view;
+    }
+};
+Box = __decorate([
+    CSSType('Box')
+], Box);
+export { Box };
 let Container = class Container extends TSCView {
 };
 Container = __decorate([

package/index.ios.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triniwiz/nativescript-masonkit",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.7",
   "description": "Web Inspired Layout",
   "main": "index",
   "typings": "index.d.ts",

package/platforms/android/include.gradle

@@ -1 +1,18 @@
-dependencies {implementation 'com.google.code.gson:gson:2.10'}
+dependencies {implementation 'com.google.code.gson:gson:2.10'}
+
+android {
+  defaultConfig {
+    multiDexEnabled true
+  }      
+      packagingOptions {
+        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+        pickFirst 'lib/arm64-v8a/libc++_shared.so'
+        pickFirst 'lib/x86_64/libc++_shared.so'
+        pickFirst 'lib/x86/libc++_shared.so'
+
+         pickFirst 'lib/armeabi-v7a/libNativeScript.so'
+        pickFirst 'lib/arm64-v8a/libNativeScript.so'
+        pickFirst 'lib/x86_64/libNativeScript.so'
+        pickFirst 'lib/x86/libNativeScript.so'
+      }          
+}