@nativescript/core 9.1.0-dev.0 → 9.1.0-next.2

package/ui/label/index.ios.js

@@ -1,5 +1,5 @@
 import { Background } from '../styling/background';
-import { borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, paddingLeftProperty, directionProperty } from '../styling/style-properties';
+import { borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty, directionProperty, paddingInternalProperty } from '../styling/style-properties';
 import { booleanConverter } from '../core/view-base';
 import { View, CSSType } from '../core/view';
 import { CoreTypes } from '../../core-types';
@@ -148,82 +148,50 @@ let Label = class Label extends TextBase {
     [borderTopWidthProperty.setNative](value) {
         const nativeView = this.nativeTextViewProtected;
         const border = nativeView.borderThickness;
-        nativeView.borderThickness = {
+        nativeView.borderThickness = new UIEdgeInsets({
             top: layout.toDeviceIndependentPixels(this.effectiveBorderTopWidth),
             right: border.right,
             bottom: border.bottom,
             left: border.left,
-        };
+        });
     }
     [borderRightWidthProperty.setNative](value) {
         const nativeView = this.nativeTextViewProtected;
         const border = nativeView.borderThickness;
-        nativeView.borderThickness = {
+        nativeView.borderThickness = new UIEdgeInsets({
             top: border.top,
             right: layout.toDeviceIndependentPixels(this.effectiveBorderRightWidth),
             bottom: border.bottom,
             left: border.left,
-        };
+        });
     }
     [borderBottomWidthProperty.setNative](value) {
         const nativeView = this.nativeTextViewProtected;
         const border = nativeView.borderThickness;
-        nativeView.borderThickness = {
+        nativeView.borderThickness = new UIEdgeInsets({
             top: border.top,
             right: border.right,
             bottom: layout.toDeviceIndependentPixels(this.effectiveBorderBottomWidth),
             left: border.left,
-        };
+        });
     }
     [borderLeftWidthProperty.setNative](value) {
         const nativeView = this.nativeTextViewProtected;
         const border = nativeView.borderThickness;
-        nativeView.borderThickness = {
+        nativeView.borderThickness = new UIEdgeInsets({
             top: border.top,
             right: border.right,
             bottom: border.bottom,
             left: layout.toDeviceIndependentPixels(this.effectiveBorderLeftWidth),
-        };
+        });
     }
-    [paddingTopProperty.setNative](value) {
-        const nativeView = this.nativeTextViewProtected;
-        const padding = nativeView.padding;
-        nativeView.padding = {
+    [paddingInternalProperty.setNative](_value) {
+        this.nativeTextViewProtected.padding = new UIEdgeInsets({
             top: layout.toDeviceIndependentPixels(this.effectivePaddingTop),
-            right: padding.right,
-            bottom: padding.bottom,
-            left: padding.left,
-        };
-    }
-    [paddingRightProperty.setNative](value) {
-        const nativeView = this.nativeTextViewProtected;
-        const padding = nativeView.padding;
-        nativeView.padding = {
-            top: padding.top,
             right: layout.toDeviceIndependentPixels(this.effectivePaddingRight),
-            bottom: padding.bottom,
-            left: padding.left,
-        };
-    }
-    [paddingBottomProperty.setNative](value) {
-        const nativeView = this.nativeTextViewProtected;
-        const padding = nativeView.padding;
-        nativeView.padding = {
-            top: padding.top,
-            right: padding.right,
             bottom: layout.toDeviceIndependentPixels(this.effectivePaddingBottom),
-            left: padding.left,
-        };
-    }
-    [paddingLeftProperty.setNative](value) {
-        const nativeView = this.nativeTextViewProtected;
-        const padding = nativeView.padding;
-        nativeView.padding = {
-            top: padding.top,
-            right: padding.right,
-            bottom: padding.bottom,
             left: layout.toDeviceIndependentPixels(this.effectivePaddingLeft),
-        };
+        });
     }
 };
 Label = __decorate([

package/ui/label/index.ios.js.map

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

package/ui/layouts/absolute-layout/index.ios.js

@@ -27,6 +27,9 @@ export class AbsoluteLayout extends AbsoluteLayoutBase {
         measureHeight += this.effectiveBorderTopWidth + this.effectivePaddingTop + this.effectivePaddingBottom + this.effectiveBorderBottomWidth;
         measureWidth = Math.max(measureWidth, this.effectiveMinWidth);
         measureHeight = Math.max(measureHeight, this.effectiveMinHeight);
+        // Check against our maximum sizes (Infinity when unconstrained)
+        measureWidth = Math.min(measureWidth, this.effectiveMaxWidth);
+        measureHeight = Math.min(measureHeight, this.effectiveMaxHeight);
         const widthAndState = View.resolveSizeAndState(measureWidth, width, widthMode, 0);
         const heightAndState = View.resolveSizeAndState(measureHeight, height, heightMode, 0);
         this.setMeasuredDimension(widthAndState, heightAndState);

package/ui/layouts/absolute-layout/index.ios.js.map

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

package/ui/layouts/dock-layout/index.ios.js

@@ -55,6 +55,9 @@ export class DockLayout extends DockLayoutBase {
         measureHeight += verticalPaddingsAndMargins;
         measureWidth = Math.max(measureWidth, this.effectiveMinWidth);
         measureHeight = Math.max(measureHeight, this.effectiveMinHeight);
+        // Check against our maximum sizes (Infinity when unconstrained)
+        measureWidth = Math.min(measureWidth, this.effectiveMaxWidth);
+        measureHeight = Math.min(measureHeight, this.effectiveMaxHeight);
         const widthAndState = View.resolveSizeAndState(measureWidth, width, widthMode, 0);
         const heightAndState = View.resolveSizeAndState(measureHeight, height, heightMode, 0);
         this.setMeasuredDimension(widthAndState, heightAndState);

package/ui/layouts/dock-layout/index.ios.js.map

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

package/ui/layouts/flexbox-layout/flexbox-layout-common.d.ts

@@ -2,6 +2,7 @@ import { LayoutBase } from '../layout-base';
 import { View } from '../../core/view';
 import { CssProperty } from '../../core/properties';
 import { Style } from '../../styling/style';
+import { CoreTypes } from '../../../core-types';
 export type Basis = 'auto' | number;
 export declare const ORDER_DEFAULT = 1;
 export declare const FLEX_GROW_DEFAULT = 0;
@@ -23,14 +24,13 @@ export declare namespace FlexWrap {
     const isValid: (value: any) => value is FlexWrap;
     const parse: (value: any) => FlexWrap;
 }
-export type JustifyContent = 'flex-start' | 'flex-end' | 'center' | 'space-between' | 'space-around' | 'space-evenly';
+export type JustifyContent = 'flex-start' | 'flex-end' | 'center' | 'space-between' | 'space-around';
 export declare namespace JustifyContent {
     const FLEX_START: "flex-start";
     const FLEX_END: "flex-end";
     const CENTER: "center";
     const SPACE_BETWEEN = "space-between";
     const SPACE_AROUND = "space-around";
-    const SPACE_EVENLY = "space-evenly";
     const isValid: (value: any) => value is JustifyContent;
     const parse: (value: any) => JustifyContent;
 }
@@ -48,7 +48,7 @@ export declare namespace AlignItems {
     const isValid: (value: any) => value is AlignItems;
     const parse: (value: any) => AlignItems;
 }
-export type AlignContent = 'flex-start' | 'flex-end' | 'center' | 'space-between' | 'space-around' | 'stretch' | 'space-evenly';
+export type AlignContent = 'flex-start' | 'flex-end' | 'center' | 'space-between' | 'space-around' | 'stretch';
 export declare namespace AlignContent {
     const FLEX_START = "flex-start";
     const FLEX_END = "flex-end";
@@ -56,7 +56,6 @@ export declare namespace AlignContent {
     const SPACE_BETWEEN = "space-between";
     const SPACE_AROUND = "space-around";
     const STRETCH = "stretch";
-    const SPACE_EVENLY = "space-evenly";
     const isValid: (value: any) => value is AlignContent;
     const parse: (value: any) => AlignContent;
 }
@@ -105,12 +104,12 @@ export declare abstract class FlexboxLayoutBase extends LayoutBase {
     set alignItems(value: AlignItems);
     get alignContent(): AlignContent;
     set alignContent(value: AlignContent);
-    get columnGap(): number;
-    set columnGap(value: number);
-    get rowGap(): number;
-    set rowGap(value: number);
-    get gap(): number;
-    set gap(value: number);
+    get gap(): string | CoreTypes.LengthType;
+    set gap(value: string | CoreTypes.LengthType);
+    get rowGap(): CoreTypes.LengthType;
+    set rowGap(value: CoreTypes.LengthType);
+    get columnGap(): CoreTypes.LengthType;
+    set columnGap(value: CoreTypes.LengthType);
     static setOrder(view: View, order: number): void;
     static getOrder(view: View): number;
     static setFlexGrow(view: View, grow: number): void;
@@ -132,10 +131,3 @@ export declare const flexGrowProperty: CssProperty<Style, number>;
 export declare const flexShrinkProperty: CssProperty<Style, number>;
 export declare const flexWrapBeforeProperty: CssProperty<Style, boolean>;
 export declare const alignSelfProperty: CssProperty<Style, AlignSelf>;
-export type FlexGapValue = number;
-export declare namespace FlexGapValue {
-    function isValid(value: any): boolean;
-    const parse: typeof parseFloat;
-}
-export declare const columnGapProperty: CssProperty<Style, number>;
-export declare const rowGapProperty: CssProperty<Style, number>;

package/ui/layouts/flexbox-layout/flexbox-layout-common.js

@@ -30,8 +30,7 @@ export var JustifyContent;
     JustifyContent.CENTER = 'center';
     JustifyContent.SPACE_BETWEEN = 'space-between';
     JustifyContent.SPACE_AROUND = 'space-around';
-    JustifyContent.SPACE_EVENLY = 'space-evenly';
-    JustifyContent.isValid = makeValidator(JustifyContent.FLEX_START, JustifyContent.FLEX_END, JustifyContent.CENTER, JustifyContent.SPACE_BETWEEN, JustifyContent.SPACE_AROUND, JustifyContent.SPACE_EVENLY);
+    JustifyContent.isValid = makeValidator(JustifyContent.FLEX_START, JustifyContent.FLEX_END, JustifyContent.CENTER, JustifyContent.SPACE_BETWEEN, JustifyContent.SPACE_AROUND);
     JustifyContent.parse = makeParser(JustifyContent.isValid);
 })(JustifyContent || (JustifyContent = {}));
 export var FlexBasisPercent;
@@ -56,8 +55,7 @@ export var AlignContent;
     AlignContent.SPACE_BETWEEN = 'space-between';
     AlignContent.SPACE_AROUND = 'space-around';
     AlignContent.STRETCH = 'stretch';
-    AlignContent.SPACE_EVENLY = 'space-evenly';
-    AlignContent.isValid = makeValidator(AlignContent.FLEX_START, AlignContent.FLEX_END, AlignContent.CENTER, AlignContent.SPACE_BETWEEN, AlignContent.SPACE_AROUND, AlignContent.STRETCH, AlignContent.SPACE_EVENLY);
+    AlignContent.isValid = makeValidator(AlignContent.FLEX_START, AlignContent.FLEX_END, AlignContent.CENTER, AlignContent.SPACE_BETWEEN, AlignContent.SPACE_AROUND, AlignContent.STRETCH);
     AlignContent.parse = makeParser(AlignContent.isValid);
 })(AlignContent || (AlignContent = {}));
 export var Order;
@@ -155,24 +153,23 @@ let FlexboxLayoutBase = class FlexboxLayoutBase extends LayoutBase {
     set alignContent(value) {
         this.style.alignContent = value;
     }
-    get columnGap() {
-        return this.style.columnGap ?? 0;
+    get gap() {
+        return this.style.gap;
     }
-    set columnGap(value) {
-        this.style.columnGap = value;
+    set gap(value) {
+        this.style.gap = value;
     }
     get rowGap() {
-        return this.style.rowGap ?? 0;
+        return this.style.rowGap;
     }
     set rowGap(value) {
         this.style.rowGap = value;
     }
-    get gap() {
-        return this.columnGap;
+    get columnGap() {
+        return this.style.columnGap;
     }
-    set gap(value) {
-        this.columnGap = value;
-        this.rowGap = value;
+    set columnGap(value) {
+        this.style.columnGap = value;
     }
     static setOrder(view, order) {
         validateArgs(view).style.order = order;
@@ -335,56 +332,6 @@ Object.defineProperty(View.prototype, 'alignSelf', {
     enumerable: true,
     configurable: true,
 });
-export var FlexGapValue;
-(function (FlexGapValue) {
-    function isValid(value) {
-        return isFinite(parseFloat(value)) && parseFloat(value) >= 0;
-    }
-    FlexGapValue.isValid = isValid;
-    FlexGapValue.parse = parseFloat;
-})(FlexGapValue || (FlexGapValue = {}));
-export const columnGapProperty = new CssProperty({
-    name: 'columnGap',
-    cssName: 'column-gap',
-    defaultValue: 0,
-    valueConverter: FlexGapValue.parse,
-});
-columnGapProperty.register(Style);
-export const rowGapProperty = new CssProperty({
-    name: 'rowGap',
-    cssName: 'row-gap',
-    defaultValue: 0,
-    valueConverter: FlexGapValue.parse,
-});
-rowGapProperty.register(Style);
-// gap: <row-gap> [<column-gap>]  — shorthand
-const gapProperty = new ShorthandProperty({
-    name: 'gap',
-    cssName: 'gap',
-    getter: function () {
-        return `${this.rowGap} ${this.columnGap}`;
-    },
-    converter: function (value) {
-        const properties = [];
-        if (value === unsetValue) {
-            properties.push([rowGapProperty, value]);
-            properties.push([columnGapProperty, value]);
-        }
-        else {
-            const parts = (value || '').trim().split(/\s+/);
-            const row = parseFloat(parts[0]);
-            if (isFinite(row) && row >= 0) {
-                properties.push([rowGapProperty, row]);
-                const col = parts.length >= 2 ? parseFloat(parts[1]) : row;
-                if (isFinite(col) && col >= 0) {
-                    properties.push([columnGapProperty, col]);
-                }
-            }
-        }
-        return properties;
-    },
-});
-gapProperty.register(Style);
 // flex-flow: <flex-direction> || <flex-wrap>
 const flexFlowProperty = new ShorthandProperty({
     name: 'flexFlow',

package/ui/layouts/flexbox-layout/flexbox-layout-common.js.map

@@ -1 +1 @@
-{"version":3,"file":"flexbox-layout-common.js","sourceRoot":"","sources":["../../../../../../packages/core/ui/layouts/flexbox-layout/flexbox-layout-common.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"flexbox-layout-common.js","sourceRoot":"","sources":["../../../../../../packages/core/ui/layouts/flexbox-layout/flexbox-layout-common.ts"],"names":[],"mappings":"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"}

package/ui/layouts/flexbox-layout/index.android.d.ts

@@ -1,6 +1,7 @@
 import { FlexDirection, FlexWrap, JustifyContent, AlignItems, AlignContent, FlexboxLayoutBase, flexDirectionProperty, flexWrapProperty, justifyContentProperty, alignItemsProperty, alignContentProperty } from './flexbox-layout-common';
 import { CoreTypes } from '../../../core-types';
 import { View } from '../../core/view';
+import { columnGapProperty, rowGapProperty } from '../../styling/style-properties';
 export * from './flexbox-layout-common';
 export declare class FlexboxLayout extends FlexboxLayoutBase {
     [flexDirectionProperty.getDefault]: () => FlexDirection;
@@ -13,6 +14,10 @@ export declare class FlexboxLayout extends FlexboxLayoutBase {
     [alignItemsProperty.setNative]: (alignItems: AlignItems) => void;
     [alignContentProperty.getDefault]: () => AlignContent;
     [alignContentProperty.setNative]: (alignContent: AlignContent) => void;
+    [rowGapProperty.getDefault]: () => CoreTypes.LengthType;
+    [rowGapProperty.setNative]: (value: CoreTypes.LengthType) => void;
+    [columnGapProperty.getDefault]: () => CoreTypes.LengthType;
+    [columnGapProperty.setNative]: (value: CoreTypes.LengthType) => void;
     nativeViewProtected: org.nativescript.widgets.FlexboxLayout;
     constructor();
     createNativeView(): org.nativescript.widgets.FlexboxLayout;

package/ui/layouts/flexbox-layout/index.android.js

@@ -1,6 +1,7 @@
 import { FlexDirection, FlexWrap, JustifyContent, AlignItems, AlignContent, FlexboxLayoutBase, orderProperty, flexGrowProperty, flexShrinkProperty, flexWrapBeforeProperty, alignSelfProperty, AlignSelf, flexDirectionProperty, flexWrapProperty, justifyContentProperty, alignItemsProperty, alignContentProperty } from './flexbox-layout-common';
 import { View } from '../../core/view';
 import { Length } from '../../styling/length-shared';
+import { columnGapProperty, rowGapProperty } from '../../styling/style-properties';
 export * from './flexbox-layout-common';
 let widgetFlexboxLayout;
 let widgetLayoutParams;
@@ -109,6 +110,20 @@ export class FlexboxLayout extends FlexboxLayoutBase {
     [alignContentProperty.setNative](alignContent) {
         this.nativeViewProtected.setAlignContent(alignContentMap[alignContent]);
     }
+    [rowGapProperty.getDefault]() {
+        return rowGapProperty.defaultValue;
+    }
+    [rowGapProperty.setNative](value) {
+        const gap = value ? Length.toDevicePixels(value, 0) : 0;
+        this.nativeViewProtected.setRowGap(Math.max(gap, 0));
+    }
+    [columnGapProperty.getDefault]() {
+        return columnGapProperty.defaultValue;
+    }
+    [columnGapProperty.setNative](value) {
+        const gap = value ? Length.toDevicePixels(value, 0) : 0;
+        this.nativeViewProtected.setColumnGap(Math.max(gap, 0));
+    }
     _updateNativeLayoutParams(child) {
         super._updateNativeLayoutParams(child);
         // NOTE: If minWidth/Height is not set, the next code will clear the default native values for minWidth/Height.

package/ui/layouts/flexbox-layout/index.android.js.map

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

package/ui/layouts/flexbox-layout/index.d.ts

@@ -2,7 +2,7 @@ import { LayoutBase } from '../layout-base';
 import { Style } from '../../styling/style';
 import { CssProperty } from '../../core/properties';
 import { View } from '../../core/view';
-import { CoreTypes } from '../../enums';
+import { CoreTypes } from '../../../core-types';
 
 export type FlexDirection = 'row' | 'row-reverse' | 'column' | 'column-reverse';
 export type FlexWrap = 'nowrap' | 'wrap' | 'wrap-reverse';
@@ -68,6 +68,24 @@ export class FlexboxLayout extends LayoutBase {
 	 * @nsProperty
 	 */
 	public alignContent: AlignContent;
+	/**
+	 * Gets or sets the gaps between rows and columns
+	 *
+	 * @nsProperty
+	 */
+	public gap: string | CoreTypes.LengthType;
+	/**
+	 * Gets or sets the gap between rows
+	 *
+	 * @nsProperty
+	 */
+	public rowGap: CoreTypes.LengthType;
+	/**
+	 * Gets or sets the gap between columns
+	 *
+	 * @nsProperty
+	 */
+	public columnGap: CoreTypes.LengthType;
 
 	public static setOrder(view: View, order: number);
 	public static getOrder(view: View): number;

package/ui/layouts/flexbox-layout/index.ios.d.ts

@@ -35,6 +35,8 @@ export declare class FlexboxLayout extends FlexboxLayoutBase {
     private _layoutSingleChildHorizontal;
     private _layoutVertical;
     private _layoutSingleChildVertical;
+    private _hasPrecedingViews;
+    private _hasPrecedingFlexLines;
     private static getChildMeasureSpec;
 }
 export declare namespace FlexboxLayout {