@ionic/core 8.8.20-dev.11787158518.168a2fea → 8.8.20-dev.11788449221.155f9f1e

package/dist/collection/components/action-sheet/action-sheet.js

@@ -5,62 +5,74 @@ import { Host, h, readTask } from "@stencil/core";
 import { createButtonActiveGesture } from "../../utils/gesture/button-active";
 import { raf } from "../../utils/helpers";
 import { createLockController } from "../../utils/lock-controller";
-import { BACKDROP, cleanupRootFocusTrapAccessibility, createDelegateController, createTriggerController, dismiss, eventMethod, isCancel, prepareOverlay, present, safeCall, setOverlayId, } from "../../utils/overlays";
+import { BACKDROP, createDelegateController, createTriggerController, dismiss, eventMethod, isCancel, prepareOverlay, present, safeCall, setOverlayId, } from "../../utils/overlays";
 import { renderOptionLabel } from "../../utils/select-option-render";
 import { getClassMap } from "../../utils/theme";
-import { getIonMode } from "../../global/ionic-global";
+import { getIonMode, getIonTheme } from "../../global/ionic-global";
 import { iosEnterAnimation } from "./animations/ios.enter";
 import { iosLeaveAnimation } from "./animations/ios.leave";
 import { mdEnterAnimation } from "./animations/md.enter";
 import { mdLeaveAnimation } from "./animations/md.leave";
 /**
- * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use.
+ * @virtualProp {"ios" | "md"} mode - The mode determines the platform behaviors of the component.
+ * @virtualProp {"ios" | "md" | "ionic"} theme - The theme determines the visual appearance of the component.
  */
 export class ActionSheet {
-    delegateController = createDelegateController(this);
-    lockController = createLockController();
-    triggerController = createTriggerController();
-    wrapperEl;
-    groupEl;
-    gesture;
-    hasRadioButtons = false;
-    presented = false;
-    lastFocus;
-    animation;
-    /**
-     * The ID of the currently active/selected radio button.
-     * Used for keyboard navigation and ARIA attributes.
-     */
-    activeRadioId;
-    el;
-    /** @internal */
-    overlayIndex;
-    /** @internal */
-    delegate;
-    /** @internal */
-    hasController = false;
-    /**
-     * If `true`, the keyboard will be automatically dismissed when the overlay is presented.
-     */
-    keyboardClose = true;
-    /**
-     * Animation to use when the action sheet is presented.
-     */
-    enterAnimation;
-    /**
-     * Animation to use when the action sheet is dismissed.
-     */
-    leaveAnimation;
-    /**
-     * An array of buttons for the action sheet.
-     */
-    buttons = [];
+    constructor() {
+        this.delegateController = createDelegateController(this);
+        this.lockController = createLockController();
+        this.triggerController = createTriggerController();
+        this.hasRadioButtons = false;
+        this.presented = false;
+        /** @internal */
+        this.hasController = false;
+        /**
+         * If `true`, the keyboard will be automatically dismissed when the overlay is presented.
+         */
+        this.keyboardClose = true;
+        /**
+         * An array of buttons for the action sheet.
+         */
+        this.buttons = [];
+        /**
+         * If `true`, the action sheet will be dismissed when the backdrop is clicked.
+         */
+        this.backdropDismiss = true;
+        /**
+         * If `true`, the action sheet will be translucent.
+         * Only applies when the theme is `"ios"` and the device supports
+         * [`backdrop-filter`](https://developer.mozilla.org/en-US/docs/Web/CSS/backdrop-filter#Browser_compatibility).
+         */
+        this.translucent = false;
+        /**
+         * If `true`, the action sheet will animate.
+         */
+        this.animated = true;
+        /**
+         * If `true`, the action sheet will open. If `false`, the action sheet will close.
+         * Use this if you need finer grained control over presentation, otherwise
+         * just use the actionSheetController or the `trigger` property.
+         * Note: `isOpen` will not automatically be set back to `false` when
+         * the action sheet dismisses. You will need to do that in your code.
+         */
+        this.isOpen = false;
+        this.onBackdropTap = () => {
+            this.dismiss(undefined, BACKDROP);
+        };
+        this.dispatchCancelHandler = (ev) => {
+            const role = ev.detail.role;
+            if (isCancel(role)) {
+                const cancelButton = this.getButtons().find((b) => b.role === 'cancel');
+                this.callButtonHandler(cancelButton);
+            }
+        };
+    }
     buttonsChanged() {
         const radioButtons = this.getRadioButtons();
         this.hasRadioButtons = radioButtons.length > 0;
         // Initialize activeRadioId when buttons change
         if (this.hasRadioButtons) {
-            const checkedButton = radioButtons.find((b) => b.htmlAttributes?.['aria-checked'] === 'true');
+            const checkedButton = radioButtons.find((b) => { var _a; return ((_a = b.htmlAttributes) === null || _a === void 0 ? void 0 : _a['aria-checked']) === 'true'; });
             if (checkedButton) {
                 const allButtons = this.getButtons();
                 const checkedIndex = allButtons.indexOf(checkedButton);
@@ -68,45 +80,6 @@ export class ActionSheet {
             }
         }
     }
-    /**
-     * Additional classes to apply for custom CSS. If multiple classes are
-     * provided they should be separated by spaces.
-     */
-    cssClass;
-    /**
-     * If `true`, the action sheet will be dismissed when the backdrop is clicked.
-     */
-    backdropDismiss = true;
-    /**
-     * Title for the action sheet.
-     */
-    header;
-    /**
-     * Subtitle for the action sheet.
-     */
-    subHeader;
-    /**
-     * If `true`, the action sheet will be translucent.
-     * Only applies when the mode is `"ios"` and the device supports
-     * [`backdrop-filter`](https://developer.mozilla.org/en-US/docs/Web/CSS/backdrop-filter#Browser_compatibility).
-     */
-    translucent = false;
-    /**
-     * If `true`, the action sheet will animate.
-     */
-    animated = true;
-    /**
-     * Additional attributes to pass to the action sheet.
-     */
-    htmlAttributes;
-    /**
-     * If `true`, the action sheet will open. If `false`, the action sheet will close.
-     * Use this if you need finer grained control over presentation, otherwise
-     * just use the actionSheetController or the `trigger` property.
-     * Note: `isOpen` will not automatically be set back to `false` when
-     * the action sheet dismisses. You will need to do that in your code.
-     */
-    isOpen = false;
     onIsOpenChange(newValue, oldValue) {
         if (newValue === true && oldValue === false) {
             this.present();
@@ -115,53 +88,12 @@ export class ActionSheet {
             this.dismiss();
         }
     }
-    /**
-     * An ID corresponding to the trigger element that
-     * causes the action sheet to open when clicked.
-     */
-    trigger;
     triggerChanged() {
         const { trigger, el, triggerController } = this;
         if (trigger) {
             triggerController.addClickListener(el, trigger);
         }
     }
-    /**
-     * Emitted after the action sheet has presented.
-     */
-    didPresent;
-    /**
-     * Emitted before the action sheet has presented.
-     */
-    willPresent;
-    /**
-     * Emitted before the action sheet has dismissed.
-     */
-    willDismiss;
-    /**
-     * Emitted after the action sheet has dismissed.
-     */
-    didDismiss;
-    /**
-     * Emitted after the action sheet has presented.
-     * Shorthand for ionActionSheetWillDismiss.
-     */
-    didPresentShorthand;
-    /**
-     * Emitted before the action sheet has presented.
-     * Shorthand for ionActionSheetWillPresent.
-     */
-    willPresentShorthand;
-    /**
-     * Emitted before the action sheet has dismissed.
-     * Shorthand for ionActionSheetWillDismiss.
-     */
-    willDismissShorthand;
-    /**
-     * Emitted after the action sheet has dismissed.
-     * Shorthand for ionActionSheetDidDismiss.
-     */
-    didDismissShorthand;
     /**
      * Present the action sheet overlay after it has been created.
      */
@@ -241,7 +173,8 @@ export class ActionSheet {
      */
     getRadioButtons() {
         return this.getButtons().filter((b) => {
-            const role = b.htmlAttributes?.role;
+            var _a;
+            const role = (_a = b.htmlAttributes) === null || _a === void 0 ? void 0 : _a.role;
             return role === 'radio' && !isCancel(role);
         });
     }
@@ -270,16 +203,6 @@ export class ActionSheet {
         const buttonIndex = index !== undefined ? index : allButtons.indexOf(button);
         return `action-sheet-button-${this.overlayIndex}-${buttonIndex}`;
     }
-    onBackdropTap = () => {
-        this.dismiss(undefined, BACKDROP);
-    };
-    dispatchCancelHandler = (ev) => {
-        const role = ev.detail.role;
-        if (isCancel(role)) {
-            const cancelButton = this.getButtons().find((b) => b.role === 'cancel');
-            this.callButtonHandler(cancelButton);
-        }
-    };
     /**
      * When the action sheet has radio buttons, we want to follow the
      * keyboard navigation pattern for radio groups:
@@ -363,19 +286,17 @@ export class ActionSheet {
             this.gesture = undefined;
         }
         this.triggerController.removeClickListener();
-        // Clean up aria-hidden if removed without dismiss() being called
-        if (this.presented) {
-            cleanupRootFocusTrapAccessibility();
-        }
     }
     componentWillLoad() {
-        if (!this.htmlAttributes?.id) {
+        var _a;
+        if (!((_a = this.htmlAttributes) === null || _a === void 0 ? void 0 : _a.id)) {
             setOverlayId(this.el);
         }
         // Initialize activeRadioId for radio buttons
         this.buttonsChanged();
     }
     componentDidLoad() {
+        const mode = getIonMode(this);
         /**
          * Only create gesture if:
          * 1. A gesture does not already exist
@@ -384,7 +305,7 @@ export class ActionSheet {
          * 4. A group ref exists
          */
         const { groupEl, wrapperEl } = this;
-        if (!this.gesture && getIonMode(this) === 'ios' && wrapperEl && groupEl) {
+        if (!this.gesture && mode === 'ios' && wrapperEl && groupEl) {
             readTask(() => {
                 const isScrollable = groupEl.scrollHeight > groupEl.clientHeight;
                 if (!isScrollable) {
@@ -412,10 +333,11 @@ export class ActionSheet {
         this.triggerChanged();
     }
     renderActionSheetButtons(filteredButtons) {
-        const mode = getIonMode(this);
+        const theme = getIonTheme(this);
         const { activeRadioId } = this;
         return filteredButtons.map((b, index) => {
-            const isRadio = b.htmlAttributes?.role === 'radio';
+            var _a;
+            const isRadio = ((_a = b.htmlAttributes) === null || _a === void 0 ? void 0 : _a.role) === 'radio';
             const buttonId = this.getButtonId(b, index);
             const radioButtons = this.getRadioButtons();
             const isActiveRadio = isRadio && buttonId === activeRadioId;
@@ -449,7 +371,7 @@ export class ActionSheet {
             }
             // For radio buttons, set aria-checked based on activeRadioId
             // Otherwise, use the value from htmlAttributes if provided
-            const htmlAttrs = { ...b.htmlAttributes };
+            const htmlAttrs = Object.assign({}, b.htmlAttributes);
             if (isRadio) {
                 htmlAttrs['aria-checked'] = isActiveRadio ? 'true' : 'false';
             }
@@ -467,48 +389,42 @@ export class ActionSheet {
                 endContent: richButton.endContent,
                 description: richButton.description,
             };
-            return (h("button", { ...htmlAttrs, role: isRadio ? 'radio' : undefined, type: "button", id: buttonId, class: {
-                    ...buttonClass(b),
-                    ...(isRadio && { 'action-sheet-selected': isActiveRadio }),
-                }, onClick: () => {
+            return (h("button", Object.assign({}, htmlAttrs, { role: isRadio ? 'radio' : undefined, type: "button", id: buttonId, class: Object.assign(Object.assign({}, buttonClass(b)), (isRadio && { 'action-sheet-selected': isActiveRadio })), onClick: () => {
                     if (isRadio) {
                         this.selectRadioButton(b);
                     }
                     this.buttonClick(b);
-                }, disabled: b.disabled, tabIndex: tabIndex }, h("span", { class: "action-sheet-button-inner" }, b.icon && h("ion-icon", { icon: b.icon, "aria-hidden": "true", lazy: false, class: "action-sheet-icon" }), renderOptionLabel(optionLabelOptions, 'action-sheet-button-label', true)), mode === 'md' && h("ion-ripple-effect", null)));
+                }, disabled: b.disabled, tabIndex: tabIndex }), h("span", { class: "action-sheet-button-inner" }, b.icon && h("ion-icon", { icon: b.icon, "aria-hidden": "true", lazy: false, class: "action-sheet-icon" }), renderOptionLabel(optionLabelOptions, 'action-sheet-button-label', true)), theme === 'md' && h("ion-ripple-effect", null)));
         });
     }
     render() {
         const { header, htmlAttributes, overlayIndex, hasRadioButtons } = this;
-        const mode = getIonMode(this);
+        const theme = getIonTheme(this);
         const allButtons = this.getButtons();
         const cancelButton = allButtons.find((b) => b.role === 'cancel');
         const buttons = allButtons.filter((b) => b.role !== 'cancel');
         const headerID = `action-sheet-${overlayIndex}-header`;
-        return (h(Host, { key: '7685831da9a78b73473246a2cea95cefa79a53c3', role: "dialog", "aria-modal": "true", "aria-labelledby": header !== undefined ? headerID : null, tabindex: "-1", ...htmlAttributes, style: {
+        return (h(Host, Object.assign({ key: '686ad4bf09a5f90bec0a80381b673f00b798345a', role: "dialog", "aria-modal": "true", "aria-labelledby": header !== undefined ? headerID : null, tabindex: "-1" }, htmlAttributes, { style: {
                 zIndex: `${20000 + this.overlayIndex}`,
-            }, class: {
-                [mode]: true,
-                ...getClassMap(this.cssClass),
-                'overlay-hidden': true,
-                'action-sheet-translucent': this.translucent,
-            }, onIonActionSheetWillDismiss: this.dispatchCancelHandler, onIonBackdropTap: this.onBackdropTap }, h("ion-backdrop", { key: 'c70f00e401cac99b89412d1adb867f35bc855d57', tappable: this.backdropDismiss }), h("div", { key: '3332893ce3098f1435875480b1269b2821d41660', tabindex: "0", "aria-hidden": "true" }), h("div", { key: 'eb406b0a9e303d6f94c5c7aa99c6f4c089bfbd41', class: "action-sheet-wrapper ion-overlay-wrapper", ref: (el) => (this.wrapperEl = el) }, h("div", { key: '92ec855379f10e1e0bfce6ff68b45d3cda0c137c', class: "action-sheet-container" }, h("div", { key: 'bc88a396d75396f574961471bf7e6c4edb513353', class: "action-sheet-group", ref: (el) => (this.groupEl = el), role: hasRadioButtons ? 'radiogroup' : undefined }, header !== undefined && (h("div", { key: '33329e0193818888bdcaa443ff5ea301802e0787', id: headerID, class: {
+            }, class: Object.assign(Object.assign({ [theme]: true }, getClassMap(this.cssClass)), { 'overlay-hidden': true, 'action-sheet-translucent': this.translucent }), onIonActionSheetWillDismiss: this.dispatchCancelHandler, onIonBackdropTap: this.onBackdropTap }), h("ion-backdrop", { key: '9a9d56159c030c5a9f23b588350abdc69806d825', tappable: this.backdropDismiss }), h("div", { key: 'd851dd250c9e371f77618aefae1ca17273e56455', tabindex: "0", "aria-hidden": "true" }), h("div", { key: 'b3779f483a4d761b38e73a1f24eb2640c5f2b9ee', class: "action-sheet-wrapper ion-overlay-wrapper", ref: (el) => (this.wrapperEl = el) }, h("div", { key: '91bc56942ef4530b88d83b6a50c0a9b6e0c7eea5', class: "action-sheet-container" }, h("div", { key: 'ef1bba4c6b64b028271ce15f02f9f0a1d9f4495a', class: "action-sheet-group", ref: (el) => (this.groupEl = el), role: hasRadioButtons ? 'radiogroup' : undefined, "data-roving-focus": hasRadioButtons ? true : undefined }, header !== undefined && (h("div", { key: '7618572520e9f202637547f73e10dcc50680767c', id: headerID, class: {
                 'action-sheet-title': true,
                 'action-sheet-has-sub-title': this.subHeader !== undefined,
-            } }, header, this.subHeader && h("div", { key: '92ac5a9217a12b7417f7aca9c4fdb7bf6b051364', class: "action-sheet-sub-title" }, this.subHeader))), this.renderActionSheetButtons(buttons)), cancelButton && (h("div", { key: '020463b830fa48fc3ae647ea64f2aaa4d0969305', class: "action-sheet-group action-sheet-group-cancel" }, h("button", { key: 'cefa9c70a2233f6652a81b1a2eae6e717712144d', ...cancelButton.htmlAttributes, type: "button", class: buttonClass(cancelButton), onClick: () => this.buttonClick(cancelButton) }, h("span", { key: '56d7e2f8bfb3644e4476895164d334445fda9b2f', class: "action-sheet-button-inner" }, cancelButton.icon && (h("ion-icon", { key: '6a4a49254ec5cd96f4e0dce9447f90d8cac81913', icon: cancelButton.icon, "aria-hidden": "true", lazy: false, class: "action-sheet-icon" })), cancelButton.text), mode === 'md' && h("ion-ripple-effect", { key: '7d3c6e8d70b0922ea0f75520856285ce1005c891' })))))), h("div", { key: '958fc43e603c6a7f5d1e649d3326fce0f163b5d0', tabindex: "0", "aria-hidden": "true" })));
+            } }, header, this.subHeader && h("div", { key: '351dc521ba92455a6be87d9eb135087852a27641', class: "action-sheet-sub-title" }, this.subHeader))), this.renderActionSheetButtons(buttons)), cancelButton && (h("div", { key: '68b5f28776716d4317db73bc5e0cc46d2c709aa1', class: "action-sheet-group action-sheet-group-cancel" }, h("button", Object.assign({ key: 'c0b625c87ca4283ecdd313bea6779c2401b333b6' }, cancelButton.htmlAttributes, { type: "button", class: buttonClass(cancelButton), onClick: () => this.buttonClick(cancelButton) }), h("span", { key: 'eb9df659bce98745d82e126a49ddf737c4b1d5ff', class: "action-sheet-button-inner" }, cancelButton.icon && (h("ion-icon", { key: 'dbb6fdaecb8ab5eda98fc7588f592037af7b6e10', icon: cancelButton.icon, "aria-hidden": "true", lazy: false, class: "action-sheet-icon" })), cancelButton.text), theme === 'md' && h("ion-ripple-effect", { key: '7a6a7cb8ccb82c51c194d6cc47ae0400c6d38adc' })))))), h("div", { key: '2f242d9130718e70a61449d42833e2063bc1d7a8', tabindex: "0", "aria-hidden": "true" })));
     }
     static get is() { return "ion-action-sheet"; }
     static get encapsulation() { return "scoped"; }
     static get originalStyleUrls() {
         return {
             "ios": ["action-sheet.ios.scss"],
-            "md": ["action-sheet.md.scss"]
+            "md": ["action-sheet.md.scss"],
+            "ionic": ["action-sheet.ionic.scss"]
         };
     }
     static get styleUrls() {
         return {
             "ios": ["action-sheet.ios.css"],
-            "md": ["action-sheet.md.css"]
+            "md": ["action-sheet.md.css"],
+            "ionic": ["action-sheet.ionic.css"]
         };
     }
     static get properties() {
@@ -767,7 +683,7 @@ export class ActionSheet {
                 "optional": false,
                 "docs": {
                     "tags": [],
-                    "text": "If `true`, the action sheet will be translucent.\nOnly applies when the mode is `\"ios\"` and the device supports\n[`backdrop-filter`](https://developer.mozilla.org/en-US/docs/Web/CSS/backdrop-filter#Browser_compatibility)."
+                    "text": "If `true`, the action sheet will be translucent.\nOnly applies when the theme is `\"ios\"` and the device supports\n[`backdrop-filter`](https://developer.mozilla.org/en-US/docs/Web/CSS/backdrop-filter#Browser_compatibility)."
                 },
                 "getter": false,
                 "setter": false,
@@ -1139,11 +1055,5 @@ export class ActionSheet {
     }
 }
 const buttonClass = (button) => {
-    return {
-        'action-sheet-button': true,
-        'ion-activatable': !button.disabled,
-        'ion-focusable': !button.disabled,
-        [`action-sheet-${button.role}`]: button.role !== undefined,
-        ...getClassMap(button.cssClass),
-    };
+    return Object.assign({ 'action-sheet-button': true, 'ion-activatable': !button.disabled, 'ion-focusable': !button.disabled, [`action-sheet-${button.role}`]: button.role !== undefined }, getClassMap(button.cssClass));
 };