@triniwiz/nativescript-masonkit 1.0.0-beta.7 → 1.0.0-beta.71

package/text/index.android.js

@@ -1,56 +1,82 @@
-import { backgroundColorProperty, Color, colorProperty, CSSType, Utils } from '@nativescript/core';
-import { isMasonView_, isPlaceholder_, isTextChild_, style_, TextBase, textContentProperty, textWrapProperty } from '../common';
+import { CSSType, Utils } from '@nativescript/core';
+import { TextBase, textContentProperty } from '../common';
 import { Style } from '../style';
 import { Tree } from '../tree';
+import { style_, isMasonView_, isTextChild_, isPlaceholder_, native_ } from '../symbols';
 let Text = class Text extends TextBase {
     constructor(type = 0) {
         super();
         this._inBatch = false;
         this._type = type;
-        const context = Utils.android.getCurrentActivity() || Utils.android.getApplicationContext();
-        switch (type) {
-            case 0 /* TextType.None */:
-                this._view = Tree.instance.createTextView(context, 0 /* TextType.None */);
-                break;
-            case 1 /* TextType.P */:
-                this._view = Tree.instance.createTextView(context, 1 /* TextType.P */);
-                break;
-            case 2 /* TextType.Span */:
-                this._view = Tree.instance.createTextView(context, 2 /* TextType.Span */);
-                break;
-            case 3 /* TextType.Code */:
-                this._view = Tree.instance.createTextView(context, 3 /* TextType.Code */);
-                break;
-            case 4 /* TextType.H1 */:
-                this._view = Tree.instance.createTextView(context, 4 /* TextType.H1 */);
-                break;
-            case 5 /* TextType.H2 */:
-                this._view = Tree.instance.createTextView(context, 5 /* TextType.H2 */);
-                break;
-            case 6 /* TextType.H3 */:
-                this._view = Tree.instance.createTextView(context, 6 /* TextType.H3 */);
-                break;
-            case 7 /* TextType.H4 */:
-                this._view = Tree.instance.createTextView(context, 7 /* TextType.H4 */);
-                break;
-            case 8 /* TextType.H5 */:
-                this._view = Tree.instance.createTextView(context, 8 /* TextType.H5 */);
-                break;
-            case 9 /* TextType.H6 */:
-                this._view = Tree.instance.createTextView(context, 9 /* TextType.H6 */);
-                break;
-            case 10 /* TextType.Li */:
-                this._view = Tree.instance.createTextView(context, 10 /* TextType.Li */);
-                break;
-            case 11 /* TextType.Blockquote */:
-                this._view = Tree.instance.createTextView(context, 11 /* TextType.Blockquote */);
-                break;
-            case 12 /* TextType.B */:
-                this._view = Tree.instance.createTextView(context, 12 /* TextType.B */);
-                break;
-        }
         this[isMasonView_] = true;
-        this[style_] = Style.fromView(this, this._view);
+    }
+    get _view() {
+        if (!this[native_]) {
+            const context = Utils.android.getCurrentActivity() || Utils.android.getApplicationContext();
+            let view;
+            switch (this._type) {
+                case 0 /* TextType.None */:
+                    view = Tree.instance.createTextView(context, 0 /* TextType.None */);
+                    break;
+                case 1 /* TextType.P */:
+                    view = Tree.instance.createTextView(context, 1 /* TextType.P */);
+                    break;
+                case 2 /* TextType.Span */:
+                    view = Tree.instance.createTextView(context, 2 /* TextType.Span */);
+                    break;
+                case 3 /* TextType.Code */:
+                    view = Tree.instance.createTextView(context, 3 /* TextType.Code */);
+                    break;
+                case 4 /* TextType.H1 */:
+                    view = Tree.instance.createTextView(context, 4 /* TextType.H1 */);
+                    break;
+                case 5 /* TextType.H2 */:
+                    view = Tree.instance.createTextView(context, 5 /* TextType.H2 */);
+                    break;
+                case 6 /* TextType.H3 */:
+                    view = Tree.instance.createTextView(context, 6 /* TextType.H3 */);
+                    break;
+                case 7 /* TextType.H4 */:
+                    view = Tree.instance.createTextView(context, 7 /* TextType.H4 */);
+                    break;
+                case 8 /* TextType.H5 */:
+                    view = Tree.instance.createTextView(context, 8 /* TextType.H5 */);
+                    break;
+                case 9 /* TextType.H6 */:
+                    view = Tree.instance.createTextView(context, 9 /* TextType.H6 */);
+                    break;
+                case 10 /* TextType.Li */:
+                    view = Tree.instance.createTextView(context, 10 /* TextType.Li */);
+                    break;
+                case 11 /* TextType.Blockquote */:
+                    view = Tree.instance.createTextView(context, 11 /* TextType.Blockquote */);
+                    break;
+                case 12 /* TextType.B */:
+                    view = Tree.instance.createTextView(context, 12 /* TextType.B */);
+                    break;
+                case 13 /* TextType.Pre */:
+                    view = Tree.instance.createTextView(context, 13 /* TextType.Pre */);
+                    break;
+                case 14 /* TextType.Strong */:
+                    view = Tree.instance.createTextView(context, 14 /* TextType.Strong */);
+                    break;
+                case 15 /* TextType.Em */:
+                    view = Tree.instance.createTextView(context, 15 /* TextType.Em */);
+                    break;
+                case 16 /* TextType.I */:
+                    view = Tree.instance.createTextView(context, 16 /* TextType.I */);
+                    break;
+                case 17 /* TextType.A */:
+                    view = Tree.instance.createTextView(context, 17 /* TextType.A */);
+                    break;
+                default:
+                    view = Tree.instance.createTextView(context, 0 /* TextType.None */);
+                    break;
+            }
+            this[native_] = view;
+            return view;
+        }
+        return this[native_];
     }
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
@@ -72,48 +98,32 @@ let Text = class Text extends TextBase {
             nativeView.setTextContent(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[isTextChild_] = true;
-            const index = atIndex <= -1 ? this._children.indexOf(child) : atIndex;
+            const jsIndex = atIndex <= -1 ? this._children.indexOf(child) : atIndex;
+            // Fall back to addView (append) only when the child is genuinely not
+            // tracked yet; otherwise map the JS index onto the native children list
+            // (views attach lazily, so the raw index can run ahead of native state).
+            if (jsIndex <= -1) {
+                child._isMasonChild = true;
+                nativeView.addView(child.nativeViewProtected);
+                return true;
+            }
+            const index = this._nativeIndexFor(jsIndex);
+            child._isMasonChild = true;
             nativeView.addChildAt(child.nativeViewProtected, index);
+            return true;
         }
         return false;
     }
     _removeViewFromNativeVisualTree(view) {
         view[isTextChild_] = false;
+        // todo: remove from native view
         // @ts-ignore
-        super._removeViewFromNativeVisualTree(view);
+        // super._removeViewFromNativeVisualTree(view);
     }
 };
 Text = __decorate([
@@ -142,34 +152,6 @@ export class Br extends TextBase {
         return this[style_];
     }
     [textContentProperty.setNative](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;
@@ -183,7 +165,7 @@ export class Br extends TextBase {
     _removeViewFromNativeVisualTree(view) {
         view[isTextChild_] = false;
         // @ts-ignore
-        super._removeViewFromNativeVisualTree(view);
+        // super._removeViewFromNativeVisualTree(view);
     }
 }
 //# sourceMappingURL=index.android.js.map

package/text/index.android.js.map

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

package/text/index.ios.d.ts

@@ -1,6 +1,7 @@
-import { Color, ViewBase } from '@nativescript/core';
-import { style_, TextBase } from '../common';
+import { ViewBase } from '@nativescript/core';
+import { TextBase } from '../common';
 import { Style } from '../style';
+import { style_ } from '../symbols';
 declare const enum TextType {
     None = 0,
     P = 1,
@@ -15,25 +16,29 @@ declare const enum TextType {
     Li = 10,
     Blockquote = 11,
     B = 12,
-    Pre = 13
+    Pre = 13,
+    Strong = 14,
+    Em = 15,
+    I = 16,
+    A = 17
 }
 export declare class Text extends TextBase {
     [style_]: any;
     _inBatch: boolean;
-    private _view;
+    private _type;
     constructor(type?: TextType);
-    get ios(): MasonText;
+    get _view(): any;
+    get ios(): any;
     get _styleHelper(): Style;
-    createNativeView(): MasonText;
-    set backgroundColor(value: Color | number);
-    get backgroundColor(): Color | number;
+    createNativeView(): any;
+    _setNativeViewFrame(nativeView: any, frame: CGRect): void;
+    private _measureChildren;
     onLayout(left: number, top: number, right: number, bottom: number): void;
     onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void;
     _addViewToNativeVisualTree(child: MasonChild & {
         text?: string;
     }, atIndex?: number): boolean;
     _removeViewFromNativeVisualTree(view: ViewBase): void;
-    _setNativeViewFrame(nativeView: any, frame: CGRect): void;
 }
 export declare class Br extends TextBase {
     [style_]: any;
@@ -42,7 +47,5 @@ export declare class Br extends TextBase {
     constructor();
     get ios(): any;
     get _styleHelper(): Style;
-    set backgroundColor(value: Color | number);
-    get backgroundColor(): Color | number;
 }
 export {};