@ionic/core 8.0.0-dev.11713809015.1aabd368 → 8.0.0-dev.11713893672.15a2b23e

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

@@ -80,24 +80,4 @@ describe('picker-column: assistive element', () => {
         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/docs.json

@@ -1,5 +1,5 @@
 {
-  "timestamp": "2024-04-22T18:05:39",
+  "timestamp": "2024-04-23T17:36:43",
   "compiler": {
     "name": "@stencil/core",
     "version": "4.14.0",

package/dist/esm/ion-datetime_3.entry.js

@@ -1448,7 +1448,7 @@ const Datetime = class {
         }
         const activePart = this.getActivePartsWithFallback();
         const isDayPeriodRTL = isLocaleDayPeriodRTL(this.locale);
-        return (h("ion-picker-column", { "aria-label": "Select a day", style: isDayPeriodRTL ? { order: '-1' } : {}, color: this.color, disabled: disabled, value: activePart.ampm, onIonChange: (ev) => {
+        return (h("ion-picker-column", { "aria-label": "Select a day period", style: isDayPeriodRTL ? { order: '-1' } : {}, color: this.color, disabled: disabled, value: activePart.ampm, onIonChange: (ev) => {
                 const hour = calculateHourFromAMPM(workingParts, ev.detail.value);
                 this.setWorkingParts(Object.assign(Object.assign({}, workingParts), { ampm: ev.detail.value, hour }));
                 this.setActiveParts(Object.assign(Object.assign({}, activePart), { ampm: ev.detail.value, hour }));
@@ -1758,7 +1758,7 @@ const Datetime = class {
         const hasDatePresentation = presentation === 'date' || presentation === 'date-time' || presentation === 'time-date';
         const hasWheelVariant = hasDatePresentation && preferWheel;
         renderHiddenInput(true, el, name, formatValue(value), disabled);
-        return (h(Host, { key: 'ea2ff775f17d5990cb9bb56a1372986e40b94fab', "aria-disabled": disabled ? 'true' : null, onFocus: this.onFocus, onBlur: this.onBlur, class: Object.assign({}, createColorClasses(color, {
+        return (h(Host, { key: '131cd9d8f73805ea76158c0ad05d86809fe8dfce', "aria-disabled": disabled ? 'true' : null, onFocus: this.onFocus, onBlur: this.onBlur, class: Object.assign({}, createColorClasses(color, {
                 [mode]: true,
                 ['datetime-readonly']: readonly,
                 ['datetime-disabled']: disabled,
@@ -1768,7 +1768,7 @@ const Datetime = class {
                 [`datetime-size-${size}`]: true,
                 [`datetime-prefer-wheel`]: hasWheelVariant,
                 [`datetime-grid`]: isGridStyle,
-            })) }, h("div", { key: 'acc8a91a57d090c0092066f543d921792b7cbed2', class: "intersection-tracker", ref: (el) => (this.intersectionTrackerRef = el) }), this.renderDatetime(mode)));
+            })) }, h("div", { key: '3be6976d484d9ccebac77630b2fd66388b2b85e4', class: "intersection-tracker", ref: (el) => (this.intersectionTrackerRef = el) }), this.renderDatetime(mode)));
     }
     get el() { return getElement(this); }
     static get watchers() { return {

package/dist/esm/ion-picker-column.entry.js

@@ -19,6 +19,7 @@ const PickerColumn = class {
         this.isScrolling = false;
         this.isColumnVisible = false;
         this.canExitInputMode = true;
+        this.updateValueTextOnScroll = false;
         this.centerPickerItemInView = (target, smooth = true, canExitInputMode = true) => {
             const { isColumnVisible, scrollEl } = this;
             if (isColumnVisible && scrollEl) {
@@ -33,6 +34,7 @@ const PickerColumn = class {
                      * of these can cause a scroll to occur.
                      */
                     this.canExitInputMode = canExitInputMode;
+                    this.updateValueTextOnScroll = false;
                     scrollEl.scroll({
                         top,
                         left: 0,
@@ -102,9 +104,10 @@ const PickerColumn = class {
             const enableHaptics = isPlatform('ios');
             const { el, scrollEl } = this;
             let timeout;
-            let { activeItem: activeEl } = this.activeItem;
+            let activeEl = this.activeItem;
             const scrollCallback = () => {
                 raf(() => {
+                    var _a;
                     if (!scrollEl)
                         return;
                     if (timeout) {
@@ -185,8 +188,23 @@ const PickerColumn = class {
                     }
                     activeEl = newActiveElement;
                     this.setPickerItemActiveState(newActiveElement, true);
+                    /**
+                     * Set the aria-valuetext even though the value prop has not been updated yet.
+                     * This enables some screen readers to announce the value as the users drag
+                     * as opposed to when their release their pointer from the screen.
+                     *
+                     * When the value is programmatically updated, we will smoothly scroll
+                     * to the new option. However, we do not want to update aria-valuetext mid-scroll
+                     * as that can cause the old value to be briefly set before being set to the
+                     * correct option. This will cause some screen readers to announce the old value
+                     * again before announcing the new value. The correct valuetext will be set on render.
+                     */
+                    if (this.updateValueTextOnScroll) {
+                        (_a = this.assistiveFocusable) === null || _a === void 0 ? void 0 : _a.setAttribute('aria-valuetext', this.getOptionValueText(newActiveElement));
+                    }
                     timeout = setTimeout(() => {
                         this.isScrolling = false;
+                        this.updateValueTextOnScroll = true;
                         enableHaptics && hapticSelectionEnd();
                         /**
                          * Certain tasks (such as those that
@@ -254,7 +272,7 @@ const PickerColumn = class {
          * may be past the stride if the option at the stride is disabled.
          */
         this.findNextOption = (stride = 1) => {
-            const { activeItem } = this.activeItem;
+            const { activeItem } = this;
             if (!activeItem)
                 return null;
             let prevNode = activeItem;
@@ -281,7 +299,7 @@ const PickerColumn = class {
          *  may be past the stride if the option at the stride is disabled.
          */
         this.findPreviousOption = (stride = 1) => {
-            const { activeItem } = this.activeItem;
+            const { activeItem } = this;
             if (!activeItem)
                 return null;
             let nextNode = activeItem;
@@ -335,6 +353,13 @@ const PickerColumn = class {
                 ev.preventDefault();
             }
         };
+        /**
+         * Utility to generate the correct text for aria-valuetext.
+         */
+        this.getOptionValueText = (el) => {
+            var _a;
+            return el ? (_a = el.getAttribute('aria-label')) !== null && _a !== void 0 ? _a : el.innerText : '';
+        };
         /**
          * 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
@@ -342,11 +367,15 @@ const PickerColumn = class {
          * 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) }));
+            const { activeItem } = this;
+            const valueText = this.getOptionValueText(activeItem);
+            /**
+             * When using the picker, the valuetext provides important context that valuenow
+             * does not. Additionally, using non-zero valuemin/valuemax values can cause
+             * WebKit to incorrectly announce numeric valuetext values (such as a year
+             * like "2024") as percentages: https://bugs.webkit.org/show_bug.cgi?id=273126
+             */
+            return (h("div", { ref: (el) => (this.assistiveFocusable = el), class: "assistive-focusable", role: "slider", tabindex: this.disabled ? undefined : 0, "aria-label": this.ariaLabel, "aria-valuemin": 0, "aria-valuemax": 0, "aria-valuenow": 0, "aria-valuetext": valueText, "aria-orientation": "vertical", onKeyDown: (ev) => this.onKeyDown(ev) }));
         };
         this.ariaLabel = null;
         this.isActive = false;
@@ -388,8 +417,7 @@ const PickerColumn = class {
              */
             const ev = entries[entries.length - 1];
             if (ev.isIntersecting) {
-                const { activeItem } = this.activeItem;
-                const { el } = this;
+                const { activeItem, el } = this;
                 this.isColumnVisible = true;
                 /**
                  * Because this initial call to scrollActiveItemIntoView has to fire before
@@ -429,8 +457,7 @@ const PickerColumn = class {
         }
     }
     componentDidRender() {
-        const { activeItem } = this.activeItem;
-        const { el, isColumnVisible, value } = this;
+        const { el, activeItem, isColumnVisible, value } = this;
         if (isColumnVisible && !activeItem) {
             const firstOption = el.querySelector('ion-picker-column-option');
             /**
@@ -447,7 +474,7 @@ const PickerColumn = class {
     }
     /** @internal  */
     async scrollActiveItemIntoView(smooth = false) {
-        const { activeItem: activeEl } = this.activeItem;
+        const activeEl = this.activeItem;
         if (activeEl) {
             this.centerPickerItemInView(activeEl, smooth, false);
         }
@@ -481,33 +508,29 @@ const PickerColumn = class {
     }
     get activeItem() {
         const { value } = this;
-        const options = this.el.querySelectorAll('ion-picker-column-option');
-        for (let i = 0; i <= options.length - 1; i++) {
-            const option = options[i];
+        const options = Array.from(this.el.querySelectorAll('ion-picker-column-option'));
+        return options.find((option) => {
             /**
              * 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 (option.value === value && !option.disabled) {
-                return {
-                    activeItem: option,
-                    activeItemIndex: i,
-                };
+            if (!this.disabled && option.disabled) {
+                return false;
             }
-        }
-        return { activeItem: undefined, activeItemIndex: -1 };
+            return option.value === value;
+        });
     }
     render() {
         const { color, disabled, isActive, numericInput } = this;
         const mode = getIonMode(this);
-        return (h(Host, { key: '87534568ba47096dca1be00fee184052767087f5', class: createColorClasses(color, {
+        return (h(Host, { key: '50fe50a49f88aa9ec435436083f3cd1ef49c8c9c', class: createColorClasses(color, {
                 [mode]: true,
                 ['picker-column-active']: isActive,
                 ['picker-column-numeric-input']: numericInput,
                 ['picker-column-disabled']: disabled,
-            }) }, this.renderAssistiveFocusable(), h("slot", { key: '8dedc4f294f1a6658a12151a765f6fa790f4d854', name: "prefix" }), h("div", { key: 'c82975dc3996d3ddb8dee12ad381ee733466a069', "aria-hidden": "true", class: "picker-opts", ref: (el) => {
+            }) }, this.renderAssistiveFocusable(), h("slot", { key: '6350829748690895ab3ef101b9f2ae993852de7d', name: "prefix" }), h("div", { key: 'eaff9925aa8553f63ba2a1ae2bdfaa02963e0a5d', "aria-hidden": "true", class: "picker-opts", ref: (el) => {
                 this.scrollEl = el;
-            } }, 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" })));
+            } }, h("div", { key: '25a24c4174782f2ec8a1fe06cbaf1f564b1f632f', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '7f4e9a5f1f74f7e8d5ad74178894edc80c0fb523', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '329b88b4af1d0e37da347e5f3fe9b462efcc2886', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("slot", { key: '82b9d5d541d41801bce06db0867d6cfbcee4ac3e' }), h("div", { key: '288ae193601d1eb49ead06f79eb1affa478f31d3', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '29661d0b74d11d650c2b23be66f857dd008dc5a0', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: 'a7bd71b4abcb027654a828ffa65d87b6874d7484', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0")), h("slot", { key: '83ddd19d09ec48fe31b51f9f272a562320f90098', name: "suffix" })));
     }
     get el() { return getElement(this); }
     static get watchers() { return {