npm - @triniwiz/nativescript-masonkit - Versions diffs - 1.0.0-beta.121 → 1.0.0-beta.123 - Mend

@triniwiz/nativescript-masonkit 1.0.0-beta.121 → 1.0.0-beta.123

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (86) hide show

package/symbols.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 export declare const native_: unique symbol;
 export declare const style_: unique symbol;
+export declare const elementDisplay_: unique symbol;
 export declare const isTextChild_: unique symbol;
 export declare const isText_: unique symbol;
 export declare const isMasonView_: unique symbol;
@@ -23,3 +24,5 @@ export declare const borderRadiusCorners_: unique symbol;
 export declare const borderSideColors_: unique symbol;
 export declare const eventType_: unique symbol;
 export declare const touchAction_: unique symbol;
+/** Rewrites a view's logical borders, corners and overflow (and, unless passed false, its descendants') after its writing mode or direction changed. */
+export declare const remapLogicalBoxes_: unique symbol;

package/symbols.js CHANGED Viewed

@@ -1,5 +1,7 @@
 export const native_ = Symbol('[[native]]');
 export const style_ = Symbol('[[style]]');
+// On a mason Style: the element's own display, kept from before `display` was first set.
+export const elementDisplay_ = Symbol('[[elementDisplay]]');
 export const isTextChild_ = Symbol('[[isTextChild]]');
 export const isText_ = Symbol('[[isText]]');
 export const isMasonView_ = Symbol('[[isMasonView]]');
@@ -39,4 +41,6 @@ export const borderSideColors_ = Symbol('[[borderSideColors]]');
 // event on its way to JS listeners — see `Event` in `common.ts`.
 export const eventType_ = Symbol('[[eventType]]');
 export const touchAction_ = Symbol('[[touchAction]]');
+/** Rewrites a view's logical borders, corners and overflow (and, unless passed false, its descendants') after its writing mode or direction changed. */
+export const remapLogicalBoxes_ = Symbol('[[remapLogicalBoxes]]');
 //# sourceMappingURL=symbols.js.map

package/symbols.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"symbols.js","sourceRoot":"","sources":["../../../packages/nativescript-masonkit/symbols.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAC5C,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAC1C,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AACtD,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAC5C,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AACtD,MAAM,CAAC,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AACxC,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAC1D,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAChD,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAC1D,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAC9D,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AACxD,8EAA8E;AAC9E,2EAA2E;AAC3E,6EAA6E;AAC7E,QAAQ;AACR,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAC1D,8EAA8E;AAC9E,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAChD,6FAA6F;AAC7F,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAC1D,mGAAmG;AACnG,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAClD,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACpD,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACpD,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AACtD,sEAAsE;AACtE,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC;AAClE,8FAA8F;AAC9F,kFAAkF;AAClF,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAClD,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAEpE,mEAAmE;AACnE,mEAAmE;AACnE,6EAA6E;AAC7E,0CAA0C;AAC1C,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AACtE,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAEhE,yEAAyE;AACzE,iEAAiE;AACjE,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAElD,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC"}
1	+ {"version":3,"file":"symbols.js","sourceRoot":"","sources":["../../../packages/nativescript-masonkit/symbols.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAC5C,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAC1C,yFAAyF;AACzF,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAC5D,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AACtD,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAC5C,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AACtD,MAAM,CAAC,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AACxC,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAC1D,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAChD,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAC1D,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAC9D,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AACxD,8EAA8E;AAC9E,2EAA2E;AAC3E,6EAA6E;AAC7E,QAAQ;AACR,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAC1D,8EAA8E;AAC9E,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAChD,6FAA6F;AAC7F,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAC1D,mGAAmG;AACnG,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAClD,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACpD,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACpD,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AACtD,sEAAsE;AACtE,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC;AAClE,8FAA8F;AAC9F,kFAAkF;AAClF,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAClD,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAEpE,mEAAmE;AACnE,mEAAmE;AACnE,6EAA6E;AAC7E,0CAA0C;AAC1C,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AACtE,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAEhE,yEAAyE;AACzE,iEAAiE;AACjE,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAElD,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAEtD,wJAAwJ;AACxJ,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC"}

package/text/index.ios.js CHANGED Viewed

@@ -1,8 +1,6 @@
-import { Utils } from '@nativescript/core';
-import { TextBase, textContentProperty } from '../common';
+import { TextBase, textContentProperty, setMeasuredFromNative } from '../common';
 import { Style } from '../style';
 import { Tree } from '../tree';
-import { parseLength } from '../utils';
 import { isMasonView_, isPlaceholder_, isText_, isTextChild_, native_, style_ } from '../symbols';
 export class Text extends TextBase {
     constructor(type = 0) {
@@ -111,82 +109,8 @@ export class Text extends TextBase {
     onMeasure(widthMeasureSpec, heightMeasureSpec) {
         const nativeView = this._view;
         if (nativeView) {
-            const specWidth = Utils.layout.getMeasureSpecSize(widthMeasureSpec);
-            const widthMode = Utils.layout.getMeasureSpecMode(widthMeasureSpec);
-            const specHeight = Utils.layout.getMeasureSpecSize(heightMeasureSpec);
-            const heightMode = Utils.layout.getMeasureSpecMode(heightMeasureSpec);
-            const parentIsMason = this.parent && this.parent[isMasonView_];
-            if (!parentIsMason) {
-                const unconstrained = widthMode === Utils.layout.UNSPECIFIED || heightMode === Utils.layout.UNSPECIFIED || (widthMode === Utils.layout.AT_MOST && specWidth === 0) || (heightMode === Utils.layout.AT_MOST && specHeight === 0);
-                // Compute against the parent's bounds whenever the spec gives any; see
-                // view/index.ios.ts for why auto/auto doesn't matter here.
-                if (!unconstrained) {
-                    // auto/auto with concrete specs – delegate to computeWithSize
-                    // todo
-                    // @ts-ignore
-                    this.ios.mason_computeWithSize(specWidth, specHeight);
-                    // Claim this root for the host's spec; see view/index.ios.ts.
-                    // @ts-ignore
-                    this.ios.mason_markRootComputeAppliedWithSize(specWidth, specHeight);
-                    //this.ios.computeWithMaxContent();
-                    // todo
-                    // @ts-ignore
-                    var layout = this.ios.node.computedLayout;
-                    const w = Utils.layout.makeMeasureSpec(layout.width, Utils.layout.EXACTLY);
-                    const h = Utils.layout.makeMeasureSpec(layout.height, Utils.layout.EXACTLY);
-                    this.setMeasuredDimension(w, h);
-                    return;
-                }
-                else {
-                    // either we have an explicit size or no constraint – measure by
-                    // max-content so we don't collapse when the root is unconstrained.
-                    let width;
-                    switch (typeof this.width) {
-                        case 'object': {
-                            const parent = this.parent;
-                            const mw = parent?.getMeasuredWidth?.() || Utils.layout.toDevicePixels(parent?.nativeView?.frame?.size?.width ?? 0);
-                            width = parseLength(this.width, mw);
-                            break;
-                        }
-                        case 'string':
-                            width = -2;
-                            break;
-                        case 'number':
-                            width = Utils.layout.toDevicePixels(this.width);
-                            break;
-                    }
-                    let height;
-                    switch (typeof this.height) {
-                        case 'object': {
-                            const parent = this.parent;
-                            const mh = parent?.getMeasuredHeight?.() || Utils.layout.toDevicePixels(parent?.nativeView?.frame?.size?.height ?? 0);
-                            height = parseLength(this.height, mh);
-                            break;
-                        }
-                        case 'string':
-                            height = -2;
-                            break;
-                        case 'number':
-                            height = Utils.layout.toDevicePixels(this.height);
-                            break;
-                    }
-                    // todo
-                    // @ts-ignore
-                    this.ios.mason_computeWithSize(width, height);
-                    var layout = this.ios.node.computedLayout;
-                    const w = Utils.layout.makeMeasureSpec(layout.width, Utils.layout.EXACTLY);
-                    const h = Utils.layout.makeMeasureSpec(layout.height, Utils.layout.EXACTLY);
-                    this.setMeasuredDimension(w, h);
-                }
-            }
-            else {
-                // todo
-                // @ts-ignore
-                var layout = nativeView.node.computedLayout;
-                const w = Utils.layout.makeMeasureSpec(layout.width, Utils.layout.EXACTLY);
-                const h = Utils.layout.makeMeasureSpec(layout.height, Utils.layout.EXACTLY);
-                this.setMeasuredDimension(w, h);
-            }
+            // @ts-ignore
+            setMeasuredFromNative(this, nativeView.mason_measure(widthMeasureSpec, heightMeasureSpec, !this.parent?.[isMasonView_], false));
         }
     }
     // @ts-ignore

package/text/index.ios.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/text/index.ios.ts"],"names":[],"mappings":"~~AAAA~~,OAAO,EAAE,~~KAAK~~,~~EAAkB,MAAM,oBAAoB,CAAC;AAC3D,OAAO,~~EAAE,~~QAAQ~~,EAAE,~~mBAAmB~~,EAAE,MAAM,WAAW,CAAC;~~AAC1D~~,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,~~WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,~~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~~,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC~~;~~YAE/D~~,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,aAAa,GAAG,SAAS,KAAK,KAAK,CAAC,MAAM,CAAC,WAAW,IAAI,UAAU,KAAK,KAAK,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,MAAM,CAAC,OAAO,IAAI,SAAS,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,KAAK,KAAK,CAAC,MAAM,CAAC,OAAO,IAAI,UAAU,KAAK,CAAC,CAAC,CAAC;gBAEhO,uEAAuE;gBACvE,2DAA2D;gBAC3D,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,8DAA8D;oBAC9D,OAAO;oBACP,aAAa;oBACb,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,~~SAAS,EAAE,UAAU,CAAC,CAAC;oBACtD,8DAA8D;oBAC9D,aAAa;oBACb,~~IAAI,~~CAAC,GAAG,CAAC,oCAAoC,CAAC,SAAS,~~EAAE,UAAU,CAAC,~~CAAC;oBACrE,mCAAmC;oBAEnC,OAAO;oBACP,~~aAAa~~;oBACb~~,~~IAAI,MAAM,GAAG,IAAI,~~CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC;oBAE1C,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBAC3E,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBAE5E,IAAI,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBAChC,OAAO;gBACT,CAAC;qBAAM,CAAC;oBACN,gEAAgE;oBAChE,mEAAmE;oBACnE,IAAI,KAAK,CAAC;oBACV,QAAQ,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;wBAC1B,KAAK,QAAQ,CAAC,CAAC,CAAC;4BACd,MAAM,MAAM,GAAG,IAAI,CAAC,MAAa,CAAC;4BAClC,MAAM,EAAE,GAAG,MAAM,EAAE,gBAAgB,EAAE,EAAE,IAAI,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC;4BACpH,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;4BACpC,MAAM;wBACR,CAAC;wBACD,KAAK,QAAQ;4BACX,KAAK,GAAG,CAAC,CAAC,CAAC;4BACX,MAAM;wBACR,KAAK,QAAQ;4BACX,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;4BAChD,MAAM;oBACV,CAAC;oBAED,IAAI,MAAM,CAAC;oBACX,QAAQ,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;wBAC3B,KAAK,QAAQ,CAAC,CAAC,CAAC;4BACd,MAAM,MAAM,GAAG,IAAI,CAAC,MAAa,CAAC;4BAClC,MAAM,EAAE,GAAG,MAAM,EAAE,iBAAiB,EAAE,~~EAAE,IAAI,KAAK,~~CAAC,~~MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,~~IAAI,~~EAAE,MAAM,IAAI,~~CAAC,~~CAAC,CAAC;4BACtH,~~MAAM,~~GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,~~EAAE,~~EAAE,~~CAAC,~~CAAC;4BACtC~~,~~MAAM;wBACR,~~CAAC~~;wBAED~~,KAAK,QAAQ;4BACX,MAAM,GAAG,CAAC,CAAC,CAAC;4BACZ,MAAM;wBACR,KAAK,QAAQ;4BACX,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;4BAClD,MAAM;oBACV,CAAC;oBAED,OAAO;oBACP,aAAa;oBACb,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,KAAK,EAAE,~~MAAM,CAAC,CAAC;oBAE9C,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC;oBAE1C,MAAM,CAAC,GAAG,~~KAAK,CAAC,~~MAAM,~~CAAC,~~eAAe,~~CAAC~~,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC~~;~~oBAC3E~~,~~MAAM,~~CAAC~~,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC~~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"}
1	+ {"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/text/index.ios.ts"],"names":[],"mappings":"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"}

package/text/index.windows.js CHANGED Viewed

@@ -43,10 +43,11 @@ export class Text extends TextBase {
             if (ua[0] > 0)
                 style.fontSize = ua[0];
             if (!Tree.instance.preflight) {
-                style.marginTop = ua[1];
-                style.marginBottom = ua[2];
-                style.marginLeft = ua[3];
-                style.marginRight = ua[4];
+                // margin-block and margin-inline, so vertical text gets them on its left and right.
+                style.setLogical('margin', 0, ua[1]);
+                style.setLogical('margin', 1, ua[4]);
+                style.setLogical('margin', 2, ua[2]);
+                style.setLogical('margin', 3, ua[3]);
             }
         }
         if (tag === 'li') {

package/text/index.windows.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.windows.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/text/index.windows.ts"],"names":[],"mappings":"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~~SAAS~~,~~GAAG~~,EAAE,CAAC,CAAC,CAAC,CAAC;~~gBACxB~~,KAAK,CAAC,~~YAAY~~,~~GAAG~~,EAAE,CAAC,CAAC,CAAC,CAAC;~~gBAC3B~~,KAAK,CAAC,UAAU,~~GAAG~~,EAAE,CAAC,CAAC,CAAC,CAAC;~~gBACzB~~,KAAK,CAAC,~~WAAW~~,~~GAAG~~,EAAE,CAAC,CAAC,CAAC,CAAC;~~YAC5B~~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"}
1	+ {"version":3,"file":"index.windows.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/text/index.windows.ts"],"names":[],"mappings":"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"}

package/textarea/index.ios.js CHANGED Viewed

@@ -1,9 +1,10 @@
-import { CSSType, Utils } from '@nativescript/core';
+import { CSSType } from '@nativescript/core';
 import { isEnabledProperty } from '@nativescript/core/ui/core/view';
 import { TextAreaBase, rowsProperty, colsProperty, maxLengthProperty } from './common';
 import { defaultValueProperty, getValueProperty, setValueProperty, placeholderProperty } from '../input/common';
 import { style_, isMasonView_, native_ } from '../symbols';
 import { Tree } from '../tree';
+import { setMeasuredFromNative } from '../common';
 import { Style } from '../style';
 let TextArea = class TextArea extends TextAreaBase {
     constructor() {
@@ -71,67 +72,8 @@ let TextArea = class TextArea extends TextAreaBase {
     onMeasure(widthMeasureSpec, heightMeasureSpec) {
         const nativeView = this._view;
         if (nativeView) {
-            const specWidth = Utils.layout.getMeasureSpecSize(widthMeasureSpec);
-            const widthMode = Utils.layout.getMeasureSpecMode(widthMeasureSpec);
-            const specHeight = Utils.layout.getMeasureSpecSize(heightMeasureSpec);
-            const heightMode = Utils.layout.getMeasureSpecMode(heightMeasureSpec);
-            if (!this[isMasonView_]) {
-                const unconstrained = widthMode === Utils.layout.UNSPECIFIED || heightMode === Utils.layout.UNSPECIFIED || (widthMode === Utils.layout.AT_MOST && specWidth === 0) || (heightMode === Utils.layout.AT_MOST && specHeight === 0);
-                // Compute against the parent's bounds whenever the spec gives any; see
-                // view/index.ios.ts for why auto/auto doesn't matter here.
-                if (!unconstrained) {
-                    // @ts-ignore
-                    this.ios.mason_computeWithSize(specWidth, specHeight);
-                    // Claim this root for the host's spec; see view/index.ios.ts.
-                    // @ts-ignore
-                    this.ios.mason_markRootComputeAppliedWithSize(specWidth, specHeight);
-                    // @ts-ignore
-                    const layout = this.ios.node.computedLayout;
-                    const w = Utils.layout.makeMeasureSpec(layout.width, Utils.layout.EXACTLY);
-                    const h = Utils.layout.makeMeasureSpec(layout.height, Utils.layout.EXACTLY);
-                    this.setMeasuredDimension(w, h);
-                    return;
-                }
-                else {
-                    // @ts-ignore
-                    this.ios.mason_computeWithMaxContent();
-                    // @ts-ignore
-                    const layout = this.ios.node.computedLayout;
-                    const w = Utils.layout.makeMeasureSpec(layout.width, Utils.layout.EXACTLY);
-                    const h = Utils.layout.makeMeasureSpec(layout.height, Utils.layout.EXACTLY);
-                    this.setMeasuredDimension(w, h);
-                }
-            }
-            else {
-                // @ts-ignore
-                let layout = this.ios.node.computedLayout;
-                /*
-                // If the parent Mason document hasn't run a compute pass yet,
-                // computedLayout is still MasonLayout.empty (0×0).  Trigger a compute
-                // now so NativeScript never assigns a zero frame to this view, which
-                // would make it invisible (UIScrollView.clipsToBounds = true).
-                if (layout.width === 0 && layout.height === 0) {
-                  const unconstrained =
-                    widthMode === Utils.layout.UNSPECIFIED ||
-                    heightMode === Utils.layout.UNSPECIFIED ||
-                    (widthMode === Utils.layout.AT_MOST && specWidth === 0) ||
-                    (heightMode === Utils.layout.AT_MOST && specHeight === 0);
-                  if (!unconstrained) {
-                    // @ts-ignore
-                    this.ios.mason_computeWithSize(specWidth, specHeight);
-                  } else {
-                    // @ts-ignore
-                    this.ios.mason_computeWithMaxContent();
-                  }
-                  // @ts-ignore
-                  layout = this.ios.node.computedLayout;
-                }
-                */
-                const w = Utils.layout.makeMeasureSpec(layout.width, Utils.layout.EXACTLY);
-                const h = Utils.layout.makeMeasureSpec(layout.height, Utils.layout.EXACTLY);
-                this.setMeasuredDimension(w, h);
-            }
+            // @ts-ignore
+            setMeasuredFromNative(this, nativeView.mason_measure(widthMeasureSpec, heightMeasureSpec, !this.parent?.[isMasonView_], false));
         }
     }
     _setNativeViewFrame(nativeView, frame) {

package/textarea/index.ios.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/textarea/index.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,~~KAAK,EAAE,~~MAAM,oBAAoB,CAAC;~~AACpD~~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~~gBAEhO~~,~~uEAAuE;gBACvE,2DAA2D;gBAC3D,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,aAAa;oBACb,IAAI,CAAC,GAAG,CAAC,~~qBAAqB,CAAC,~~SAAS,EAAE,UAAU,CAAC,CAAC;oBACtD,8DAA8D;oBAC9D,aAAa;oBACb,~~IAAI,~~CAAC,GAAG,CAAC,oCAAoC,CAAC,SAAS,~~EAAE,UAAU,CAAC,~~CAAC;oBACrE,~~aAAa~~;oBACb~~,~~MAAM,MAAM,GAAG,IAAI,~~CAAC,~~GAAG~~,~~CAAC,IAAI,CAAC,cAAc,CAAC;oBAE5C,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,~~EAAE,~~KAAK~~,~~CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBAC3E,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,~~EAAE,~~KAAK,~~CAAC,~~MAAM,CAAC,OAAO,CAAC,CAAC;oBAE5E,~~IAAI,CAAC,~~oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBAChC,OAAO;gBACT,CAAC;qBAAM,CAAC;oBACN,aAAa;oBACb,IAAI,CAAC,GAAG,CAAC,2BAA2B,EAAE,CAAC;oBACvC,aAAa;oBACb,~~MAAM,~~MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC;oBAE5C,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,~~EAAE,~~KAAK,~~CAAC,~~MAAM~~,CAAC,~~OAAO,CAAC,CAAC;oBAC3E,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,~~EAAE,KAAK,CAAC,~~MAAM,~~CAAC,~~OAAO,~~CAAC~~,CAAC~~;~~oBAE5E~~,~~IAAI,~~CAAC~~,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC~~;gBAClC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,aAAa;gBACb,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC;gBAE1C;;;;;;;;;;;;;;;;;;;;;;kBAsBE;gBAEF,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC3E,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC5E,IAAI,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IAED,mBAAmB,CAAC,UAAe,EAAE,KAAa;QAChD,4BAA4B;IAC9B,CAAC;CACF,CAAA;~~AA1JY~~,QAAQ;IADpB,OAAO,CAAC,UAAU,CAAC;;GACP,QAAQ,~~CA0JpB~~"}
1	+ {"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/textarea/index.ios.ts"],"names":[],"mappings":"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"}

package/typings/objc!Mason.d.ts CHANGED Viewed

@@ -3792,6 +3792,8 @@ declare class NSCMason extends NSObject {
 	layoutForView(view: UIView): MasonLayout;
+	invalidateForeignView(view: UIView): void;
 	nodeForView(view: UIView, isLeaf: boolean): MasonNode;
 	printTree(node: MasonNode): void;

package/typings/objc!ObjectiveC.d.ts CHANGED Viewed

@@ -693,6 +693,8 @@ declare class NSObject implements NSObjectProtocol {
 	mason_computeWithSize(width: number, height: number): void;
+	mason_measure(widthSpec: number, heightSpec: number, root: boolean, viewport: boolean): number;
 	mason_computeWithViewSize(): void;
 	mason_computeWithViewSizeWithLayout(layout: boolean): void;

package/view/index.ios.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { CSSType, Utils } from '@nativescript/core';
-import { ViewBase, setRootNativeViewFrame } from '../common';
+import { CSSType } from '@nativescript/core';
+import { ViewBase, setRootNativeViewFrame, setMeasuredFromNative } from '../common';
 import { Style } from '../style';
 import { Tree } from '../tree';
 import { isMasonView_, isPlaceholder_, native_, style_ } from '../symbols';
@@ -53,60 +53,12 @@ let View = class View extends ViewBase {
     onMeasure(widthMeasureSpec, heightMeasureSpec) {
         const nativeView = this._view;
         if (nativeView) {
-            const specWidth = Utils.layout.getMeasureSpecSize(widthMeasureSpec);
-            const widthMode = Utils.layout.getMeasureSpecMode(widthMeasureSpec);
-            const specHeight = Utils.layout.getMeasureSpecSize(heightMeasureSpec);
-            const heightMode = Utils.layout.getMeasureSpecMode(heightMeasureSpec);
-            const parentIsMason = this.parent && this.parent[isMasonView_];
-            if (!parentIsMason) {
-                if (pendingAddHosts > 0)
-                    flushNativeAddsDeep(this);
-                const unconstrained = widthMode === Utils.layout.UNSPECIFIED || heightMode === Utils.layout.UNSPECIFIED || (widthMode === Utils.layout.AT_MOST && specWidth === 0) || (heightMode === Utils.layout.AT_MOST && specHeight === 0);
-                // Compute against the spec's bounds whenever it gives any; max-content only when it doesn't.
-                if (!unconstrained) {
-                    // we have explicit constraints from the spec, use them
-                    // @ts-ignore
-                    this.ios.mason_computeWithSize(specWidth, specHeight);
-                    // Tell autoComputeIfRoot this parent size is already handled (so
-                    // setting our frame below doesn't trigger a redundant native
-                    // compute+apply pass), and hand it the spec — not always the
-                    // superview's bounds, e.g. a Page measures against the safe area.
-                    // @ts-ignore
-                    this.ios.mason_markRootComputeAppliedWithSize(specWidth, specHeight);
-                    // computeWithSize already applied the layout natively and cached it
-                    // on the node — read it back instead of paying for another native
-                    // round trip via mason_layout().
-                    // @ts-ignore
-                    const layout = this.ios.node.computedLayout;
-                    const w = Utils.layout.makeMeasureSpec(layout.width, Utils.layout.EXACTLY);
-                    const h = Utils.layout.makeMeasureSpec(layout.height, Utils.layout.EXACTLY);
-                    this.setMeasuredDimension(w, h);
-                    return;
-                }
-                else {
-                    // Nothing definite to resolve against: measure by max-content so we
-                    // don't accidentally collapse to zero.
-                    // @ts-ignore
-                    this.ios.mason_computeWithMaxContent();
-                    // Same as above: prevent autoComputeIfRoot from immediately
-                    // overriding this max-content measurement with a constrained
-                    // compute against the parent's exact bounds.
-                    // @ts-ignore
-                    this.ios.mason_markRootComputeApplied();
-                    // @ts-ignore
-                    const layout = this.ios.node.computedLayout;
-                    const w = Utils.layout.makeMeasureSpec(layout.width, Utils.layout.EXACTLY);
-                    const h = Utils.layout.makeMeasureSpec(layout.height, Utils.layout.EXACTLY);
-                    this.setMeasuredDimension(w, h);
-                }
-            }
-            else {
-                // @ts-ignore
-                const layout = this.ios.node.computedLayout;
-                const w = Utils.layout.makeMeasureSpec(layout.width, Utils.layout.EXACTLY);
-                const h = Utils.layout.makeMeasureSpec(layout.height, Utils.layout.EXACTLY);
-                this.setMeasuredDimension(w, h);
-            }
+            const root = !this.parent?.[isMasonView_];
+            if (root && pendingAddHosts > 0)
+                flushNativeAddsDeep(this);
+            // One native call computes a root for the host's specs, or reads a child's placed box.
+            // @ts-ignore
+            setMeasuredFromNative(this, nativeView.mason_measure(widthMeasureSpec, heightMeasureSpec, root, false));
         }
     }
     _setNativeViewFrame(nativeView, frame) {

package/view/index.ios.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/view/index.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,~~KAAK,EAAE,~~MAAM,oBAAoB,CAAC;~~AACpD~~,OAAO,EAAE,QAAQ,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;~~AAC7D~~,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAE3E,gFAAgF;AAChF,IAAI,eAAe,GAAG,CAAC,CAAC;AAExB,SAAS,mBAAmB,CAAC,IAAS;IACpC,IAAI,CAAC,qBAAqB,EAAE,EAAE,CAAC;IAC/B,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,KAAU,EAAE,EAAE;QAClC,IAAI,KAAK,CAAC,YAAY,CAAC;YAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAGM,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,QAAQ;IAEhC;QACE,KAAK,EAAE,CAAC;QAoBV,aAAQ,GAAG,KAAK,CAAC;~~QAoIT~~,sBAAiB,GAAG,CAAC,CAAC;~~QAvJ5B~~,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;IAC5B,CAAC;IAED,IAAI,KAAK;QACP,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACnB,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAW,CAAC;YACjD,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;YACrB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAyB,CAAC;IAC/C,CAAC;IAED,IAAI,YAAY;QACd,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,SAAS,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAa,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;IAID,gBAAgB;QACd,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,6DAA6D;IAC7D,aAAa;IACb,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEM,QAAQ,CAAC,IAAY,EAAE,GAAW,EAAE,KAAa,EAAE,MAAc;QACtE,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACzC,qEAAqE;QACrE,4CAA4C;QAC5C,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC/B,IAAI,CAAC,8BAA8B,EAAE,CAAC;QACxC,CAAC;IACH,CAAC;IAEM,SAAS,CAAC,gBAAwB,EAAE,iBAAyB;QAClE,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC;QAC9B,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,~~SAAS~~,GAAG,~~KAAK,~~CAAC,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;YACpE,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;YACpE,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;YACtE,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;YAEtE,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,~~IAAI~~,~~IAAI,~~CAAC,~~MAAM,CAAC,~~YAAY,CAAC,CAAC;~~YAC/D~~,IAAI,~~CAAC~~,~~aAAa,EAAE,CAAC;gBACnB,~~IAAI,eAAe,GAAG,CAAC;~~oBAAE~~,mBAAmB,CAAC,IAAI,CAAC,CAAC;~~gBACnD~~,MAAM,aAAa,GAAG,SAAS,KAAK,KAAK,CAAC,MAAM,CAAC,WAAW,IAAI,UAAU,KAAK,KAAK,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,MAAM,CAAC,OAAO,IAAI,SAAS,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,KAAK,KAAK,CAAC,MAAM,CAAC,OAAO,IAAI,UAAU,KAAK,CAAC,CAAC,CAAC;~~gBAEhO~~,~~6FAA6F;gBAC7F,IAAI,CAAC,~~aAAa~~,EAAE,CAAC~~;~~oBACnB~~,~~uDAAuD;oBACvD,aAAa;oBACb,IAAI,CAAC,GAAG,CAAC,~~qBAAqB,CAAC,~~SAAS,EAAE,UAAU,CAAC,CAAC;oBACtD,iEAAiE;oBACjE,6DAA6D;oBAC7D,6DAA6D;oBAC7D,kEAAkE;oBAClE,aAAa;oBACb,~~IAAI,~~CAAC,GAAG,CAAC,oCAAoC,CAAC,SAAS,~~EAAE,UAAU,CAAC,~~CAAC;oBAErE,oEAAoE;oBACpE,kEAAkE;oBAClE,iCAAiC;oBACjC,~~aAAa~~;oBACb~~,~~MAAM,MAAM,GAAG,IAAI,~~CAAC,~~GAAG~~,~~CAAC,IAAI,CAAC,cAAc,CAAC;oBAE5C,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,~~EAAE,~~KAAK~~,~~CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBAC3E,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,~~EAAE,~~KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBAE5E,~~IAAI,~~CAAC,oBAAoB,CAAC,CAAC,~~EAAE,CAAC,CAAC,CAAC;oBAChC,OAAO;gBACT,CAAC;qBAAM,CAAC;oBACN,oEAAoE;oBACpE,uCAAuC;oBACvC,aAAa;oBACb,IAAI,CAAC,GAAG,CAAC,2BAA2B,EAAE,CAAC;oBACvC,4DAA4D;oBAC5D,6DAA6D;oBAC7D,6CAA6C;oBAC7C,aAAa;oBACb,IAAI,CAAC,GAAG,CAAC,4BAA4B,EAAE,CAAC;oBACxC,aAAa;oBACb,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC;oBAE5C,MAAM,CAAC,GAAG,KAAK,CAAC,~~MAAM,~~CAAC,~~eAAe,~~CAAC~~,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC~~;~~oBAC3E~~,~~MAAM,~~CAAC~~,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC~~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~~AAvMY~~,IAAI;IADhB,OAAO,CAAC,MAAM,CAAC;;GACH,IAAI,~~CAuMhB~~"}
1	+ {"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/view/index.ios.ts"],"names":[],"mappings":"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"}

package/vue/src/mason-meta.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mason-meta.d.ts","sourceRoot":"","sources":["../../../../../packages/nativescript-masonkit/vue/src/mason-meta.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,kBAAkB,CAAC;~~AAoChE~~;;;GAGG;AACH,eAAO,MAAM,SAAS,EAAE,OAAO,CAAC,WAAW,CA4B1C,CAAC"}
1	+ {"version":3,"file":"mason-meta.d.ts","sourceRoot":"","sources":["../../../../../packages/nativescript-masonkit/vue/src/mason-meta.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAqChE;;;GAGG;AACH,eAAO,MAAM,SAAS,EAAE,OAAO,CAAC,WAAW,CA4B1C,CAAC"}

package/vue/src/mason-meta.js CHANGED Viewed

@@ -1,13 +1,12 @@
-import { frameworkRegistry, readChildNodes } from '@triniwiz/nativescript-masonkit';
+import { frameworkRegistry, hasTextRun, readChildNodes } from '@triniwiz/nativescript-masonkit';
 /**
- * Nodes that occupy a slot in MasonKit's raw child list: elements and
- * non-empty text nodes. Empty text nodes (Vue's keyed-fragment anchors) get no
- * native text run, mirroring `textProperty.setNative` in the base package.
+ * Count existing raw slots. Framework text can exist before native load has
+ * built its run; counting that pending text shifts later element insertions.
  */
-function isVisualOrTextNode(node) {
+function occupiesRawSlot(node, children) {
     const t = node.nodeType;
     if (t === 'text' || t === 3) {
-        return (node.text ?? '') !== '';
+        return children ? hasTextRun(children, node) : (node.text ?? '') !== '';
     }
     return t === 'element' || t === 1;
 }
@@ -17,9 +16,11 @@ function rawChildIndex(parent, child) {
     const childIndex = childNodes.indexOf(child);
     if (childIndex < 0)
         return -1;
+    const children = parent.nativeView._children;
+    const raw = Array.isArray(children) ? children : undefined;
     let rawIndex = 0;
     for (let i = 0; i < childIndex; i++) {
-        if (isVisualOrTextNode(childNodes[i]))
+        if (occupiesRawSlot(childNodes[i], raw))
             rawIndex++;
     }
     return rawIndex;

package/vue/src/mason-meta.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mason-meta.js","sourceRoot":"","sources":["../../../../../packages/nativescript-masonkit/vue/src/mason-meta.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;~~AASpF;;;;GAIG~~;AACH,SAAS,~~kBAAkB~~,CAAC,IAA4C;~~IACtE~~,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;IACxB,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;~~IAClC~~,CAAC;IACD,OAAO,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,CAAC;AACpC,CAAC;AAED,gFAAgF;AAChF,SAAS,aAAa,CAAC,MAAkB,EAAE,KAAiB;IAC1D,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;IAC3C,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7C,IAAI,UAAU,GAAG,CAAC;QAAE,OAAO,CAAC,CAAC,CAAC;IAE9B,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,IAAI,~~kBAAkB~~,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAAE,QAAQ,EAAE,CAAC;~~IACpD~~,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,SAAS,GAAyB;IAC7C,OAAO,EAAE;QACP,MAAM,CAAC,KAAiB,EAAE,MAAkB,EAAE,OAAgB;YAC5D,MAAM,UAAU,GAAG,MAAM,CAAC,UAA2B,CAAC;YACtD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAChC,wEAAwE;gBACxE,sDAAsD;gBACtD,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBACtC,OAAO;YACT,CAAC;YAED,uEAAuE;YACvE,6CAA6C;YAC7C,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAC3C,MAAM,QAAQ,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;YAE9C,uEAAuE;YACvE,sEAAsE;YACtE,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,QAAQ,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;gBACnF,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACxC,CAAC;iBAAM,CAAC;gBACN,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;QACD,MAAM,CAAC,KAAiB,EAAE,MAAkB;YACzC,MAAM,CAAC,UAA4B,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACrE,CAAC;KACF;CACF,CAAC;AAEF;;;;GAIG;AAEH,SAAS,aAAa,CAAC,IAAS;IAC9B,MAAM,OAAO,GAAG,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACnD,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,IAAI,GAAG,CAAC,WAAW,KAAK,YAAY,IAAI,GAAG,CAAC,WAAW,KAAK,EAAE,EAAE,CAAC;YAC/D,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YACrB,IAAI,EAAE,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC;gBACvC,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,iBAAiB,CAAC,QAAQ,CAAC;IACzB,IAAI,EAAE,kBAAkB;IACxB,UAAU,EAAE,aAAa;IACzB,WAAW,EAAE,cAAc;IAC3B,QAAQ,CAAC,IAAI;QACX,IAAI,IAAI,CAAC,QAAQ,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YACpD,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YACvD,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,oBAAoB,EAAE,IAAI;CAC3B,CAAC,CAAC"}
1	+ {"version":3,"file":"mason-meta.js","sourceRoot":"","sources":["../../../../../packages/nativescript-masonkit/vue/src/mason-meta.ts"],"names":[],"mappings":"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"}

package/web.js CHANGED Viewed

@@ -192,7 +192,7 @@ export { P };
 // position, so it lands inside whatever space the container's own padding
 // already pushed that child into; no separate per-item bookkeeping needed.
 function applyListUaDefaults(view) {
-    applyUaCss(view, { 'margin-top': 16, 'margin-bottom': 16, 'padding-left': 40 });
+    applyUaCss(view, { 'margin-block-start': 16, 'margin-block-end': 16, 'padding-inline-start': 40 });
 }
 let Ul = class Ul extends BlockElement {
     constructor() {
@@ -350,7 +350,7 @@ let Figure = class Figure extends BlockElement {
     constructor() {
         super();
         // Browser UA default: `margin: 1em 40px`.
-        applyUaCss(this, { 'margin-top': 16, 'margin-bottom': 16, 'margin-left': 40, 'margin-right': 40 });
+        applyUaCss(this, { 'margin-block-start': 16, 'margin-block-end': 16, 'margin-inline-start': 40, 'margin-inline-end': 40 });
     }
 };
 Figure = __decorate([
@@ -601,7 +601,7 @@ export { Hgroup };
 let Dl = class Dl extends BlockElement {
     constructor() {
         super();
-        applyUaCss(this, { 'margin-top': 16, 'margin-bottom': 16 });
+        applyUaCss(this, { 'margin-block-start': 16, 'margin-block-end': 16 });
     }
 };
 Dl = __decorate([
@@ -619,7 +619,7 @@ let Dd = class Dd extends BlockElement {
     constructor() {
         super();
         // Browser UA default: `margin-inline-start: 40px`.
-        applyUaCss(this, { 'margin-left': 40 });
+        applyUaCss(this, { 'margin-inline-start': 40 });
     }
 };
 Dd = __decorate([
@@ -658,8 +658,8 @@ let Hr = class Hr extends BlockElement {
         // 1px border. Mason has no `border-style: inset`, so a plain 1px top border
         // is the closest honest approximation.
         applyUaCss(this, {
-            'margin-top': 8,
-            'margin-bottom': 8,
+            'margin-block-start': 8,
+            'margin-block-end': 8,
             'border-top-width': 1,
             'border-top-style': 'solid',
             height: 0,