@nativescript/core 9.0.0-alpha.23 → 9.0.0-alpha.25

package/ui/core/view/index.android.js

@@ -1,7 +1,6 @@
 import { getNativeScriptGlobals } from '../../../globals/global-utils';
-import { ViewCommon, isEnabledProperty, originXProperty, originYProperty, isUserInteractionEnabledProperty, testIDProperty, AndroidHelper, statusBarStyleProperty } from './view-common';
+import { ViewCommon, isEnabledProperty, originXProperty, originYProperty, isUserInteractionEnabledProperty, testIDProperty, AndroidHelper, androidOverflowEdgeProperty, statusBarStyleProperty } from './view-common';
 import { paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty } from '../../styling/style-properties';
-import { Length } from '../../styling/length-shared';
 import { layout } from '../../../utils';
 import { Trace } from '../../../trace';
 import { hiddenProperty } from '../view-base';
@@ -44,6 +43,38 @@ const STATUS_BAR_DARK_BCKG = 1711276032;
 const modalMap = new Map();
 let TouchListener;
 let DialogFragment;
+let OnBackPressedCallback;
+if (SDK_VERSION >= 33) {
+    OnBackPressedCallback = androidx.activity.OnBackPressedCallback.extend({
+        handleOnBackPressed() {
+            console.log('OnBackPressedCallback handleOnBackPressed called');
+            const dialog = this['_dialog']?.get();
+            if (!dialog) {
+                // disable the callback and call super to avoid infinite loop
+                this.setEnabled(false);
+                return;
+            }
+            const view = dialog.fragment.owner;
+            const args = {
+                eventName: 'activityBackPressed',
+                object: view,
+                activity: view._context,
+                cancel: false,
+            };
+            // Fist fire application.android global event
+            getNativeScriptGlobals().events.notify(args);
+            if (args.cancel) {
+                return;
+            }
+            view.notify(args);
+            if (!args.cancel) {
+                this.setEnabled(false);
+                dialog.getOnBackPressedDispatcher().onBackPressed();
+                this.setEnabled(true);
+            }
+        },
+    });
+}
 function initializeTouchListener() {
     if (TouchListener) {
         return;
@@ -85,6 +116,12 @@ function initializeDialogFragment() {
     function DialogImpl(fragment, context, themeResId) {
         var _this = _super.call(this, context, themeResId) || this;
         _this.fragment = fragment;
+        if (SDK_VERSION >= 33 && OnBackPressedCallback) {
+            var callback = new OnBackPressedCallback(true);
+            callback['_dialog'] = new WeakRef(_this);
+            // @ts-ignore
+            _this.getOnBackPressedDispatcher().addCallback(_this, callback);
+        }
         return global.__native(_this);
     }
     DialogImpl.prototype.onDetachedFromWindow = function () {
@@ -92,6 +129,10 @@ function initializeDialogFragment() {
         this.fragment = null;
     };
     DialogImpl.prototype.onBackPressed = function () {
+        if (SDK_VERSION >= 33) {
+            _super.prototype.onBackPressed.call(this);
+            return;
+        }
         var view = this.fragment.owner;
         var args = {
             eventName: 'activityBackPressed',
@@ -110,7 +151,7 @@ function initializeDialogFragment() {
         }
     };
     return DialogImpl;
-}(android.app.Dialog));
+}(androidx.appcompat.app.AppCompatDialog));
     var DialogFragmentImpl = /** @class */ (function (_super) {
     __extends(DialogFragmentImpl, _super);
     function DialogFragmentImpl() {
@@ -253,20 +294,21 @@ const INSET_LEFT_CONSUMED = 16;
 const INSET_TOP_CONSUMED = 20;
 const INSET_RIGHT_CONSUMED = 24;
 const INSET_BOTTOM_CONSUMED = 28;
+const OverflowEdgeIgnore = -1;
 const OverflowEdgeNone = 0;
-const OverflowEdgeLeft = 1;
-const OverflowEdgeTop = 1 << 1;
-const OverflowEdgeRight = 1 << 2;
-const OverflowEdgeBottom = 1 << 3;
-const OverflowEdgeDontApply = 1 << 4;
-const OverflowEdgeLeftDontConsume = 1 << 5;
-const OverflowEdgeTopDontConsume = 1 << 6;
-const OverflowEdgeRightDontConsume = 1 << 7;
-const OverflowEdgeBottomDontConsume = 1 << 8;
-const OverflowEdgeAllButLeft = 1 << 9;
-const OverflowEdgeAllButTop = 1 << 10;
-const OverflowEdgeAllButRight = 1 << 11;
-const OverflowEdgeAllButBottom = 1 << 12;
+const OverflowEdgeLeft = 1 << 1;
+const OverflowEdgeTop = 1 << 2;
+const OverflowEdgeRight = 1 << 3;
+const OverflowEdgeBottom = 1 << 4;
+const OverflowEdgeDontApply = 1 << 5;
+const OverflowEdgeLeftDontConsume = 1 << 6;
+const OverflowEdgeTopDontConsume = 1 << 7;
+const OverflowEdgeRightDontConsume = 1 << 8;
+const OverflowEdgeBottomDontConsume = 1 << 9;
+const OverflowEdgeAllButLeft = 1 << 10;
+const OverflowEdgeAllButTop = 1 << 11;
+const OverflowEdgeAllButRight = 1 << 12;
+const OverflowEdgeAllButBottom = 1 << 13;
 class Inset {
     constructor(data) {
         this.data = ArrayBuffer.from(data);
@@ -337,11 +379,6 @@ class Inset {
     }
 }
 export class View extends ViewCommon {
-    constructor() {
-        super(...arguments);
-        this._defaultOverflowEdge = OverflowEdgeNone;
-        this._defaultOverflowEdgeValue = 'none';
-    }
     // TODO: Implement unobserve that detach the touchListener.
     _observe(type, callback, thisArg) {
         super._observe(type, callback, thisArg);
@@ -449,128 +486,30 @@ export class View extends ViewCommon {
         }
         return manager;
     }
-    // @ts-ignore
-    set androidOverflowEdge(value) {
-        if (typeof value !== 'string') {
-            return;
-        }
+    [androidOverflowEdgeProperty.setNative](value) {
         const nativeView = this.nativeViewProtected;
-        if (nativeView && nativeView.setOverflowEdge) {
-            if (value === 'none') {
-                nativeView.setOverflowEdge(OverflowEdgeNone);
-            }
-            else {
-                const newValue = parseEdges(value);
-                if (newValue !== null) {
-                    nativeView.setOverflowEdge(newValue);
-                }
-            }
+        if (typeof value !== 'string' || nativeView === null || nativeView == undefined) {
+            return;
         }
-        else {
-            const edge = parseEdges(value);
-            if (edge === null) {
-                return;
-            }
-            this._defaultOverflowEdgeValue = value;
-            this._defaultOverflowEdge = edge;
+        if (!('setOverflowEdge' in nativeView)) {
+            return;
         }
-    }
-    get androidOverflowEdge() {
-        const nativeView = this.nativeViewProtected;
-        if (nativeView && nativeView.getOverflowEdge) {
-            const overflowEdge = nativeView.getOverflowEdge();
-            switch (overflowEdge) {
-                case OverflowEdgeNone:
-                    return 'none';
-                case OverflowEdgeLeft:
-                    return 'left';
-                case OverflowEdgeTop:
-                    return 'top';
-                case OverflowEdgeRight:
-                    return 'right';
-                case OverflowEdgeBottom:
-                    return 'bottom';
-                case OverflowEdgeDontApply:
-                    return 'dont-apply';
-                case OverflowEdgeLeftDontConsume:
-                    return 'left-dont-consume';
-                case OverflowEdgeTopDontConsume:
-                    return 'top-dont-consume';
-                case OverflowEdgeRightDontConsume:
-                    return 'right-dont-consume';
-                case OverflowEdgeBottomDontConsume:
-                    return 'bottom-dont-consume';
-                case OverflowEdgeAllButLeft:
-                    return 'all-but-left';
-                case OverflowEdgeAllButTop:
-                    return 'all-but-top';
-                case OverflowEdgeAllButRight:
-                    return 'all-but-right';
-                case OverflowEdgeAllButBottom:
-                    return 'all-but-bottom';
-                default:
-                    {
-                        let value = '';
-                        const overflowLeftConsume = (overflowEdge & OverflowEdgeLeft) == OverflowEdgeLeft;
-                        const overflowTopConsume = (overflowEdge & OverflowEdgeTop) == OverflowEdgeTop;
-                        const overflowRightConsume = (overflowEdge & OverflowEdgeRight) == OverflowEdgeRight;
-                        const overflowBottomConsume = (overflowEdge & OverflowEdgeBottom) == OverflowEdgeBottom;
-                        const overflowLeft = (overflowEdge & OverflowEdgeLeftDontConsume) == OverflowEdgeLeftDontConsume;
-                        const overflowTop = (overflowEdge & OverflowEdgeTopDontConsume) == OverflowEdgeTopDontConsume;
-                        const overflowRight = (overflowEdge & OverflowEdgeRightDontConsume) == OverflowEdgeRightDontConsume;
-                        const overflowBottom = (overflowEdge & OverflowEdgeBottomDontConsume) == OverflowEdgeBottomDontConsume;
-                        if (overflowLeftConsume) {
-                            value += 'left';
-                        }
-                        if (overflowTopConsume) {
-                            if (value.length > 0) {
-                                value += ',';
-                            }
-                            value += 'top';
-                        }
-                        if (overflowRightConsume) {
-                            if (value.length > 0) {
-                                value += ',';
-                            }
-                            value += 'right';
-                        }
-                        if (overflowBottomConsume) {
-                            if (value.length > 0) {
-                                value += ',';
-                            }
-                            value += 'bottom';
-                        }
-                        if (overflowLeft) {
-                            value += 'left-dont-consume';
-                        }
-                        if (overflowTop) {
-                            if (value.length > 0) {
-                                value += ',';
-                            }
-                            value += 'top-dont-consume';
-                        }
-                        if (overflowRight) {
-                            if (value.length > 0) {
-                                value += ',';
-                            }
-                            value += 'right-dont-consume';
-                        }
-                        if (overflowBottom) {
-                            if (value.length > 0) {
-                                value += ',';
-                            }
-                            value += 'bottom-dont-consume';
-                        }
+        switch (value) {
+            case 'none':
+                nativeView.setOverflowEdge(OverflowEdgeNone);
+                break;
+            case 'ignore':
+                nativeView.setOverflowEdge(OverflowEdgeIgnore);
+                break;
+            default:
+                {
+                    const edge = parseEdges(value);
+                    if (edge != null) {
+                        nativeView.setOverflowEdge(edge);
                     }
-                    break;
-            }
-        }
-        else {
-            if (this._defaultOverflowEdgeValue) {
-                return this._defaultOverflowEdgeValue;
-            }
+                }
+                break;
         }
-        return 'none';
     }
     onLoaded() {
         this._manager = null;
@@ -614,12 +553,6 @@ export class View extends ViewCommon {
         if (!this.insetListenerIsSet && this.needsInsetListener) {
             this.setInsetListener();
         }
-        const nativeView = this.nativeViewProtected;
-        if (typeof this._defaultOverflowEdge === 'number') {
-            if (nativeView && nativeView.setOverflowEdge) {
-                nativeView.setOverflowEdge(this._defaultOverflowEdge);
-            }
-        }
     }
     needsOnLayoutChangeListener() {
         return this.hasListeners(ViewCommon.layoutChangedEvent);
@@ -1303,17 +1236,21 @@ export class View extends ViewCommon {
             }
         }
     }
-    _drawBoxShadow(boxShadow) {
+    _drawBoxShadow(boxShadows) {
         const nativeView = this.nativeViewProtected;
-        const config = {
-            shadowColor: boxShadow.color.android,
-            cornerRadius: Length.toDevicePixels(this.borderRadius, 0.0),
-            spreadRadius: boxShadow.spreadRadius,
-            blurRadius: boxShadow.blurRadius,
-            offsetX: boxShadow.offsetX,
-            offsetY: boxShadow.offsetY,
-        };
-        org.nativescript.widgets.Utils.drawBoxShadow(nativeView, JSON.stringify(config));
+        const valueCount = 6;
+        const nativeArray = Array.create('int', boxShadows.length * valueCount);
+        for (let i = 0, length = boxShadows.length; i < length; i++) {
+            const boxShadow = boxShadows[i];
+            const nativeIndex = i * valueCount;
+            nativeArray[nativeIndex + 0] = boxShadow.color.android;
+            nativeArray[nativeIndex + 1] = boxShadow.spreadRadius;
+            nativeArray[nativeIndex + 2] = boxShadow.blurRadius;
+            nativeArray[nativeIndex + 3] = boxShadow.offsetX;
+            nativeArray[nativeIndex + 4] = boxShadow.offsetY;
+            nativeArray[nativeIndex + 5] = boxShadow.inset ? 1 : 0;
+        }
+        org.nativescript.widgets.Utils.drawBoxShadow(nativeView, nativeArray);
     }
     _redrawNativeBackground(value) {
         if (value instanceof Background) {
@@ -1356,13 +1293,13 @@ export class View extends ViewCommon {
         // prettier-ignore
         const onlyColor = !background.hasBorderWidth()
             && !background.hasBorderRadius()
-            && !background.hasBoxShadow()
+            && !background.hasBoxShadows()
             && !background.clipPath
             && !background.image
             && !!background.color;
         this._applyBackground(background, isBorderDrawable, onlyColor, drawable);
-        if (background.hasBoxShadow()) {
-            this._drawBoxShadow(background.getBoxShadow());
+        if (background.hasBoxShadows()) {
+            this._drawBoxShadow(background.getBoxShadows());
         }
         // TODO: Can we move BorderWidths as separate native setter?
         // This way we could skip setPadding if borderWidth is not changed.
@@ -1410,123 +1347,41 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], View.prototype, "requestLayout", null);
+const edgeMap = {
+    none: OverflowEdgeNone,
+    left: OverflowEdgeLeft,
+    top: OverflowEdgeTop,
+    right: OverflowEdgeRight,
+    bottom: OverflowEdgeBottom,
+    'dont-apply': OverflowEdgeDontApply,
+    'left-dont-consume': OverflowEdgeLeftDontConsume,
+    'top-dont-consume': OverflowEdgeTopDontConsume,
+    'right-dont-consume': OverflowEdgeRightDontConsume,
+    'bottom-dont-consume': OverflowEdgeBottomDontConsume,
+    'all-but-left': OverflowEdgeAllButLeft,
+    'all-but-top': OverflowEdgeAllButTop,
+    'all-but-right': OverflowEdgeAllButRight,
+    'all-but-bottom': OverflowEdgeAllButBottom,
+};
 function parseEdges(edges) {
-    const values = edges.trim().split(',');
-    let newValue = -1;
-    for (let value of values) {
-        const trimmedValue = value.trim();
-        switch (trimmedValue) {
-            case 'none':
-                if (newValue === -1) {
-                    newValue = OverflowEdgeNone;
-                }
-                else {
-                    newValue |= OverflowEdgeNone;
-                }
-                break;
-            case 'left':
-                if (newValue === -1) {
-                    newValue = OverflowEdgeLeft;
-                }
-                else {
-                    newValue |= OverflowEdgeLeft;
-                }
-                break;
-            case 'top':
-                if (newValue === -1) {
-                    newValue = OverflowEdgeTop;
-                }
-                else {
-                    newValue |= OverflowEdgeTop;
-                }
-                break;
-            case 'right':
-                if (newValue === -1) {
-                    newValue = OverflowEdgeRight;
-                }
-                else {
-                    newValue |= OverflowEdgeRight;
-                }
-                break;
-            case 'bottom':
-                if (newValue === -1) {
-                    newValue = OverflowEdgeBottom;
-                }
-                else {
-                    newValue |= OverflowEdgeBottom;
-                }
-                break;
-            case 'dont-apply':
-                newValue = OverflowEdgeDontApply;
-                break;
-            case 'left-dont-consume':
-                if (newValue === -1) {
-                    newValue = OverflowEdgeLeftDontConsume;
-                }
-                else {
-                    newValue |= OverflowEdgeLeftDontConsume;
-                }
-                break;
-            case 'top-dont-consume':
-                if (newValue === -1) {
-                    newValue = OverflowEdgeTopDontConsume;
-                }
-                else {
-                    newValue |= OverflowEdgeTopDontConsume;
-                }
-                break;
-            case 'right-dont-consume':
-                if (newValue === -1) {
-                    newValue = OverflowEdgeRightDontConsume;
-                }
-                else {
-                    newValue |= OverflowEdgeRightDontConsume;
-                }
-                break;
-            case 'bottom-dont-consume':
-                if (newValue === -1) {
-                    newValue = OverflowEdgeBottomDontConsume;
-                }
-                else {
-                    newValue |= OverflowEdgeBottomDontConsume;
-                }
-            case 'all-but-left':
-                if (newValue === -1) {
-                    newValue = OverflowEdgeAllButLeft;
-                }
-                else {
-                    newValue |= OverflowEdgeAllButLeft;
-                }
-            case 'all-but-top':
-                if (newValue === -1) {
-                    newValue = OverflowEdgeAllButTop;
-                }
-                else {
-                    newValue |= OverflowEdgeAllButTop;
-                }
-            case 'all-but-right':
-                if (newValue === -1) {
-                    newValue = OverflowEdgeAllButRight;
-                }
-                else {
-                    newValue |= OverflowEdgeAllButRight;
-                }
-            case 'all-but-bottom':
-                if (newValue === -1) {
-                    newValue = OverflowEdgeAllButBottom;
-                }
-                else {
-                    newValue |= OverflowEdgeAllButBottom;
-                }
-                break;
-        }
-    }
-    if (newValue === -1) {
-        return null;
-    }
-    return newValue;
+    let result = 0;
+    const values = edges.split(',');
+    for (const raw of values) {
+        const value = edgeMap[raw.trim()];
+        if (value === undefined)
+            continue;
+        // dont-apply overrides everything else
+        if (value === OverflowEdgeDontApply)
+            return value;
+        result |= value;
+    }
+    return result === 0 ? null : result;
 }
 export class ContainerView extends View {
+    constructor() {
+        super();
+        this.androidOverflowEdge = 'none';
+    }
 }
 export class CustomLayoutView extends ContainerView {
     createNativeView() {