@nativescript/core 9.1.0-alpha.8 → 9.1.0-dev.0

package/ui/label/index.windows.js

@@ -0,0 +1,66 @@
+import { TextBase, maxLinesProperty, textOverflowProperty } from '../text-base';
+import { CSSType } from '../core/view';
+import { booleanConverter } from '../core/view-base';
+let Label = class Label extends TextBase {
+    constructor() {
+        super();
+        // WinRT objects deferred to createNativeView() so the XML-parse constructor is pure-JS.
+        // This eliminates wasted bridge calls for the orphaned page created by _resolvePageFromEntry
+        // on every cache-hit navigation (the orphaned page is GC'd without ever calling createNativeView).
+    }
+    createNativeView() {
+        this._textBlock = new Microsoft.UI.Xaml.Controls.TextBlock();
+        this._border = new Microsoft.UI.Xaml.Controls.Border();
+        this._border.Child = this._textBlock;
+        return this._border;
+    }
+    //@ts-ignore
+    get nativeTextViewProtected() {
+        return this._textBlock;
+    }
+    initNativeView() {
+        super.initNativeView();
+        this._textBlock.VerticalAlignment = 1;
+    }
+    get windows() {
+        return this._textBlock;
+    }
+    get textWrap() {
+        return this.style.whiteSpace === 'normal';
+    }
+    set textWrap(value) {
+        if (typeof value === 'string') {
+            value = booleanConverter(value);
+        }
+        this.style.whiteSpace = value ? 'normal' : 'nowrap';
+    }
+    // MaxLines: 0 = unlimited
+    //@ts-ignore
+    [maxLinesProperty.setNative](value) {
+        this._textBlock.MaxLines = value <= 0 ? 0 : value;
+    }
+    // TextTrimming: None=0, CharacterEllipsis=1, WordEllipsis=2, Clip=3
+    //@ts-ignore
+    [textOverflowProperty.setNative](value) {
+        const nativeView = this._textBlock;
+        if (!nativeView)
+            return;
+        switch (value) {
+            case 'ellipsis':
+                nativeView.TextTrimming = 1;
+                break; // CharacterEllipsis
+            case 'clip':
+                nativeView.TextTrimming = 3;
+                break;
+            default:
+                nativeView.TextTrimming = 0;
+                break; // None
+        }
+    }
+};
+Label = __decorate([
+    CSSType('Label'),
+    __metadata("design:paramtypes", [])
+], Label);
+export { Label };
+//# sourceMappingURL=index.windows.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.windows.js","sourceRoot":"","sources":["../../../../../packages/core/ui/label/index.windows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG9C,IAAM,KAAK,GAAX,MAAM,KAAM,SAAQ,QAAQ;IAMlC;QACC,KAAK,EAAE,CAAC;QACR,wFAAwF;QACxF,6FAA6F;QAC7F,mGAAmG;IACpG,CAAC;IAEM,gBAAgB;QACtB,IAAI,CAAC,UAAU,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;QAC7D,IAAI,CAAC,OAAO,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACtD,IAAI,CAAC,OAAe,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC;QAC9C,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAED,YAAY;IACZ,IAAI,uBAAuB;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IAEM,cAAc;QACpB,KAAK,CAAC,cAAc,EAAE,CAAC;QACvB,IAAI,CAAC,UAAU,CAAC,iBAAiB,GAAG,CAAU,CAAC;IAChD,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IAED,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAC;IAC3C,CAAC;IAED,IAAI,QAAQ,CAAC,KAAc;QAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC/B,KAAK,GAAG,gBAAgB,CAAC,KAAY,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IACrD,CAAC;IAED,0BAA0B;IAC1B,YAAY;IACZ,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,KAAa;QACxC,IAAI,CAAC,UAAkB,CAAC,QAAQ,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC5D,CAAC;IAED,oEAAoE;IACpE,YAAY;IACZ,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,KAAa;QAC7C,MAAM,UAAU,GAAG,IAAI,CAAC,UAAiB,CAAC;QAC1C,IAAI,CAAC,UAAU;YAAE,OAAO;QACxB,QAAQ,KAAK,EAAE,CAAC;YACf,KAAK,UAAU;gBAAE,UAAU,CAAC,YAAY,GAAG,CAAC,CAAC;gBAAC,MAAM,CAAC,oBAAoB;YACzE,KAAK,MAAM;gBAAE,UAAU,CAAC,YAAY,GAAG,CAAC,CAAC;gBAAC,MAAM;YAChD;gBAAS,UAAU,CAAC,YAAY,GAAG,CAAC,CAAC;gBAAC,MAAM,CAAC,OAAO;QACrD,CAAC;IACF,CAAC;CACD,CAAA;AA9DY,KAAK;IADjB,OAAO,CAAC,OAAO,CAAC;;GACJ,KAAK,CA8DjB"}

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

@@ -1,6 +1,5 @@
 import { AbsoluteLayoutBase } from './absolute-layout-common';
 import { View } from '../../core/view';
-import { IOSHelper } from '../../core/view/view-helper';
 import { layout } from '../../../utils';
 export * from './absolute-layout-common';
 export class AbsoluteLayout extends AbsoluteLayoutBase {
@@ -34,10 +33,7 @@ export class AbsoluteLayout extends AbsoluteLayoutBase {
     }
     onLayout(left, top, right, bottom) {
         super.onLayout(left, top, right, bottom);
-        // Skip safe-area subtraction when an ancestor ScrollView has handed inset
-        // adjustment to iOS — otherwise we double-count the nav-bar / large-title
-        // inset and clobber the first children. See IOSHelper.hasIOSManagedInsetAncestor.
-        const insets = IOSHelper.hasIOSManagedInsetAncestor(this) ? { left: 0, top: 0, right: 0, bottom: 0 } : this.getSafeAreaInsets();
+        const insets = this.getSafeAreaInsets();
         this.eachLayoutChild((child, last) => {
             const childWidth = child.getMeasuredWidth();
             const childHeight = child.getMeasuredHeight();

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/absolute-layout/index.windows.d.ts

@@ -0,0 +1,8 @@
+export * from './absolute-layout-common';
+import { AbsoluteLayoutBase } from './absolute-layout-common';
+export declare class AbsoluteLayout extends AbsoluteLayoutBase {
+    nativeViewProtected: Microsoft.UI.Xaml.Controls.Canvas;
+    private _windows;
+    constructor();
+    createNativeView(): Microsoft.UI.Xaml.Controls.Canvas;
+}

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

@@ -0,0 +1,47 @@
+export * from './absolute-layout-common';
+import { AbsoluteLayoutBase, leftProperty, topProperty } from './absolute-layout-common';
+import { View } from '../../core/view';
+// Canvas does NOT lay out its children — position comes entirely from Canvas.Left/Top attached properties.
+// (Previously this call was missing, causing all children to pile up at 0,0 and breaking the animation-curves demo.)
+// Prefer the static setter; fall back to SetValue(Canvas.*Property) if the runtime doesn't project it.
+function setCanvasAttachedProperty(prop, native, value) {
+    try {
+        const Canvas = Microsoft.UI.Xaml.Controls.Canvas;
+        if (!Canvas || !native) {
+            return;
+        }
+        const setter = 'Set' + prop; // SetLeft / SetTop
+        if (typeof Canvas[setter] === 'function') {
+            Canvas[setter](native, value);
+            return;
+        }
+        const dp = Canvas[prop + 'Property']; // LeftProperty / TopProperty
+        if (dp && typeof native.SetValue === 'function') {
+            native.SetValue(dp, value);
+        }
+    }
+    catch (_e) { }
+}
+View.prototype[leftProperty.setNative] = function (value) {
+    const native = this.nativeViewProtected;
+    if (native) {
+        setCanvasAttachedProperty('Left', native, value);
+    }
+};
+View.prototype[topProperty.setNative] = function (value) {
+    const native = this.nativeViewProtected;
+    if (native) {
+        setCanvasAttachedProperty('Top', native, value);
+    }
+};
+export class AbsoluteLayout extends AbsoluteLayoutBase {
+    constructor() {
+        super();
+        // WinRT deferred to createNativeView() — keeps constructor pure-JS.
+    }
+    createNativeView() {
+        this._windows = new Microsoft.UI.Xaml.Controls.Canvas();
+        return this._windows;
+    }
+}
+//# sourceMappingURL=index.windows.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.windows.js","sourceRoot":"","sources":["../../../../../../packages/core/ui/layouts/absolute-layout/index.windows.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AAEzC,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACzF,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAGvC,2GAA2G;AAC3G,qHAAqH;AACrH,uGAAuG;AACvG,SAAS,yBAAyB,CAAC,IAAoB,EAAE,MAAW,EAAE,KAAa;IAClF,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAa,CAAC;QACxD,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;YACxB,OAAO;QACR,CAAC;QACD,MAAM,MAAM,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC,mBAAmB;QAChD,IAAI,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC;YAC1C,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAC9B,OAAO;QACR,CAAC;QACD,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,6BAA6B;QACnE,IAAI,EAAE,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;YACjD,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC,CAAA,CAAC;AAChB,CAAC;AAEA,IAAI,CAAC,SAAiB,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,UAAU,KAAa;IACxE,MAAM,MAAM,GAAI,IAAY,CAAC,mBAA0B,CAAC;IACxD,IAAI,MAAM,EAAE,CAAC;QACZ,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC;AACF,CAAC,CAAC;AAED,IAAI,CAAC,SAAiB,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,UAAU,KAAa;IACvE,MAAM,MAAM,GAAI,IAAY,CAAC,mBAA0B,CAAC;IACxD,IAAI,MAAM,EAAE,CAAC;QACZ,yBAAyB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,OAAO,cAAe,SAAQ,kBAAkB;IAIrD;QACC,KAAK,EAAE,CAAC;QACR,oEAAoE;IACrE,CAAC;IAEM,gBAAgB;QACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACxD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;CAED"}

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

@@ -1,6 +1,5 @@
 import { DockLayoutBase } from './dock-layout-common';
 import { View } from '../../core/view';
-import { IOSHelper } from '../../core/view/view-helper';
 import { layout } from '../../../utils';
 export * from './dock-layout-common';
 export class DockLayout extends DockLayoutBase {
@@ -62,10 +61,7 @@ export class DockLayout extends DockLayoutBase {
     }
     onLayout(left, top, right, bottom) {
         super.onLayout(left, top, right, bottom);
-        // Skip safe-area subtraction when an ancestor ScrollView has handed inset
-        // adjustment to iOS — otherwise we double-count the nav-bar / large-title
-        // inset and clobber the first children. See IOSHelper.hasIOSManagedInsetAncestor.
-        const insets = IOSHelper.hasIOSManagedInsetAncestor(this) ? { left: 0, top: 0, right: 0, bottom: 0 } : this.getSafeAreaInsets();
+        const insets = this.getSafeAreaInsets();
         const horizontalPaddingsAndMargins = this.effectivePaddingLeft + this.effectivePaddingRight + this.effectiveBorderLeftWidth + this.effectiveBorderRightWidth + insets.left + insets.right;
         const verticalPaddingsAndMargins = this.effectivePaddingTop + this.effectivePaddingBottom + this.effectiveBorderTopWidth + this.effectiveBorderBottomWidth + insets.top + insets.bottom;
         let childLeft = this.effectiveBorderLeftWidth + this.effectivePaddingLeft + insets.left;

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/dock-layout/index.windows.d.ts

@@ -0,0 +1,19 @@
+export * from './dock-layout-common';
+import { DockLayoutBase, stretchLastChildProperty } from './dock-layout-common';
+import { View } from '../../core/view';
+import type { CoreTypes } from '../../../core-types';
+export declare class DockLayout extends DockLayoutBase {
+    [stretchLastChildProperty.getDefault]: () => boolean;
+    [stretchLastChildProperty.setNative]: (value: boolean) => void;
+    nativeViewProtected: Microsoft.UI.Xaml.Controls.Canvas;
+    private _canvas;
+    private _layoutBusy;
+    constructor();
+    createNativeView(): Microsoft.UI.Xaml.Controls.Canvas;
+    initNativeView(): void;
+    disposeNativeView(): void;
+    onDockChanged(_view: View, _oldValue: CoreTypes.DockType, _newValue: CoreTypes.DockType): void;
+    _addViewToNativeVisualTree(child: View, atIndex?: number): boolean;
+    _removeViewFromNativeVisualTree(child: View): void;
+    private _runDockLayout;
+}

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

@@ -0,0 +1,202 @@
+export * from './dock-layout-common';
+import { DockLayoutBase, stretchLastChildProperty } from './dock-layout-common';
+export class DockLayout extends DockLayoutBase {
+    constructor() {
+        super();
+        this._layoutBusy = false;
+        // WinRT deferred to createNativeView() — keeps constructor pure-JS.
+    }
+    createNativeView() {
+        this._canvas = new Microsoft.UI.Xaml.Controls.Canvas();
+        return this._canvas;
+    }
+    initNativeView() {
+        super.initNativeView();
+        const canvas = this.nativeViewProtected;
+        const ref = new WeakRef(this);
+        canvas.SizeChanged = NSWinRT.asDelegate('Microsoft.UI.Xaml.SizeChangedEventHandler', () => {
+            ref.deref()?._runDockLayout();
+        });
+    }
+    disposeNativeView() {
+        const native = this.nativeViewProtected;
+        if (native) {
+            native.SizeChanged = null;
+            native.LayoutUpdated = null;
+        }
+        super.disposeNativeView();
+    }
+    [stretchLastChildProperty.getDefault]() {
+        return true;
+    }
+    [stretchLastChildProperty.setNative](value) {
+        this.stretchLastChild = value;
+        this._runDockLayout();
+    }
+    onDockChanged(_view, _oldValue, _newValue) {
+        this._runDockLayout();
+    }
+    _addViewToNativeVisualTree(child, atIndex = Number.MAX_SAFE_INTEGER) {
+        super._addViewToNativeVisualTree(child, atIndex);
+        const nativeChild = child.nativeViewProtected;
+        const children = this._canvas?.Children;
+        if (!nativeChild || !children) {
+            return false;
+        }
+        try {
+            const size = children.Size;
+            if (atIndex >= 0 && atIndex < size && atIndex < Number.MAX_SAFE_INTEGER) {
+                children.InsertAt(atIndex, nativeChild);
+            }
+            else {
+                children.Append(nativeChild);
+            }
+            try {
+                nativeChild.__ns_view = child;
+            }
+            catch (_e) { }
+        }
+        catch {
+            return false;
+        }
+        this._runDockLayout();
+        return true;
+    }
+    _removeViewFromNativeVisualTree(child) {
+        const nativeChild = child.nativeViewProtected;
+        const children = this._canvas?.Children;
+        if (nativeChild && children) {
+            const count = children.Size ?? 0;
+            for (let i = 0; i < count; i++) {
+                try {
+                    if (children.GetAt(i) === nativeChild) {
+                        children.RemoveAt(i);
+                        break;
+                    }
+                }
+                catch (_e) { }
+            }
+        }
+        super._removeViewFromNativeVisualTree(child);
+        this._runDockLayout();
+    }
+    // XAML Canvas has no native dock; children are measured and placed manually (same pattern as Wrap/Flex).
+    _runDockLayout() {
+        if (this._layoutBusy) {
+            return;
+        }
+        const canvas = this.nativeViewProtected;
+        if (!canvas) {
+            return;
+        }
+        const children = canvas.Children;
+        const count = children?.Size ?? 0;
+        if (count === 0) {
+            return;
+        }
+        const padLeft = (this.effectiveBorderLeftWidth || 0) + (this.effectivePaddingLeft || 0);
+        const padTop = (this.effectiveBorderTopWidth || 0) + (this.effectivePaddingTop || 0);
+        const padRight = (this.effectiveBorderRightWidth || 0) + (this.effectivePaddingRight || 0);
+        const padBottom = (this.effectiveBorderBottomWidth || 0) + (this.effectivePaddingBottom || 0);
+        const availW = Math.max(0, (canvas.ActualWidth || 0) - padLeft - padRight);
+        const availH = Math.max(0, (canvas.ActualHeight || 0) - padTop - padBottom);
+        this._layoutBusy = true;
+        try {
+            let remainingW = availW;
+            let remainingH = availH;
+            let x = padLeft;
+            let y = padTop;
+            const visibleIndices = [];
+            for (let i = 0; i < count; i++) {
+                const nc = children.GetAt(i);
+                if (nc.Visibility !== Microsoft.UI.Xaml.Visibility.Collapsed) {
+                    visibleIndices.push(i);
+                }
+            }
+            for (let vi = 0; vi < visibleIndices.length; vi++) {
+                const i = visibleIndices[vi];
+                const nc = children.GetAt(i);
+                const childView = nc.__ns_view;
+                const dock = childView ? DockLayout.getDock(childView) : 'left';
+                const stretch = this.stretchLastChild && vi === visibleIndices.length - 1;
+                let childW = 0;
+                let childH = 0;
+                if (stretch) {
+                    childW = remainingW;
+                    childH = remainingH;
+                }
+                else {
+                    let measureW = remainingW > 0 ? remainingW : Number.POSITIVE_INFINITY;
+                    let measureH = remainingH > 0 ? remainingH : Number.POSITIVE_INFINITY;
+                    if (dock === 'top' || dock === 'bottom') {
+                        measureW = availW > 0 ? availW : Number.POSITIVE_INFINITY;
+                    }
+                    else {
+                        measureH = availH > 0 ? availH : Number.POSITIVE_INFINITY;
+                    }
+                    try {
+                        nc.Measure(Microsoft.UI.Xaml.SizeHelper.FromDimensions(measureW, measureH));
+                        const d = nc.DesiredSize;
+                        childW = d.Width;
+                        childH = d.Height;
+                    }
+                    catch (_e) {
+                        childW = 0;
+                        childH = 0;
+                    }
+                }
+                let left = x;
+                let top = y;
+                let width = childW;
+                let height = childH;
+                switch (dock) {
+                    case 'top':
+                        width = availW;
+                        left = padLeft;
+                        top = y;
+                        y += childH;
+                        remainingH = Math.max(0, remainingH - childH);
+                        break;
+                    case 'bottom':
+                        width = availW;
+                        left = padLeft;
+                        top = padTop + remainingH - childH;
+                        remainingH = Math.max(0, remainingH - childH);
+                        break;
+                    case 'right':
+                        height = availH;
+                        left = padLeft + remainingW - childW;
+                        top = padTop;
+                        remainingW = Math.max(0, remainingW - childW);
+                        break;
+                    case 'left':
+                    default:
+                        height = availH;
+                        left = x;
+                        top = padTop;
+                        x += childW;
+                        remainingW = Math.max(0, remainingW - childW);
+                        break;
+                }
+                try {
+                    Microsoft.UI.Xaml.Controls.Canvas.SetLeft(nc, left);
+                    Microsoft.UI.Xaml.Controls.Canvas.SetTop(nc, top);
+                    if (width > 0) {
+                        nc.Width = width;
+                    }
+                    if (height > 0) {
+                        nc.Height = height;
+                    }
+                }
+                catch (_e) { }
+                if (stretch) {
+                    break;
+                }
+            }
+        }
+        finally {
+            this._layoutBusy = false;
+        }
+    }
+}
+//# sourceMappingURL=index.windows.js.map

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

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

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

@@ -23,13 +23,14 @@ 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';
+export type JustifyContent = 'flex-start' | 'flex-end' | 'center' | 'space-between' | 'space-around' | 'space-evenly';
 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;
 }
@@ -47,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';
+export type AlignContent = 'flex-start' | 'flex-end' | 'center' | 'space-between' | 'space-around' | 'stretch' | 'space-evenly';
 export declare namespace AlignContent {
     const FLEX_START = "flex-start";
     const FLEX_END = "flex-end";
@@ -55,6 +56,7 @@ 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;
 }
@@ -103,6 +105,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);
     static setOrder(view: View, order: number): void;
     static getOrder(view: View): number;
     static setFlexGrow(view: View, grow: number): void;
@@ -124,3 +132,10 @@ 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,7 +30,8 @@ export var JustifyContent;
     JustifyContent.CENTER = 'center';
     JustifyContent.SPACE_BETWEEN = 'space-between';
     JustifyContent.SPACE_AROUND = 'space-around';
-    JustifyContent.isValid = makeValidator(JustifyContent.FLEX_START, JustifyContent.FLEX_END, JustifyContent.CENTER, JustifyContent.SPACE_BETWEEN, JustifyContent.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.parse = makeParser(JustifyContent.isValid);
 })(JustifyContent || (JustifyContent = {}));
 export var FlexBasisPercent;
@@ -55,7 +56,8 @@ export var AlignContent;
     AlignContent.SPACE_BETWEEN = 'space-between';
     AlignContent.SPACE_AROUND = 'space-around';
     AlignContent.STRETCH = 'stretch';
-    AlignContent.isValid = makeValidator(AlignContent.FLEX_START, AlignContent.FLEX_END, AlignContent.CENTER, AlignContent.SPACE_BETWEEN, AlignContent.SPACE_AROUND, AlignContent.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.parse = makeParser(AlignContent.isValid);
 })(AlignContent || (AlignContent = {}));
 export var Order;
@@ -153,6 +155,25 @@ let FlexboxLayoutBase = class FlexboxLayoutBase extends LayoutBase {
     set alignContent(value) {
         this.style.alignContent = value;
     }
+    get columnGap() {
+        return this.style.columnGap ?? 0;
+    }
+    set columnGap(value) {
+        this.style.columnGap = value;
+    }
+    get rowGap() {
+        return this.style.rowGap ?? 0;
+    }
+    set rowGap(value) {
+        this.style.rowGap = value;
+    }
+    get gap() {
+        return this.columnGap;
+    }
+    set gap(value) {
+        this.columnGap = value;
+        this.rowGap = value;
+    }
     static setOrder(view, order) {
         validateArgs(view).style.order = order;
     }
@@ -314,6 +335,56 @@ 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',