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

package/index.android.js

@@ -1,62 +1,62 @@
-import { CSSType } from '@nativescript/core';
-import { TSCViewBase, applyMixins } from './common';
-const BigIntZero = BigInt(0);
-export { applyMixins };
-export class TSCView extends TSCViewBase {
+var _a;
+import { backgroundColorProperty, Color, colorProperty, Utils } from '@nativescript/core';
+import { TextBase, ViewBase, style_, textProperty, textWrapProperty } from './common';
+import { Style } from './style';
+export class Tree {
     constructor() {
-        super(...arguments);
-        this.__masonStylePtr = BigIntZero;
-        this.__masonNodePtr = BigIntZero;
-        this.__masonPtr = BigIntZero;
-        this._hasNativeView = false;
-        this._inBatch = false;
+        this._base = org.nativescript.mason.masonkit.Mason.getShared();
     }
-    loadPtrs() {
-        // @ts-ignore
-        const ptrs = this.android?.getMasonPtrs().split(':');
-        this.__masonPtr = BigInt(ptrs[0]);
-        this.__masonNodePtr = BigInt(ptrs[1]);
-        this.__masonStylePtr = BigInt(ptrs[2]);
+    static get instance() {
+        return Tree._tree;
     }
-    get _masonStylePtr() {
-        if (this.__masonStylePtr === BigIntZero) {
-            this.loadPtrs();
-        }
-        return this.__masonStylePtr;
+    get native() {
+        return this._base;
     }
-    get _masonNodePtr() {
-        if (this.__masonNodePtr === BigIntZero) {
-            this.loadPtrs();
-        }
-        return this.__masonNodePtr;
+    createView(context) {
+        return this.native.createView(context);
+    }
+    createTextView(context) {
+        return this.native.createTextView(context);
+    }
+}
+_a = Tree;
+(() => {
+    _a._tree = new Tree();
+})();
+export class View extends ViewBase {
+    constructor() {
+        super();
+        this._hasNativeView = false;
+        this._inBatch = false;
+        const view = Tree.instance.createView(Utils.android.getCurrentActivity() || Utils.android.getApplicationContext());
+        this._hasNativeView = true;
+        this._view = view;
     }
-    get _masonPtr() {
-        if (this.__masonPtr === BigIntZero) {
-            this.loadPtrs();
+    get _styleHelper() {
+        if (this[style_] === undefined) {
+            this[style_] = Style.fromView(this, this._view);
         }
-        return this.__masonPtr;
+        return this[style_];
     }
     createNativeView() {
-        const view = new org.nativescript.mason.masonkit.View(this._context);
-        this._hasNativeView = true;
-        return view;
+        return this._view;
     }
     disposeNativeView() {
         this._hasNativeView = false;
         super.disposeNativeView();
     }
-    //@ts-ignore
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     get android() {
-        return this.nativeViewProtected;
+        return this._view;
     }
-    _addViewToNativeVisualTree(child, atIndex = Number.MAX_VALUE) {
-        // super._addViewToNativeVisualTree(child);
-        const nativeView = this.nativeViewProtected;
+    _addViewToNativeVisualTree(child, atIndex = -1) {
+        const nativeView = this._view;
         child._masonParent = this;
         if (nativeView && child.nativeViewProtected) {
-            child['_hasNativeView'] = true;
-            child['_isMasonChild'] = true;
-            nativeView.addView(child.nativeViewProtected, -1);
+            child._hasNativeView = true;
+            child._isMasonChild = true;
+            nativeView.addView(child.nativeViewProtected, (atIndex ?? -1));
             return true;
         }
         return false;
@@ -68,46 +68,73 @@ export class TSCView extends TSCViewBase {
         super._removeViewFromNativeVisualTree(view);
     }
 }
-(() => {
-    org.nativescript.mason.masonkit.Mason.setShared(false);
-})();
-let Grid = class Grid extends TSCView {
-    createNativeView() {
-        const view = org.nativescript.mason.masonkit.View.createGridView(this._context);
-        this._hasNativeView = true;
-        return view;
-    }
-};
-Grid = __decorate([
-    CSSType('Grid')
-], Grid);
-export { Grid };
-let Flex = class Flex extends TSCView {
-    createNativeView() {
-        const view = org.nativescript.mason.masonkit.View.createFlexView(this._context);
+export class Text extends TextBase {
+    constructor() {
+        super();
+        this._hasNativeView = false;
+        this._inBatch = false;
+        const view = Tree.instance.createTextView(Utils.android.getCurrentActivity() || Utils.android.getApplicationContext());
+        this._view = view;
         this._hasNativeView = true;
-        return view;
-    }
-};
-Flex = __decorate([
-    CSSType('Flex')
-], Flex);
-export { Flex };
-let Box = class Box extends TSCView {
+        this[style_] = Style.fromView(this, view, true);
+    }
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    get android() {
+        return this._view;
+    }
+    get _styleHelper() {
+        if (this[style_] === undefined) {
+            this[style_] = Style.fromView(this, this._view);
+        }
+        return this[style_];
+    }
     createNativeView() {
-        const view = org.nativescript.mason.masonkit.View.createBlockView(this._context);
-        this._hasNativeView = true;
-        return view;
-    }
-};
-Box = __decorate([
-    CSSType('Box')
-], Box);
-export { Box };
-let Container = class Container extends TSCView {
-};
-Container = __decorate([
-    CSSType('Container')
-], Container);
-export { Container };
+        return this._view;
+    }
+    [textProperty.setNative](value) {
+        const nativeView = this._view;
+        if (nativeView) {
+            nativeView.updateText(value);
+        }
+    }
+    [colorProperty.setNative](value) {
+        if (value instanceof Color) {
+            this[style_].color = value.android;
+        }
+    }
+    [backgroundColorProperty.setNative](value) {
+        if (typeof value === 'number') {
+            this[style_].backgroundColor = value;
+        }
+        else if (value instanceof Color) {
+            this[style_].backgroundColor = value.android;
+        }
+    }
+    [textWrapProperty.setNative](value) {
+        switch (value) {
+            case 'false':
+            case 'nowrap':
+                this[style_].textWrap = 0 /* TextWrap.NoWrap */;
+                break;
+            case 'true':
+            case 'wrap':
+                this[style_].textWrap = 1 /* TextWrap.Wrap */;
+                break;
+            case 'balance':
+                this[style_].textWrap = 2 /* TextWrap.Balance */;
+                break;
+        }
+    }
+    _addViewToNativeVisualTree(child, atIndex = -1) {
+        const nativeView = this._view;
+        if (nativeView && child.nativeViewProtected) {
+            child._hasNativeView = true;
+            child._isMasonChild = true;
+            nativeView.addView(child.nativeViewProtected, atIndex ?? -1);
+            return true;
+        }
+        return false;
+    }
+}
 //# sourceMappingURL=index.android.js.map

package/index.android.js.map

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

package/index.d.ts

@@ -1,11 +1,11 @@
 import { CoreTypes } from '@nativescript/core';
 
-import { TSCViewBase } from './common';
+import { TextBase, ViewBase } from './common';
 import { LengthPercentage } from '@nativescript/core/css/parser';
 
-export type Length = CoreTypes.dip | CoreTypes.LengthDipUnit | CoreTypes.LengthPxUnit;
+export type Length = CoreTypes.dip | CoreTypes.LengthDipUnit | CoreTypes.LengthPxUnit | CoreTypes.LengthPercentUnit;
 
-export type LengthAuto = CoreTypes.dip | CoreTypes.LengthDipUnit | CoreTypes.LengthPxUnit | 'auto';
+export type LengthAuto = CoreTypes.dip | CoreTypes.LengthDipUnit | CoreTypes.LengthPxUnit | CoreTypes.LengthPercentUnit | 'auto';
 
 export type SizeLength = { width: LengthType; height: LengthType };
 
@@ -35,21 +35,19 @@ 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' | 'dense';
 
-export { applyMixins } from './helpers';
-
-export class TSCView extends TSCViewBase {
+export class View extends ViewBase {
   display: Display;
   position: Position;
   flexDirection: FlexDirection;
   flexWrap: FlexWrap;
   flex: string | 'auto' | 'none' | number | 'initial';
   flexFlow: string;
-  width: Length;
-  height: Length;
-  maxWidth: Length;
-  maxHeight: Length;
+  width: LengthAuto;
+  height: LengthAuto;
+  maxWidth: LengthAuto;
+  maxHeight: LengthAuto;
   left: Length;
   right: Length;
   top: Length;
@@ -61,7 +59,7 @@ export class TSCView extends TSCViewBase {
   aspectRatio: number;
   flexBasis: Length;
   alignItems: AlignItems;
-  alignSelf: import('@nativescript/core/ui/layouts/flexbox-layout').AlignSelf;
+  alignSelf: AlignSelf;
   alignContent: AlignContent;
   justifyItems: JustifyItems;
   justifySelf: JustifySelf;
@@ -86,13 +84,52 @@ export class TSCView extends TSCViewBase {
   scrollBarWidth: number | CoreTypes.LengthType;
 }
 
-export class Grid extends TSCView {}
-
-export class Flex extends TSCView {}
-
-export class Box extends TSCView {}
-
-export class Container extends TSCView {}
+export class Text extends TextBase {
+  display: Display;
+  position: Position;
+  flexDirection: FlexDirection;
+  flexWrap: FlexWrap;
+  flex: string | 'auto' | 'none' | number | 'initial';
+  flexFlow: string;
+  width: LengthAuto;
+  height: LengthAuto;
+  maxWidth: LengthAuto;
+  maxHeight: LengthAuto;
+  left: Length;
+  right: Length;
+  top: Length;
+  bottom: Length;
+  gridGap: Gap;
+  gap: Gap;
+  rowGap: Length;
+  columnGap: Length;
+  aspectRatio: number;
+  flexBasis: Length;
+  alignItems: AlignItems;
+  alignSelf: 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;
+}
 
 declare module '@nativescript/core/ui/styling/style' {
   interface Style {

package/index.ios.d.ts

@@ -1,30 +1,48 @@
-import { ViewBase } from '@nativescript/core';
-import { TSCViewBase } from './common';
-export declare class TSCView extends TSCViewBase {
-    __masonStylePtr: bigint;
-    __masonNodePtr: bigint;
-    __masonPtr: bigint;
-    get _masonStylePtr(): bigint;
-    get _masonNodePtr(): bigint;
-    get _masonPtr(): bigint;
+import { Color } from '@nativescript/core';
+import { MasonChild, style_, TextBase, ViewBase } from './common';
+export declare class Tree {
+    _base: NSCMason;
+    private static _tree;
+    constructor();
+    static get instance(): Tree;
+    get native(): NSCMason;
+    createView(): MasonUIView;
+    createTextView(): MasonText;
+}
+export declare class View extends ViewBase {
+    [style_]: any;
+    private _view;
+    constructor();
+    get _styleHelper(): any;
     _hasNativeView: boolean;
-    createNativeView(): UIView;
+    _inBatch: boolean;
+    createNativeView(): MasonUIView;
     disposeNativeView(): void;
-    get ios(): UIView;
+    get ios(): MasonUIView;
     onLayout(left: number, top: number, right: number, bottom: number): void;
     onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void;
-    layoutNativeView(): void;
-    _addViewToNativeVisualTree(view: ViewBase, atIndex?: number): boolean;
-    _removeViewFromNativeVisualTree(view: ViewBase): void;
-}
-export declare class Grid extends TSCView {
-    createNativeView(): any;
-}
-export declare class Flex extends TSCView {
-    createNativeView(): any;
-}
-export declare class Box extends TSCView {
-    createNativeView(): any;
+    _setNativeViewFrame(nativeView: any, frame: CGRect): void;
+    _addViewToNativeVisualTree(child: MasonChild, atIndex?: number): boolean;
+    _removeViewFromNativeVisualTree(view: MasonChild): void;
 }
-export declare class Container extends TSCView {
+export declare class Text extends TextBase {
+    [style_]: any;
+    _hasNativeView: boolean;
+    _inBatch: boolean;
+    _isText: boolean;
+    private _view;
+    constructor();
+    get ios(): MasonText;
+    get _styleHelper(): any;
+    createNativeView(): MasonText;
+    get text(): string;
+    set text(value: string);
+    set backgroundColor(value: Color | number);
+    get backgroundColor(): Color | number;
+    onLayout(left: number, top: number, right: number, bottom: number): void;
+    onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void;
+    _addViewToNativeVisualTree(child: MasonChild & {
+        text?: string;
+    }, atIndex?: number): boolean;
+    _setNativeViewFrame(nativeView: any, frame: CGRect): void;
 }