@ionic/core 8.0.0-dev.11712850753.10c4a960 → 8.0.0-dev.11713809015.1aabd368

package/dist/collection/components/picker-column/picker-column.js

@@ -102,7 +102,7 @@ export class PickerColumn {
             const enableHaptics = isPlatform('ios');
             const { el, scrollEl } = this;
             let timeout;
-            let activeEl = this.activeItem;
+            let { activeItem: activeEl } = this.activeItem;
             const scrollCallback = () => {
                 raf(() => {
                     if (!scrollEl)
@@ -245,12 +245,121 @@ export class PickerColumn {
              */
             this.el.classList.remove('picker-column-active');
         };
+        /**
+         * Find the next enabled option after the active option.
+         * @param stride - How many options to "jump" over in order to select the next option.
+         * This can be used to implement PageUp/PageDown behaviors where pressing these keys
+         * scrolls the picker by more than 1 option. For example, a stride of 5 means select
+         * the enabled option 5 options after the active one. Note that the actual option selected
+         * may be past the stride if the option at the stride is disabled.
+         */
+        this.findNextOption = (stride = 1) => {
+            const { activeItem } = this.activeItem;
+            if (!activeItem)
+                return null;
+            let prevNode = activeItem;
+            let node = activeItem.nextElementSibling;
+            while (node != null) {
+                if (stride > 0) {
+                    stride--;
+                }
+                if (node.tagName === 'ION-PICKER-COLUMN-OPTION' && !node.disabled && stride === 0) {
+                    return node;
+                }
+                prevNode = node;
+                // Use nextElementSibling instead of nextSibling to avoid text/comment nodes
+                node = node.nextElementSibling;
+            }
+            return prevNode;
+        };
+        /**
+         * Find the next enabled option after the active option.
+         * @param stride - How many options to "jump" over in order to select the next option.
+         * This can be used to implement PageUp/PageDown behaviors where pressing these keys
+         * scrolls the picker by more than 1 option. For example, a stride of 5 means select
+         * the enabled option 5 options before the active one. Note that the actual option selected
+         *  may be past the stride if the option at the stride is disabled.
+         */
+        this.findPreviousOption = (stride = 1) => {
+            const { activeItem } = this.activeItem;
+            if (!activeItem)
+                return null;
+            let nextNode = activeItem;
+            let node = activeItem.previousElementSibling;
+            while (node != null) {
+                if (stride > 0) {
+                    stride--;
+                }
+                if (node.tagName === 'ION-PICKER-COLUMN-OPTION' && !node.disabled && stride === 0) {
+                    return node;
+                }
+                nextNode = node;
+                // Use previousElementSibling instead of previousSibling to avoid text/comment nodes
+                node = node.previousElementSibling;
+            }
+            return nextNode;
+        };
+        this.onKeyDown = (ev) => {
+            let newOption = null;
+            switch (ev.key) {
+                case 'ArrowDown':
+                    newOption = this.findNextOption();
+                    break;
+                case 'ArrowUp':
+                    newOption = this.findPreviousOption();
+                    break;
+                case 'PageUp':
+                    newOption = this.findPreviousOption(5);
+                    break;
+                case 'PageDown':
+                    newOption = this.findNextOption(5);
+                    break;
+                case 'Home':
+                    /**
+                     * There is no guarantee that the first child will be an ion-picker-column-option,
+                     * so we do not use firstElementChild.
+                     */
+                    newOption = this.el.querySelector('ion-picker-column-option:first-of-type');
+                    break;
+                case 'End':
+                    /**
+                     * There is no guarantee that the last child will be an ion-picker-column-option,
+                     * so we do not use lastElementChild.
+                     */
+                    newOption = this.el.querySelector('ion-picker-column-option:last-of-type');
+                    break;
+                default:
+                    break;
+            }
+            if (newOption !== null) {
+                this.value = newOption.value;
+                // This stops any default browser behavior such as scrolling
+                ev.preventDefault();
+            }
+        };
+        /**
+         * Render an element that overlays the column. This element is for assistive
+         * tech to allow users to navigate the column up/down. This element should receive
+         * focus as it listens for synthesized keyboard events as required by the
+         * slider role: https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/slider_role
+         */
+        this.renderAssistiveFocusable = () => {
+            var _a;
+            const { activeItem, activeItemIndex } = this.activeItem;
+            const { el } = this;
+            const valueText = activeItem ? (_a = activeItem.getAttribute('aria-label')) !== null && _a !== void 0 ? _a : activeItem.innerText : '';
+            return (h("div", { class: "assistive-focusable", role: "slider", tabindex: this.disabled ? undefined : 0, "aria-label": this.ariaLabel, "aria-valuemin": 0, "aria-valuemax": el.childElementCount - 1, "aria-valuenow": activeItemIndex >= 0 ? activeItemIndex : 0, "aria-valuetext": valueText, "aria-orientation": "vertical", onKeyDown: (ev) => this.onKeyDown(ev) }));
+        };
+        this.ariaLabel = null;
         this.isActive = false;
         this.disabled = false;
         this.value = undefined;
         this.color = 'primary';
         this.numericInput = false;
     }
+    ariaLabelChanged(newValue) {
+        this.ariaLabel = newValue;
+    }
     valueChange() {
         if (this.isColumnVisible) {
             /**
@@ -281,7 +390,8 @@ export class PickerColumn {
              */
             const ev = entries[entries.length - 1];
             if (ev.isIntersecting) {
-                const { activeItem, el } = this;
+                const { activeItem } = this.activeItem;
+                const { el } = this;
                 this.isColumnVisible = true;
                 /**
                  * Because this initial call to scrollActiveItemIntoView has to fire before
@@ -321,7 +431,8 @@ export class PickerColumn {
         }
     }
     componentDidRender() {
-        const { el, activeItem, isColumnVisible, value } = this;
+        const { activeItem } = this.activeItem;
+        const { el, isColumnVisible, value } = this;
         if (isColumnVisible && !activeItem) {
             const firstOption = el.querySelector('ion-picker-column-option');
             /**
@@ -338,7 +449,7 @@ export class PickerColumn {
     }
     /** @internal  */
     async scrollActiveItemIntoView(smooth = false) {
-        const activeEl = this.activeItem;
+        const { activeItem: activeEl } = this.activeItem;
         if (activeEl) {
             this.centerPickerItemInView(activeEl, smooth, false);
         }
@@ -366,31 +477,39 @@ export class PickerColumn {
             this.scrollEl.focus();
         }
     }
+    connectedCallback() {
+        var _a;
+        this.ariaLabel = (_a = this.el.getAttribute('aria-label')) !== null && _a !== void 0 ? _a : 'Select a value';
+    }
     get activeItem() {
         const { value } = this;
-        const options = Array.from(this.el.querySelectorAll('ion-picker-column-option'));
-        return options.find((option) => {
+        const options = this.el.querySelectorAll('ion-picker-column-option');
+        for (let i = 0; i <= options.length - 1; i++) {
+            const option = options[i];
             /**
              * If the whole picker column is disabled, the current value should appear active
              * If the current value item is specifically disabled, it should not appear active
              */
-            if (!this.disabled && option.disabled) {
-                return false;
+            if (option.value === value && !option.disabled) {
+                return {
+                    activeItem: option,
+                    activeItemIndex: i,
+                };
             }
-            return option.value === value;
-        });
+        }
+        return { activeItem: undefined, activeItemIndex: -1 };
     }
     render() {
         const { color, disabled, isActive, numericInput } = this;
         const mode = getIonMode(this);
-        return (h(Host, { key: '36fba9b5a9938eb80facbd39ebf2227c0b8df96b', class: createColorClasses(color, {
+        return (h(Host, { key: '87534568ba47096dca1be00fee184052767087f5', class: createColorClasses(color, {
                 [mode]: true,
                 ['picker-column-active']: isActive,
                 ['picker-column-numeric-input']: numericInput,
                 ['picker-column-disabled']: disabled,
-            }) }, h("slot", { key: 'e872bd8ccecb45f2abfae0a17c99bd193c323fb7', name: "prefix" }), h("div", { key: '3b8d9502fb428c99aa18e5396cd4f37a7cac222f', class: "picker-opts", tabindex: disabled ? undefined : 0, ref: (el) => {
+            }) }, this.renderAssistiveFocusable(), h("slot", { key: '8dedc4f294f1a6658a12151a765f6fa790f4d854', name: "prefix" }), h("div", { key: 'c82975dc3996d3ddb8dee12ad381ee733466a069', "aria-hidden": "true", class: "picker-opts", ref: (el) => {
                 this.scrollEl = el;
-            } }, h("div", { key: 'b5f1bb3f63cc786fb5363b0c4a8e3c7de5336f5e', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '9b19a3d7463dc4b0b1f85f29573f5ab09da9cfe4', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '981c7c7171318c5b5bc31ed2de35ffd1a7229760', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("slot", { key: '387695afab07d859ec22c3d8b096485c694eff1e' }), h("div", { key: 'dca63e9f8945cf0a2010b552e79cc8c821e7d1ff', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '95e80d163c50f3112fbc36cb66502e07f87b2aa1', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: 'd29c471d7529b7eebb10b1fe1ac7d93be25aedb1', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0")), h("slot", { key: 'bc3527c0dd2ec7775f3ae16feb06736308a996e5', name: "suffix" })));
+            } }, h("div", { key: '2de49979f9339f4a9a384e115ea5a073b6467e50', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '304e0bcc506f4c4d35d053e95c85de9c9bdc303c', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '3da0eb1d7e1d8b196112f7d695447b40716eef1d', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("slot", { key: '43668a05c3eb39749bde1137e33872e1b406cba9' }), h("div", { key: '95d4ae922ad45aa541a70b08958b08a2d3c79fbe', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '412aca51c2d3b4cc1bcc1fffca68922db64f7745', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '2319fa61c7649dec3efa2ec2e7b93d5e9a775708', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0")), h("slot", { key: '010cee6ffdbe1a6d5331cb4e185b1aa0b6effd2d', name: "suffix" })));
     }
     static get is() { return "ion-picker-column"; }
     static get encapsulation() { return "shadow"; }
@@ -490,6 +609,7 @@ export class PickerColumn {
     }
     static get states() {
         return {
+            "ariaLabel": {},
             "isActive": {}
         };
     }
@@ -594,6 +714,9 @@ export class PickerColumn {
     static get elementRef() { return "el"; }
     static get watchers() {
         return [{
+                "propName": "aria-label",
+                "methodName": "ariaLabelChanged"
+            }, {
                 "propName": "value",
                 "methodName": "valueChange"
             }];

package/dist/collection/components/picker-column/test/picker-column.spec.js

@@ -0,0 +1,103 @@
+/*!
+ * (C) Ionic http://ionicframework.com - MIT License
+ */
+import { h } from "@stencil/core";
+import { newSpecPage } from "@stencil/core/testing";
+import { PickerColumn } from "../picker-column";
+import { PickerColumnOption } from "../../picker-column-option/picker-column-option";
+describe('picker-column: assistive element', () => {
+    beforeEach(() => {
+        const mockIntersectionObserver = jest.fn();
+        mockIntersectionObserver.mockReturnValue({
+            observe: () => null,
+            unobserve: () => null,
+            disconnect: () => null,
+        });
+        global.IntersectionObserver = mockIntersectionObserver;
+    });
+    it('should have a default label', async () => {
+        const page = await newSpecPage({
+            components: [PickerColumn],
+            template: () => h("ion-picker-column", null),
+        });
+        const pickerCol = page.body.querySelector('ion-picker-column');
+        const assistiveFocusable = pickerCol.shadowRoot.querySelector('.assistive-focusable');
+        expect(assistiveFocusable.getAttribute('aria-label')).not.toBe(null);
+    });
+    it('should have a custom label', async () => {
+        const page = await newSpecPage({
+            components: [PickerColumn],
+            template: () => h("ion-picker-column", { "aria-label": "my label" }),
+        });
+        const pickerCol = page.body.querySelector('ion-picker-column');
+        const assistiveFocusable = pickerCol.shadowRoot.querySelector('.assistive-focusable');
+        expect(assistiveFocusable.getAttribute('aria-label')).toBe('my label');
+    });
+    it('should update a custom label', async () => {
+        const page = await newSpecPage({
+            components: [PickerColumn],
+            template: () => h("ion-picker-column", null),
+        });
+        const pickerCol = page.body.querySelector('ion-picker-column');
+        const assistiveFocusable = pickerCol.shadowRoot.querySelector('.assistive-focusable');
+        pickerCol.setAttribute('aria-label', 'my label');
+        await page.waitForChanges();
+        expect(assistiveFocusable.getAttribute('aria-label')).toBe('my label');
+    });
+    it('should receive keyboard focus when enabled', async () => {
+        const page = await newSpecPage({
+            components: [PickerColumn],
+            template: () => h("ion-picker-column", null),
+        });
+        const pickerCol = page.body.querySelector('ion-picker-column');
+        const assistiveFocusable = pickerCol.shadowRoot.querySelector('.assistive-focusable');
+        expect(assistiveFocusable.tabIndex).toBe(0);
+    });
+    it('should not receive keyboard focus when disabled', async () => {
+        const page = await newSpecPage({
+            components: [PickerColumn],
+            template: () => h("ion-picker-column", { disabled: true }),
+        });
+        const pickerCol = page.body.querySelector('ion-picker-column');
+        const assistiveFocusable = pickerCol.shadowRoot.querySelector('.assistive-focusable');
+        expect(assistiveFocusable.tabIndex).toBe(-1);
+    });
+    it('should use option aria-label as assistive element aria-valuetext', async () => {
+        const page = await newSpecPage({
+            components: [PickerColumn, PickerColumnOption],
+            template: () => (h("ion-picker-column", { value: 1 }, h("ion-picker-column-option", { value: 1, "aria-label": "My Label" }, "My Text"))),
+        });
+        const pickerCol = page.body.querySelector('ion-picker-column');
+        const assistiveFocusable = pickerCol.shadowRoot.querySelector('.assistive-focusable');
+        expect(assistiveFocusable.getAttribute('aria-valuetext')).toBe('My Label');
+    });
+    it('should use option text as assistive element aria-valuetext when no label provided', async () => {
+        const page = await newSpecPage({
+            components: [PickerColumn, PickerColumnOption],
+            template: () => (h("ion-picker-column", { value: 1 }, h("ion-picker-column-option", { value: 1 }, "My Text"))),
+        });
+        const pickerCol = page.body.querySelector('ion-picker-column');
+        const assistiveFocusable = pickerCol.shadowRoot.querySelector('.assistive-focusable');
+        expect(assistiveFocusable.getAttribute('aria-valuetext')).toBe('My Text');
+    });
+    it('should have the correct value count attributes', async () => {
+        const page = await newSpecPage({
+            components: [PickerColumn, PickerColumnOption],
+            template: () => (h("ion-picker-column", { value: 2 }, h("ion-picker-column-option", { value: 1 }, "My Text"), h("ion-picker-column-option", { value: 2 }, "My Text"), h("ion-picker-column-option", { value: 3 }, "My Text"))),
+        });
+        const pickerCol = page.body.querySelector('ion-picker-column');
+        const assistiveFocusable = pickerCol.shadowRoot.querySelector('.assistive-focusable');
+        expect(assistiveFocusable.getAttribute('aria-valuemin')).toBe('0');
+        expect(assistiveFocusable.getAttribute('aria-valuemax')).toBe('2');
+        expect(assistiveFocusable.getAttribute('aria-valuenow')).toBe('1');
+    });
+    it('should clamp the value now attributes', async () => {
+        const page = await newSpecPage({
+            components: [PickerColumn, PickerColumnOption],
+            template: () => (h("ion-picker-column", null, h("ion-picker-column-option", { value: 1 }, "My Text"), h("ion-picker-column-option", { value: 2 }, "My Text"), h("ion-picker-column-option", { value: 3 }, "My Text"))),
+        });
+        const pickerCol = page.body.querySelector('ion-picker-column');
+        const assistiveFocusable = pickerCol.shadowRoot.querySelector('.assistive-focusable');
+        expect(assistiveFocusable.getAttribute('aria-valuenow')).toBe('0');
+    });
+});

package/dist/collection/components/picker-column-option/picker-column-option.js

@@ -76,10 +76,10 @@ export class PickerColumnOption {
     render() {
         const { color, disabled, ariaLabel } = this;
         const mode = getIonMode(this);
-        return (h(Host, { key: '1d5358c019c01ca429ddb514b9f9b67a3c89f652', class: createColorClasses(color, {
+        return (h(Host, { key: '9333d9ac8e9990fc840f31e00391177d9cd563b3', class: createColorClasses(color, {
                 [mode]: true,
                 ['option-disabled']: disabled,
-            }) }, h("button", { key: 'c86794a15b61062a886c6f5113723ccd98238e9f', tabindex: "-1", "aria-label": ariaLabel, disabled: disabled, onClick: () => this.onClick() }, h("slot", { key: 'ab7f80cacdd39b5aedf7d2cc8eddc6288093629a' }))));
+            }) }, h("button", { key: '6ca92bc584587230135982106eab542589fc4c9d', tabindex: "-1", "aria-label": ariaLabel, disabled: disabled, onClick: () => this.onClick() }, h("slot", { key: 'd9a68906017f77143a0691b9bbc59ae2142da6aa' }))));
     }
     static get is() { return "ion-picker-column-option"; }
     static get encapsulation() { return "shadow"; }

package/dist/collection/components/picker-legacy/picker.js

@@ -182,11 +182,11 @@ export class Picker {
     render() {
         const { htmlAttributes } = this;
         const mode = getIonMode(this);
-        return (h(Host, Object.assign({ key: '1cf2f8a25a3eca7ac59eff969803c85540f102fc', "aria-modal": "true", tabindex: "-1" }, htmlAttributes, { style: {
+        return (h(Host, Object.assign({ key: '91d3d127c46d125a2a86222e3002d804ebd8bc84', "aria-modal": "true", tabindex: "-1" }, htmlAttributes, { style: {
                 zIndex: `${20000 + this.overlayIndex}`,
             }, class: Object.assign({ [mode]: true,
                 // Used internally for styling
-                [`picker-${mode}`]: true, 'overlay-hidden': true }, getClassMap(this.cssClass)), onIonBackdropTap: this.onBackdropTap, onIonPickerWillDismiss: this.dispatchCancelHandler }), h("ion-backdrop", { key: '3a70c7c6e0457afda2e9ef4619cb253b583b7805', visible: this.showBackdrop, tappable: this.backdropDismiss }), h("div", { key: '4c90cf7dfeb9d2bdb5e947739864dbc2d1e327e0', tabindex: "0" }), h("div", { key: '050098ced341fd86bfcd72595b1f7a52c3b01b46', class: "picker-wrapper ion-overlay-wrapper", role: "dialog" }, h("div", { key: 'b0d9420fb053d0c71af04c88224a38f804fd99ba', class: "picker-toolbar" }, this.buttons.map((b) => (h("div", { class: buttonWrapperClass(b) }, h("button", { type: "button", onClick: () => this.buttonClick(b), class: buttonClass(b) }, b.text))))), h("div", { key: '82cd2788c394079cb8843c240c17e3629eef0953', class: "picker-columns" }, h("div", { key: '34d2ce59e88b5967e52fe8077ef3a151c6ce38e5', class: "picker-above-highlight" }), this.presented && this.columns.map((c) => h("ion-picker-legacy-column", { col: c })), h("div", { key: 'b604b101bc0006efc246aea9320d9f44419c531f', class: "picker-below-highlight" }))), h("div", { key: '70437d735b009386b4f5ae250b555c039c366183', tabindex: "0" })));
+                [`picker-${mode}`]: true, 'overlay-hidden': true }, getClassMap(this.cssClass)), onIonBackdropTap: this.onBackdropTap, onIonPickerWillDismiss: this.dispatchCancelHandler }), h("ion-backdrop", { key: '63140c43f7a2e3000076adec0406197cb569f985', visible: this.showBackdrop, tappable: this.backdropDismiss }), h("div", { key: '3e86ec5e61adf40983a1d33ef24f66f4f75307e8', tabindex: "0" }), h("div", { key: '3c3844f369da33e35c9a498d88d1b7e4d686b8ce', class: "picker-wrapper ion-overlay-wrapper", role: "dialog" }, h("div", { key: 'e03200231976723409505b0c4070e7f596815e50', class: "picker-toolbar" }, this.buttons.map((b) => (h("div", { class: buttonWrapperClass(b) }, h("button", { type: "button", onClick: () => this.buttonClick(b), class: buttonClass(b) }, b.text))))), h("div", { key: 'd59de79e8c364376bc16d2edae3672b21443f3fe', class: "picker-columns" }, h("div", { key: 'e79cb88c5397047bc8c7e71efb4f1a338773e744', class: "picker-above-highlight" }), this.presented && this.columns.map((c) => h("ion-picker-legacy-column", { col: c })), h("div", { key: '776de64da09485ad1dbf78d4d402e297b94348a6', class: "picker-below-highlight" }))), h("div", { key: 'f0aa77e3b467c3fb4950389d27c13769dc913b14', tabindex: "0" })));
     }
     static get is() { return "ion-picker-legacy"; }
     static get encapsulation() { return "scoped"; }

package/dist/collection/components/picker-legacy-column/picker-column.js

@@ -336,9 +336,9 @@ export class PickerColumnCmp {
     render() {
         const col = this.col;
         const mode = getIonMode(this);
-        return (h(Host, { key: '0337ac8379be177501b8d61f0ac0f68ecbb8344d', class: Object.assign({ [mode]: true, 'picker-col': true, 'picker-opts-left': this.col.align === 'left', 'picker-opts-right': this.col.align === 'right' }, getClassMap(col.cssClass)), style: {
+        return (h(Host, { key: '90b9d07917c0643cf8a622f090abefcd2846ac96', class: Object.assign({ [mode]: true, 'picker-col': true, 'picker-opts-left': this.col.align === 'left', 'picker-opts-right': this.col.align === 'right' }, getClassMap(col.cssClass)), style: {
                 'max-width': this.col.columnWidth,
-            } }, col.prefix && (h("div", { class: "picker-prefix", style: { width: col.prefixWidth } }, col.prefix)), h("div", { key: '013ba8ea1c2fe4fe717386b9cc87484913c234f7', class: "picker-opts", style: { maxWidth: col.optionsWidth }, ref: (el) => (this.optsEl = el) }, col.options.map((o, index) => (h("button", { "aria-label": o.ariaLabel, class: { 'picker-opt': true, 'picker-opt-disabled': !!o.disabled }, "opt-index": index }, o.text)))), col.suffix && (h("div", { class: "picker-suffix", style: { width: col.suffixWidth } }, col.suffix))));
+            } }, col.prefix && (h("div", { class: "picker-prefix", style: { width: col.prefixWidth } }, col.prefix)), h("div", { key: '4adca834de9295a18bdb355ebbfa49813f0f93f8', class: "picker-opts", style: { maxWidth: col.optionsWidth }, ref: (el) => (this.optsEl = el) }, col.options.map((o, index) => (h("button", { "aria-label": o.ariaLabel, class: { 'picker-opt': true, 'picker-opt-disabled': !!o.disabled }, "opt-index": index }, o.text)))), col.suffix && (h("div", { class: "picker-suffix", style: { width: col.suffixWidth } }, col.suffix))));
     }
     static get is() { return "ion-picker-legacy-column"; }
     static get originalStyleUrls() {

package/dist/collection/components/popover/popover.js

@@ -7,7 +7,7 @@ import { CoreDelegate, attachComponent, detachComponent } from "../../utils/fram
 import { addEventListener, raf, hasLazyBuild } from "../../utils/helpers";
 import { createLockController } from "../../utils/lock-controller";
 import { printIonWarning } from "../../utils/logging/index";
-import { BACKDROP, dismiss, eventMethod, prepareOverlay, present, setOverlayId, FOCUS_TRAP_DISABLE_CLASS, } from "../../utils/overlays";
+import { BACKDROP, dismiss, eventMethod, prepareOverlay, present, setOverlayId } from "../../utils/overlays";
 import { isPlatform } from "../../utils/platform";
 import { getClassMap } from "../../utils/theme";
 import { deepReady, waitForMount } from "../../utils/transition/index";
@@ -107,7 +107,6 @@ export class Popover {
         this.arrow = true;
         this.isOpen = false;
         this.keyboardEvents = false;
-        this.focusTrap = true;
         this.keepContentsMounted = false;
     }
     onTriggerChange() {
@@ -334,12 +333,12 @@ export class Popover {
     }
     render() {
         const mode = getIonMode(this);
-        const { onLifecycle, parentPopover, dismissOnSelect, side, arrow, htmlAttributes, focusTrap } = this;
+        const { onLifecycle, parentPopover, dismissOnSelect, side, arrow, htmlAttributes } = this;
         const desktop = isPlatform('desktop');
         const enableArrow = arrow && !parentPopover;
-        return (h(Host, Object.assign({ key: '4c8d34559a6e383cb778566f2c6e88690def0ba0', "aria-modal": "true", "no-router": true, tabindex: "-1" }, htmlAttributes, { style: {
+        return (h(Host, Object.assign({ key: '8e3ff2681dbd4d2a659633ba2d5419abb2646858', "aria-modal": "true", "no-router": true, tabindex: "-1" }, htmlAttributes, { style: {
                 zIndex: `${20000 + this.overlayIndex}`,
-            }, class: Object.assign(Object.assign({}, getClassMap(this.cssClass)), { [mode]: true, 'popover-translucent': this.translucent, 'overlay-hidden': true, 'popover-desktop': desktop, [`popover-side-${side}`]: true, [FOCUS_TRAP_DISABLE_CLASS]: focusTrap === false, 'popover-nested': !!parentPopover }), onIonPopoverDidPresent: onLifecycle, onIonPopoverWillPresent: onLifecycle, onIonPopoverWillDismiss: onLifecycle, onIonPopoverDidDismiss: onLifecycle, onIonBackdropTap: this.onBackdropTap }), !parentPopover && h("ion-backdrop", { tappable: this.backdropDismiss, visible: this.showBackdrop, part: "backdrop" }), h("div", { key: '710e22246d151441d80f2bbd618145d7dc651f09', class: "popover-wrapper ion-overlay-wrapper", onClick: dismissOnSelect ? () => this.dismiss() : undefined }, enableArrow && h("div", { class: "popover-arrow", part: "arrow" }), h("div", { key: 'aefcaa864ba3b941597bae15dedc51c33e1b7bb9', class: "popover-content", part: "content" }, h("slot", { key: 'b2384f79e042a5946b65511bd339bd0cf7772d18' })))));
+            }, class: Object.assign(Object.assign({}, getClassMap(this.cssClass)), { [mode]: true, 'popover-translucent': this.translucent, 'overlay-hidden': true, 'popover-desktop': desktop, [`popover-side-${side}`]: true, 'popover-nested': !!parentPopover }), onIonPopoverDidPresent: onLifecycle, onIonPopoverWillPresent: onLifecycle, onIonPopoverWillDismiss: onLifecycle, onIonPopoverDidDismiss: onLifecycle, onIonBackdropTap: this.onBackdropTap }), !parentPopover && h("ion-backdrop", { tappable: this.backdropDismiss, visible: this.showBackdrop, part: "backdrop" }), h("div", { key: '9bdb7b263b7ecaee62fd091dbc55ea3b8cf02b45', class: "popover-wrapper ion-overlay-wrapper", onClick: dismissOnSelect ? () => this.dismiss() : undefined }, enableArrow && h("div", { class: "popover-arrow", part: "arrow" }), h("div", { key: '03bf042a104e8d019bd815ce0cc63a1b503cd644', class: "popover-content", part: "content" }, h("slot", { key: 'dd9e35e0af13da7b98d094cc1d5b1161afaf267b' })))));
     }
     static get is() { return "ion-popover"; }
     static get encapsulation() { return "shadow"; }
@@ -861,24 +860,6 @@ export class Popover {
                 "reflect": false,
                 "defaultValue": "false"
             },
-            "focusTrap": {
-                "type": "boolean",
-                "mutable": false,
-                "complexType": {
-                    "original": "boolean",
-                    "resolved": "boolean",
-                    "references": {}
-                },
-                "required": false,
-                "optional": false,
-                "docs": {
-                    "tags": [],
-                    "text": "If `true`, focus will not be allowed to move outside of this overlay.\nIf 'false', focus will be allowed to move outside of the overlay.\n\nIn most scenarios this property should remain set to `true`. Setting\nthis property to `false` can cause severe accessibility issues as users\nrelying on assistive technologies may be able to move focus into\na confusing state. We recommend only setting this to `false` when\nabsolutely necessary.\n\nDevelopers may want to consider disabling focus trapping if this\noverlay presents a non-Ionic overlay from a 3rd party library.\nDevelopers would disable focus trapping on the Ionic overlay\nwhen presenting the 3rd party overlay and then re-enable\nfocus trapping when dismissing the 3rd party overlay and moving\nfocus back to the Ionic overlay."
-                },
-                "attribute": "focus-trap",
-                "reflect": false,
-                "defaultValue": "true"
-            },
             "keepContentsMounted": {
                 "type": "boolean",
                 "mutable": false,

package/dist/collection/components/popover/test/basic/popover.spec.js

@@ -4,7 +4,6 @@
 import { h } from "@stencil/core";
 import { newSpecPage } from "@stencil/core/testing";
 import { Popover } from "../../popover";
-import { FOCUS_TRAP_DISABLE_CLASS } from "../../../../utils/overlays";
 describe('popover: htmlAttributes inheritance', () => {
     it('should correctly inherit attributes on host', async () => {
         const page = await newSpecPage({
@@ -15,21 +14,3 @@ describe('popover: htmlAttributes inheritance', () => {
         await expect(popover.getAttribute('data-testid')).toBe('basic-popover');
     });
 });
-describe('popover: focus trap', () => {
-    it('should set the focus trap class when disabled', async () => {
-        const page = await newSpecPage({
-            components: [Popover],
-            template: () => h("ion-popover", { focusTrap: false, overlayIndex: 1 }),
-        });
-        const popover = page.body.querySelector('ion-popover');
-        expect(popover.classList.contains(FOCUS_TRAP_DISABLE_CLASS)).toBe(true);
-    });
-    it('should not set the focus trap class by default', async () => {
-        const page = await newSpecPage({
-            components: [Popover],
-            template: () => h("ion-popover", { overlayIndex: 1 }),
-        });
-        const popover = page.body.querySelector('ion-popover');
-        expect(popover.classList.contains(FOCUS_TRAP_DISABLE_CLASS)).toBe(false);
-    });
-});

package/dist/collection/components/progress-bar/progress-bar.js

@@ -28,7 +28,7 @@ export class ProgressBar {
         const mode = getIonMode(this);
         // If the progress is displayed as a solid bar.
         const progressSolid = buffer === 1;
-        return (h(Host, { key: '78a32304c7164cb78145a91be7bb9b86ecd11b66', role: "progressbar", "aria-valuenow": type === 'determinate' ? value : null, "aria-valuemin": "0", "aria-valuemax": "1", class: createColorClasses(color, {
+        return (h(Host, { key: '63b306c91da12d1fa18d6f6c4726871ef727c9f3', role: "progressbar", "aria-valuenow": type === 'determinate' ? value : null, "aria-valuemin": "0", "aria-valuemax": "1", class: createColorClasses(color, {
                 [mode]: true,
                 [`progress-bar-${type}`]: true,
                 'progress-paused': paused,

package/dist/collection/components/radio/radio.ios.css

@@ -113,6 +113,7 @@ input {
 }
 
 :host(.in-item) {
+  flex: 1 1 0;
   width: 100%;
   height: 100%;
 }

package/dist/collection/components/radio/radio.js

@@ -107,7 +107,7 @@ export class Radio {
         const { checked, disabled, color, el, justify, labelPlacement, hasLabel, buttonTabindex, alignment } = this;
         const mode = getIonMode(this);
         const inItem = hostContext('ion-item', el);
-        return (h(Host, { key: 'bc70e174a1ca756f073ca0a95d6a12597a6eb896', onFocus: this.onFocus, onBlur: this.onBlur, onClick: this.onClick, class: createColorClasses(color, {
+        return (h(Host, { key: '46bb0202f75b6cc81df10de71fbe971dc4dcaa68', onFocus: this.onFocus, onBlur: this.onBlur, onClick: this.onClick, class: createColorClasses(color, {
                 [mode]: true,
                 'in-item': inItem,
                 'radio-checked': checked,
@@ -118,10 +118,10 @@ export class Radio {
                 // Focus and active styling should not apply when the radio is in an item
                 'ion-activatable': !inItem,
                 'ion-focusable': !inItem,
-            }), role: "radio", "aria-checked": checked ? 'true' : 'false', "aria-disabled": disabled ? 'true' : null, tabindex: buttonTabindex }, h("label", { key: '04cab7d54338c7bf9b8986e0a7bc402d5c1713af', class: "radio-wrapper" }, h("div", { key: '9cd2e6ff53313c175a4a9804739f3e468d123c0b', class: {
+            }), role: "radio", "aria-checked": checked ? 'true' : 'false', "aria-disabled": disabled ? 'true' : null, tabindex: buttonTabindex }, h("label", { key: '55061e8cc857752d963c9e4a65f46727f5c2cd9d', class: "radio-wrapper" }, h("div", { key: '589fd41fccd0e6d007e7bc502067f3f2447e4b80', class: {
                 'label-text-wrapper': true,
                 'label-text-wrapper-hidden': !hasLabel,
-            }, part: "label" }, h("slot", { key: 'f1c3120b4df240e690bf9b0a7d9e893c4a546476' })), h("div", { key: 'ab89f05be8b93adb22851856d3e570065d594dae', class: "native-wrapper" }, this.renderRadioControl()))));
+            }, part: "label" }, h("slot", { key: '0076f1f3b64c1a0cf2bc511424956a63d6cf2db9' })), h("div", { key: '1505a84e6dc8715f8fcb19ce94fab79e624a0622', class: "native-wrapper" }, this.renderRadioControl()))));
     }
     static get is() { return "ion-radio"; }
     static get encapsulation() { return "shadow"; }

package/dist/collection/components/radio/radio.md.css

@@ -113,6 +113,7 @@ input {
 }
 
 :host(.in-item) {
+  flex: 1 1 0;
   width: 100%;
   height: 100%;
 }

package/dist/collection/components/radio-group/radio-group.js

@@ -153,7 +153,7 @@ export class RadioGroup {
         const { label, labelId, el, name, value } = this;
         const mode = getIonMode(this);
         renderHiddenInput(true, el, name, value, false);
-        return h(Host, { key: '1e33ffa21aa6589ecd2dcea2f98d5f766ec358fc', role: "radiogroup", "aria-labelledby": label ? labelId : null, onClick: this.onClick, class: mode });
+        return h(Host, { key: '3d43aa6696c5293b49fc44cf91e3e41c4f4d12df', role: "radiogroup", "aria-labelledby": label ? labelId : null, onClick: this.onClick, class: mode });
     }
     static get is() { return "ion-radio-group"; }
     static get properties() {

package/dist/collection/components/range/range.js

@@ -561,7 +561,7 @@ export class Range {
         const needsEndAdjustment = inItem && !hasEndContent;
         const mode = getIonMode(this);
         renderHiddenInput(true, el, this.name, JSON.stringify(this.getValue()), disabled);
-        return (h(Host, { key: '4dfc3e08ccd8f39b1de8a977171c196334840717', onFocusin: this.onFocus, onFocusout: this.onBlur, id: rangeId, class: createColorClasses(this.color, {
+        return (h(Host, { key: '201677b1146738b96d74081e59d3e13a8472326e', onFocusin: this.onFocus, onFocusout: this.onBlur, id: rangeId, class: createColorClasses(this.color, {
                 [mode]: true,
                 'in-item': inItem,
                 'range-disabled': disabled,
@@ -570,10 +570,10 @@ export class Range {
                 [`range-label-placement-${labelPlacement}`]: true,
                 'range-item-start-adjustment': needsStartAdjustment,
                 'range-item-end-adjustment': needsEndAdjustment,
-            }) }, h("label", { key: '3d85cca6ea4add6e338a91c1736d493363c15dc9', class: "range-wrapper", id: "range-label" }, h("div", { key: '0bfabf13ea0b8c1ddd1ad3933f8ba3b60e0f14f9', class: {
+            }) }, h("label", { key: '055dda4f2673432e639b7efdbb01b2794c91e705', class: "range-wrapper", id: "range-label" }, h("div", { key: '3efe1eda1f68810a739a42b7655f2dd71beccf1e', class: {
                 'label-text-wrapper': true,
                 'label-text-wrapper-hidden': !hasLabel,
-            }, part: "label" }, label !== undefined ? h("div", { class: "label-text" }, label) : h("slot", { name: "label" })), h("div", { key: 'e916e52fe78eed340ce9102de19e53069271bf8f', class: "native-wrapper" }, h("slot", { key: 'de52a20642a3df5e19a8888069a1460dbcf28e0c', name: "start" }), this.renderRangeSlider(), h("slot", { key: '2791d30423b44a6c65bd151559bcba5402ed3835', name: "end" })))));
+            }, part: "label" }, label !== undefined ? h("div", { class: "label-text" }, label) : h("slot", { name: "label" })), h("div", { key: '31458b02c2973f4ecf4a10de4c0ae1c4befda37a', class: "native-wrapper" }, h("slot", { key: '21c78b192f312396bd86bf52a0888312ffefea8a', name: "start" }), this.renderRangeSlider(), h("slot", { key: '843193879728ccfec62b4becb1b57d64b6d96804', name: "end" })))));
     }
     static get is() { return "ion-range"; }
     static get encapsulation() { return "shadow"; }

package/dist/collection/components/refresher/refresher.js

@@ -594,7 +594,7 @@ export class Refresher {
     }
     render() {
         const mode = getIonMode(this);
-        return (h(Host, { key: '460d903daa65f5549f4f75de63d185d82b9df1bc', slot: "fixed", class: {
+        return (h(Host, { key: '8e4a99ce208ea3162186e91ba0d1e289b4f247a0', slot: "fixed", class: {
                 [mode]: true,
                 // Used internally for styling
                 [`refresher-${mode}`]: true,

package/dist/collection/components/refresher-content/refresher-content.js

@@ -52,7 +52,7 @@ export class RefresherContent {
         const pullingIcon = this.pullingIcon;
         const hasSpinner = pullingIcon != null && SPINNERS[pullingIcon] !== undefined;
         const mode = getIonMode(this);
-        return (h(Host, { key: 'bd4122ec149c1ea6c43d5b6dfd7932569bfd8d7e', class: mode }, h("div", { key: '492113883e1ed465fd6b35a8e700b29a8bbb2baf', class: "refresher-pulling" }, this.pullingIcon && hasSpinner && (h("div", { class: "refresher-pulling-icon" }, h("div", { class: "spinner-arrow-container" }, h("ion-spinner", { name: this.pullingIcon, paused: true }), mode === 'md' && this.pullingIcon === 'circular' && (h("div", { class: "arrow-container" }, h("ion-icon", { icon: caretBackSharp, "aria-hidden": "true" })))))), this.pullingIcon && !hasSpinner && (h("div", { class: "refresher-pulling-icon" }, h("ion-icon", { icon: this.pullingIcon, lazy: false, "aria-hidden": "true" }))), this.pullingText !== undefined && this.renderPullingText()), h("div", { key: '402b0e02cfee42358c4fd690b60c8eb39386569f', class: "refresher-refreshing" }, this.refreshingSpinner && (h("div", { class: "refresher-refreshing-icon" }, h("ion-spinner", { name: this.refreshingSpinner }))), this.refreshingText !== undefined && this.renderRefreshingText())));
+        return (h(Host, { key: 'c84cb333293a4b8f749505268d019698f9df431c', class: mode }, h("div", { key: 'fb3c0cd2ca4636762060b6615fc2da3ce93da20c', class: "refresher-pulling" }, this.pullingIcon && hasSpinner && (h("div", { class: "refresher-pulling-icon" }, h("div", { class: "spinner-arrow-container" }, h("ion-spinner", { name: this.pullingIcon, paused: true }), mode === 'md' && this.pullingIcon === 'circular' && (h("div", { class: "arrow-container" }, h("ion-icon", { icon: caretBackSharp, "aria-hidden": "true" })))))), this.pullingIcon && !hasSpinner && (h("div", { class: "refresher-pulling-icon" }, h("ion-icon", { icon: this.pullingIcon, lazy: false, "aria-hidden": "true" }))), this.pullingText !== undefined && this.renderPullingText()), h("div", { key: '4a099f6a15854d9432d5e7ee8ade1023a6051965', class: "refresher-refreshing" }, this.refreshingSpinner && (h("div", { class: "refresher-refreshing-icon" }, h("ion-spinner", { name: this.refreshingSpinner }))), this.refreshingText !== undefined && this.renderRefreshingText())));
     }
     static get is() { return "ion-refresher-content"; }
     static get properties() {

package/dist/collection/components/reorder/reorder.js

@@ -20,7 +20,7 @@ export class Reorder {
     render() {
         const mode = getIonMode(this);
         const reorderIcon = mode === 'ios' ? reorderThreeOutline : reorderTwoSharp;
-        return (h(Host, { key: '268c3575bdc5ca591e11442a744119028f17ae85', class: mode }, h("slot", { key: '4767aef1d57921060541cd38b0a62ef2d8b3267b' }, h("ion-icon", { key: 'ad5f972dc2449cdd7aba92b06e7f0d2539e9a202', icon: reorderIcon, lazy: false, class: "reorder-icon", part: "icon", "aria-hidden": "true" }))));
+        return (h(Host, { key: '4e02357926b0208480a043ee3fe0617633daca76', class: mode }, h("slot", { key: 'cedcbcdcc9702af91d00ee20664cb8be634f62d1' }, h("ion-icon", { key: 'd78d7035eae7a235f428132c2a80c8e0538c4441', icon: reorderIcon, lazy: false, class: "reorder-icon", part: "icon", "aria-hidden": "true" }))));
     }
     static get is() { return "ion-reorder"; }
     static get encapsulation() { return "shadow"; }

package/dist/collection/components/reorder-group/reorder-group.js

@@ -238,7 +238,7 @@ export class ReorderGroup {
     }
     render() {
         const mode = getIonMode(this);
-        return (h(Host, { key: '3131c13e939242f1a4e10b4fcee028440b1a04c3', class: {
+        return (h(Host, { key: 'b3a4a278423a196c0980ab8d03062175d8b1f52a', class: {
                 [mode]: true,
                 'reorder-enabled': !this.disabled,
                 'reorder-list-active': this.state !== 0 /* ReorderGroupState.Idle */,

package/dist/collection/components/ripple-effect/ripple-effect.js

@@ -59,7 +59,7 @@ export class RippleEffect {
     }
     render() {
         const mode = getIonMode(this);
-        return (h(Host, { key: '42d95cc2382286e3bc5d68603f8292eb57ba10f5', role: "presentation", class: {
+        return (h(Host, { key: 'ca0ab0deaa7902cbc95e62d4b0c5baeac4387b41', role: "presentation", class: {
                 [mode]: true,
                 unbounded: this.unbounded,
             } }));