@triniwiz/nativescript-masonkit 1.0.0-alpha.2 → 1.0.0-alpha.21

package/index.android.js

@@ -1,95 +1,224 @@
-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, CSSType, Utils } from '@nativescript/core';
+import { TextBase, ViewBase, style_, textProperty, textWrapProperty, ImageBase, srcProperty } 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();
     }
-    get _masonStylePtr() {
-        if (this.__masonStylePtr === BigIntZero) {
-            this.__masonStylePtr = BigInt(this.android?.getMasonStylePtr?.()?.toString?.() ?? '0');
-        }
-        return this.__masonStylePtr;
+    static get instance() {
+        return _a._tree;
     }
-    get _masonNodePtr() {
-        if (this.__masonNodePtr === BigIntZero) {
-            this.__masonNodePtr = BigInt(this.android?.getMasonNodePtr?.()?.toString?.() ?? '0');
-        }
-        return this.__masonNodePtr;
+    get native() {
+        return this._base;
+    }
+    createView(context) {
+        return this.native.createView(context);
+    }
+    createTextView(context) {
+        return this.native.createTextView(context);
+    }
+    createImageView(context) {
+        return this.native.createImageView(context);
+    }
+}
+_a = Tree;
+(() => {
+    _a._tree = new _a();
+})();
+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.__masonPtr = BigInt(org.nativescript.mason.masonkit.Mason.getInstance().getNativePtr().toString());
+    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;
+    // @ts-ignore
+    _addViewToNativeVisualTree(child, atIndex = -1) {
+        const nativeView = this._view;
+        // @ts-ignore
         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;
     }
+    // @ts-ignore
     _removeViewFromNativeVisualTree(view) {
         view._masonParent = undefined;
         view._isMasonView = false;
         view._isMasonChild = false;
+        // @ts-ignore
         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);
+export class Text extends TextBase {
+    constructor(type = 0) {
+        super();
+        this._hasNativeView = false;
+        this._inBatch = false;
+        const context = Utils.android.getCurrentActivity() || Utils.android.getApplicationContext();
+        switch (type) {
+            case 0 /* TextType.None */:
+                this._view = Tree.instance.createTextView(context);
+                break;
+            case 1 /* TextType.P */:
+                this._view = Tree.instance.native.createTextView(context, org.nativescript.mason.masonkit.TextType.P);
+                break;
+            case 2 /* TextType.Span */:
+                this._view = Tree.instance.native.createTextView(context, org.nativescript.mason.masonkit.TextType.Span);
+                break;
+            case 3 /* TextType.Code */:
+                this._view = Tree.instance.native.createTextView(context, org.nativescript.mason.masonkit.TextType.Code);
+                break;
+            case 4 /* TextType.H1 */:
+                this._view = Tree.instance.native.createTextView(context, org.nativescript.mason.masonkit.TextType.H1);
+                break;
+            case 5 /* TextType.H2 */:
+                this._view = Tree.instance.native.createTextView(context, org.nativescript.mason.masonkit.TextType.H2);
+                break;
+            case 6 /* TextType.H3 */:
+                this._view = Tree.instance.native.createTextView(context, org.nativescript.mason.masonkit.TextType.H3);
+                break;
+            case 7 /* TextType.H4 */:
+                this._view = Tree.instance.native.createTextView(context, org.nativescript.mason.masonkit.TextType.H4);
+                break;
+            case 8 /* TextType.H5 */:
+                this._view = Tree.instance.native.createTextView(context, org.nativescript.mason.masonkit.TextType.H5);
+                break;
+            case 9 /* TextType.H6 */:
+                this._view = Tree.instance.native.createTextView(context, org.nativescript.mason.masonkit.TextType.H6);
+                break;
+            case 10 /* TextType.Li */:
+                this._view = Tree.instance.native.createTextView(context, org.nativescript.mason.masonkit.TextType.Li);
+                break;
+            case 11 /* TextType.Blockquote */:
+                this._view = Tree.instance.native.createTextView(context, org.nativescript.mason.masonkit.TextType.Blockquote);
+                break;
+            case 12 /* TextType.B */:
+                this._view = Tree.instance.native.createTextView(context, org.nativescript.mason.masonkit.TextType.B);
+                break;
+        }
         this._hasNativeView = true;
-        return view;
+        this[style_] = Style.fromView(this, 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_];
     }
-};
-Grid = __decorate([
-    CSSType('Grid')
-], Grid);
-export { Grid };
-let Flex = class Flex extends TSCView {
     createNativeView() {
-        const view = org.nativescript.mason.masonkit.View.createFlexView(this._context);
+        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;
+        }
+    }
+    // @ts-ignore
+    _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;
+    }
+}
+let Img = class Img extends ImageBase {
+    constructor() {
+        super();
+        this._hasNativeView = false;
+        this._inBatch = false;
+        const context = Utils.android.getCurrentActivity() || Utils.android.getApplicationContext();
+        this._view = Tree.instance.createImageView(context);
         this._hasNativeView = true;
-        return view;
+        this[style_] = Style.fromView(this, this._view);
+    }
+    // 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() {
+        return this._view;
+    }
+    [srcProperty.setNative](value) {
+        const nativeView = this._view;
+        if (nativeView) {
+            nativeView.setSrc(value);
+        }
     }
 };
-Flex = __decorate([
-    CSSType('Flex')
-], Flex);
-export { Flex };
-let Container = class Container extends TSCView {
-};
-Container = __decorate([
-    CSSType('Container')
-], Container);
-export { Container };
+Img = __decorate([
+    CSSType('img'),
+    __metadata("design:paramtypes", [])
+], Img);
+export { Img };
 //# 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":"AAAA,OAAO,EAAE,OAAO,EAAyB,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACpD,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,CAAC;AAEvB,MAAM,OAAO,OAAQ,SAAQ,WAAW;IAAxC;;QAIE,oBAAe,GAAG,UAAU,CAAC;QAQ7B,mBAAc,GAAG,UAAU,CAAC;QAQ5B,eAAU,GAAG,UAAU,CAAC;QAQxB,mBAAc,GAAG,KAAK,CAAC;QACvB,aAAQ,GAAG,KAAK,CAAC;IAyCnB,CAAC;IAjEC,IAAI,cAAc;QAChB,IAAI,IAAI,CAAC,eAAe,KAAK,UAAU,EAAE;YACvC,IAAI,CAAC,eAAe,GAAG,MAAM,CAAE,IAAI,CAAC,OAAe,EAAE,gBAAgB,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,GAAG,CAAC,CAAC;SACjG;QACD,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAGD,IAAI,aAAa;QACf,IAAI,IAAI,CAAC,cAAc,KAAK,UAAU,EAAE;YACtC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAE,IAAI,CAAC,OAAe,EAAE,eAAe,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,GAAG,CAAC,CAAC;SAC/F;QACD,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAGD,IAAI,SAAS;QACX,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,EAAE;YAClC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;SACzG;QACD,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAKD,gBAAgB;QACd,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAQ,CAAC;QAC5E,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iBAAiB;QACf,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,KAAK,CAAC,iBAAiB,EAAE,CAAC;IAC5B,CAAC;IAED,YAAY;IACZ,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,mBAA2D,CAAC;IAC1E,CAAC;IAEM,0BAA0B,CAAC,KAAe,EAAE,UAAkB,MAAM,CAAC,SAAS;QACnF,2CAA2C;QAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,mBAA2D,CAAC;QAEnF,KAAa,CAAC,YAAY,GAAG,IAAI,CAAC;QAEnC,IAAI,UAAU,IAAI,KAAK,CAAC,mBAAmB,EAAE;YAC3C,KAAK,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC;YAC/B,KAAK,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC;YAC7B,UAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC,CAAC;YAE3D,OAAO,IAAI,CAAC;SACb;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,+BAA+B,CAAC,IAAc;QAClD,IAAY,CAAC,YAAY,GAAG,SAAS,CAAC;QACtC,IAAY,CAAC,YAAY,GAAG,KAAK,CAAC;QAClC,IAAY,CAAC,aAAa,GAAG,KAAK,CAAC;QACpC,KAAK,CAAC,+BAA+B,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;CACF;AArEC;IACE,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AACzD,CAAC,GAAA,CAAA;AAsEI,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,OAAO;IAC/B,gBAAgB;QACd,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAQ,CAAC;QACvF,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AANY,IAAI;IADhB,OAAO,CAAC,MAAM,CAAC;GACH,IAAI,CAMhB;SANY,IAAI;AASV,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,OAAO;IAC/B,gBAAgB;QACd,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAQ,CAAC;QACvF,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AANY,IAAI;IADhB,OAAO,CAAC,MAAM,CAAC;GACH,IAAI,CAMhB;SANY,IAAI;AASV,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,OAAO;CAAG,CAAA;AAA5B,SAAS;IADrB,OAAO,CAAC,WAAW,CAAC;GACR,SAAS,CAAmB;SAA5B,SAAS"}
+{"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,16 +1,21 @@
 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 };
 
 export type Position = 'absolute' | 'relative';
 
-export type Display = 'none' | 'flex' | 'grid';
+export type Display = 'none' | 'flex' | 'grid' | 'block';
+
+export type BoxSizing = 'border-box' | 'content-box';
+
+export type Overflow = 'visible' | 'hidden' | 'scroll';
 
 export type FlexWrap = 'no-wrap' | 'wrap' | 'wrap-reverse';
 
@@ -32,17 +37,149 @@ export type JustifySelf = AlignSelf;
 
 export type JustifyContent = AlignContent;
 
-export type GridAutoFlow = 'row' | 'column' | 'row-dense' | 'column-dense';
-
-export { applyMixins } from './helpers';
-
-export class TSCView extends TSCViewBase {}
-
-export class Grid extends TSCView {}
+export type GridAutoFlow = 'row' | 'column' | 'row dense' | 'column dense' | 'dense';
+
+export class View extends ViewBase {
+  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;
+}
 
-export class Flex 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;
+}
 
-export class Container extends TSCView {}
+export class Img extends ViewBase {
+  src: string;
+  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 {
@@ -50,10 +187,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 +202,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 +223,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,27 +1,77 @@
-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;
+import { Color } from '@nativescript/core';
+import { MasonChild, style_, TextBase, ViewBase, ImageBase } from './common';
+declare const enum TextType {
+    None = 0,
+    P = 1,
+    Span = 2,
+    Code = 3,
+    H1 = 4,
+    H2 = 5,
+    H3 = 6,
+    H4 = 7,
+    H5 = 8,
+    H6 = 9,
+    Li = 10,
+    Blockquote = 11,
+    B = 12
+}
+export declare class Tree {
+    _base: NSCMason;
+    private static _tree;
+    constructor();
+    static get instance(): Tree;
+    get native(): NSCMason;
+    createView(): MasonUIView;
+    createTextView(): MasonText;
+    createImageView(): MasonImg;
+}
+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;
+    _setNativeViewFrame(nativeView: any, frame: CGRect): void;
+    _addViewToNativeVisualTree(child: MasonChild, atIndex?: number): boolean;
+    _removeViewFromNativeVisualTree(view: MasonChild): void;
 }
-export declare class Grid extends TSCView {
-    createNativeView(): any;
+export declare class Text extends TextBase {
+    [style_]: any;
+    _hasNativeView: boolean;
+    _inBatch: boolean;
+    _isText: boolean;
+    private _view;
+    constructor(type?: TextType);
+    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;
 }
-export declare class Flex extends TSCView {
+export declare class Img extends ImageBase {
+    [style_]: any;
+    _hasNativeView: boolean;
+    _inBatch: boolean;
+    private _view;
+    constructor();
+    get ios(): any;
+    get _styleHelper(): any;
     createNativeView(): any;
+    onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void;
+    _setNativeViewFrame(nativeView: any, frame: CGRect): void;
 }
-export declare class Container extends TSCView {
-}
+export {};