@ionic/core 7.7.1 → 7.7.2-dev.11707425083.192d8103

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

@@ -8,18 +8,18 @@ import { g as getElementRoot, l as clamp, r as raf, k as inheritAttributes, m as
 import { c as createLockController } from './lock-controller-316928be.js';
 import { p as printIonWarning } from './index-9b0d46f4.js';
 import { g as getCapacitor } from './capacitor-59395cbd.js';
-import { G as GESTURE, O as OVERLAY_GESTURE_PRIORITY, e as createTriggerController, B as BACKDROP, j as prepareOverlay, k as setOverlayId, f as present, g as dismiss, h as eventMethod } from './overlays-33ae3ea0.js';
+import { G as GESTURE, O as OVERLAY_GESTURE_PRIORITY, e as createTriggerController, B as BACKDROP, j as prepareOverlay, k as setOverlayId, f as present, g as dismiss, h as eventMethod } from './overlays-2d8629c6.js';
 import { g as getClassMap } from './theme-01f3f29c.js';
 import { e as deepReady, w as waitForMount } from './index-4b98143d.js';
 import { b as getIonMode, c as config } from './ionic-global-778b7863.js';
 import { KEYBOARD_DID_OPEN } from './keyboard-52278bd7.js';
 import { c as createAnimation } from './animation-60dbdd13.js';
 import { g as getTimeGivenProgression } from './cubic-bezier-fe2083dc.js';
-import { createGesture } from './index-2cf77112.js';
+import { createGesture } from './index-39782642.js';
 import { w as win } from './index-a5d50daf.js';
 import './hardware-back-button-f42b9c80.js';
+import './gesture-controller-314a54f6.js';
 import './keyboard-73175e24.js';
-import './gesture-controller-1bf57181.js';
 
 var Style;
 (function (Style) {
@@ -263,7 +263,7 @@ const calculateSpringStep = (t) => {
 
 // Defaults for the card swipe animation
 const SwipeToCloseDefaults = {
-    MIN_PRESENTING_SCALE: 0.93,
+    MIN_PRESENTING_SCALE: 0.915,
 };
 const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss) => {
     /**
@@ -1609,9 +1609,9 @@ const Modal = class {
         const mode = getIonMode(this);
         const isCardModal = presentingElement !== undefined && mode === 'ios';
         const isHandleCycle = handleBehavior === 'cycle';
-        return (h(Host, Object.assign({ key: '9a305d82f123283b6200c42d67393b378bb309a8', "no-router": true, tabindex: "-1" }, htmlAttributes, { style: {
+        return (h(Host, Object.assign({ key: '03f76f75a2988961b4708e31a1726b7517e8b1f0', "no-router": true, tabindex: "-1" }, htmlAttributes, { style: {
                 zIndex: `${20000 + this.overlayIndex}`,
-            }, class: Object.assign({ [mode]: true, ['modal-default']: !isCardModal && !isSheetModal, [`modal-card`]: isCardModal, [`modal-sheet`]: isSheetModal, 'overlay-hidden': true }, getClassMap(this.cssClass)), onIonBackdropTap: this.onBackdropTap, onIonModalDidPresent: this.onLifecycle, onIonModalWillPresent: this.onLifecycle, onIonModalWillDismiss: this.onLifecycle, onIonModalDidDismiss: this.onLifecycle }), h("ion-backdrop", { key: '85e8dc6f19b30fd95db518445929fb0c1d5cdef0', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { class: "modal-shadow" }), h("div", Object.assign({ key: '893a0202d91828e60099311442c2677bee5464e2',
+            }, class: Object.assign({ [mode]: true, ['modal-default']: !isCardModal && !isSheetModal, [`modal-card`]: isCardModal, [`modal-sheet`]: isSheetModal, 'overlay-hidden': true }, getClassMap(this.cssClass)), onIonBackdropTap: this.onBackdropTap, onIonModalDidPresent: this.onLifecycle, onIonModalWillPresent: this.onLifecycle, onIonModalWillDismiss: this.onLifecycle, onIonModalDidDismiss: this.onLifecycle }), h("ion-backdrop", { key: '5c6135e1efe1d433ff0b34dd70c6a5d1cfb99477', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { class: "modal-shadow" }), h("div", Object.assign({ key: '55ef4eed1ec906658e2a0b4ab523e07e243dfb22',
             /*
               role and aria-modal must be used on the
               same element. They must also be set inside the
@@ -1620,7 +1620,7 @@ const Modal = class {
             */
             role: "dialog" }, inheritedAttributes, { "aria-modal": "true", class: "modal-wrapper ion-overlay-wrapper", part: "content", ref: (el) => (this.wrapperEl = el) }), showHandle && (h("button", { class: "modal-handle",
             // Prevents the handle from receiving keyboard focus when it does not cycle
-            tabIndex: !isHandleCycle ? -1 : 0, "aria-label": "Activate to adjust the size of the dialog overlaying the screen", onClick: isHandleCycle ? this.onHandleClick : undefined, part: "handle" })), h("slot", { key: '25187bf4c69d9022930227b8b8748a294176be5f' }))));
+            tabIndex: !isHandleCycle ? -1 : 0, "aria-label": "Activate to adjust the size of the dialog overlaying the screen", onClick: isHandleCycle ? this.onHandleClick : undefined, part: "handle" })), h("slot", { key: 'd94bad829b06c67a7a552878bbd86b5e1d9db3f1' }))));
     }
     get el() { return getElement(this); }
     static get watchers() { return {

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

@@ -132,7 +132,7 @@ const Nav = class {
         // We want to set this flag before any watch callbacks are manually called
         this.didLoad = true;
         this.rootChanged();
-        this.gesture = (await import('./swipe-back-c06602f2.js')).createSwipeBackGesture(this.el, this.canStart.bind(this), this.onStart.bind(this), this.onMove.bind(this), this.onEnd.bind(this));
+        this.gesture = (await import('./swipe-back-7f7620ca.js')).createSwipeBackGesture(this.el, this.canStart.bind(this), this.onStart.bind(this), this.onMove.bind(this), this.onEnd.bind(this));
         this.swipeGestureChanged();
     }
     connectedCallback() {
@@ -388,8 +388,11 @@ const Nav = class {
     async getPrevious(view) {
         return this.getPreviousSync(view);
     }
-    getLength() {
-        return this.views.length;
+    /**
+     * Returns the number of views in the stack.
+     */
+    async getLength() {
+        return Promise.resolve(this.views.length);
     }
     getActiveSync() {
         return this.views[this.views.length - 1];
@@ -895,7 +898,7 @@ const Nav = class {
         }
     }
     render() {
-        return h("slot", { key: '654286a8a7ef03d4a22497eb51e781a9a8979774' });
+        return h("slot", { key: '17a866eb0e229893dcd4d48a396d6bac82dac699' });
     }
     get el() { return getElement(this); }
     static get watchers() { return {
@@ -937,7 +940,7 @@ const NavLink = class {
         this.routerAnimation = undefined;
     }
     render() {
-        return h(Host, { key: 'a781794425ad0866705bc6691256184b93477a74', onClick: this.onClick });
+        return h(Host, { key: '8237896b169c344ca157131e9b110621d9d042b0', onClick: this.onClick });
     }
     get el() { return getElement(this); }
 };

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

@@ -0,0 +1,102 @@
+/*!
+ * (C) Ionic http://ionicframework.com - MIT License
+ */
+import { r as registerInstance, h, H as Host, f as getElement } from './index-73881b51.js';
+import { k as inheritAttributes } from './helpers-c0b9ca37.js';
+import { c as createColorClasses } from './theme-01f3f29c.js';
+import { b as getIonMode } from './ionic-global-778b7863.js';
+
+const pickerColumnOptionIosCss = "button{padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;margin-left:0;margin-right:0;margin-top:0;margin-bottom:0;width:100%;height:34px;border:0px;outline:none;background:transparent;color:inherit;font-family:var(--ion-font-family, inherit);font-size:inherit;line-height:34px;text-align:inherit;text-overflow:ellipsis;white-space:nowrap;cursor:pointer;overflow:hidden}:host(.option-disabled){opacity:0.4}:host(.option-disabled) button{cursor:default}";
+const IonPickerColumnOptionIosStyle0 = pickerColumnOptionIosCss;
+
+const pickerColumnOptionMdCss = "button{padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;margin-left:0;margin-right:0;margin-top:0;margin-bottom:0;width:100%;height:34px;border:0px;outline:none;background:transparent;color:inherit;font-family:var(--ion-font-family, inherit);font-size:inherit;line-height:34px;text-align:inherit;text-overflow:ellipsis;white-space:nowrap;cursor:pointer;overflow:hidden}:host(.option-disabled){opacity:0.4}:host(.option-disabled) button{cursor:default}:host(.option-active){color:var(--ion-color-base)}";
+const IonPickerColumnOptionMdStyle0 = pickerColumnOptionMdCss;
+
+const PickerColumnOption = class {
+    constructor(hostRef) {
+        registerInstance(this, hostRef);
+        /**
+         * We keep track of the parent picker column
+         * so we can update the value of it when
+         * clicking an enable option.
+         */
+        this.pickerColumn = null;
+        this.ariaLabel = null;
+        this.disabled = false;
+        this.value = undefined;
+        this.color = 'primary';
+    }
+    /**
+     * The aria-label of the option has changed after the
+     * first render and needs to be updated within the component.
+     *
+     * @param ariaLbl The new aria-label value.
+     */
+    onAriaLabelChange(ariaLbl) {
+        this.ariaLabel = ariaLbl;
+    }
+    componentWillLoad() {
+        const inheritedAttributes = inheritAttributes(this.el, ['aria-label']);
+        /**
+         * The initial value of `aria-label` needs to be set for
+         * the first render.
+    
+         */
+        this.ariaLabel = inheritedAttributes['aria-label'] || null;
+    }
+    connectedCallback() {
+        this.pickerColumn = this.el.closest('ion-picker-column');
+    }
+    disconnectedCallback() {
+        this.pickerColumn = null;
+    }
+    /**
+     * The column options can load at any time
+     * so the options needs to tell the
+     * parent picker column when it is loaded
+     * so the picker column can ensure it is
+     * centered in the view.
+     *
+     * We intentionally run this for every
+     * option. If we only ran this from
+     * the selected option then if the newly
+     * loaded options were not selected then
+     * scrollActiveItemIntoView would not be called.
+     */
+    componentDidLoad() {
+        const { pickerColumn } = this;
+        if (pickerColumn !== null) {
+            pickerColumn.scrollActiveItemIntoView();
+        }
+    }
+    /**
+     * When an option is clicked, update the
+     * parent picker column value. This
+     * component will handle centering the option
+     * in the column view.
+     */
+    onClick() {
+        const { pickerColumn } = this;
+        if (pickerColumn !== null) {
+            pickerColumn.setValue(this.value);
+        }
+    }
+    render() {
+        const { color, disabled, ariaLabel } = this;
+        const mode = getIonMode(this);
+        return (h(Host, { key: '1f9a74ae1fbd75240b1fb82009a6d4f96b0833d1', class: createColorClasses(color, {
+                [mode]: true,
+                ['option-disabled']: disabled,
+            }) }, h("button", { key: 'cfd71398a876fb3339e388a22f812ea70aa52025', tabindex: "-1", "aria-label": ariaLabel, disabled: disabled, onClick: () => this.onClick() }, h("slot", { key: '5ae19033ea8c186c57f50de0e24746f39006dc85' }))));
+    }
+    get el() { return getElement(this); }
+    static get watchers() { return {
+        "aria-label": ["onAriaLabelChange"]
+    }; }
+};
+PickerColumnOption.style = {
+    ios: IonPickerColumnOptionIosStyle0,
+    md: IonPickerColumnOptionMdStyle0
+};
+
+export { PickerColumnOption as ion_picker_column_option };

package/dist/esm/{ion-picker-column-internal.entry.js → ion-picker-column.entry.js}

@@ -2,20 +2,17 @@
  * (C) Ionic http://ionicframework.com - MIT License
  */
 import { r as registerInstance, d as createEvent, h, H as Host, f as getElement } from './index-73881b51.js';
+import { d as doc } from './index-a5d50daf.js';
 import { r as raf, g as getElementRoot } from './helpers-c0b9ca37.js';
 import { a as hapticSelectionStart, b as hapticSelectionChanged, h as hapticSelectionEnd } from './haptic-554688a5.js';
 import { a as isPlatform, b as getIonMode } from './ionic-global-778b7863.js';
 import { c as createColorClasses } from './theme-01f3f29c.js';
 import './capacitor-59395cbd.js';
-import './index-a5d50daf.js';
 
-const pickerColumnInternalIosCss = ":host{-webkit-padding-start:16px;padding-inline-start:16px;-webkit-padding-end:16px;padding-inline-end:16px;padding-top:0px;padding-bottom:0px;height:200px;outline:none;font-size:22px;-webkit-scroll-snap-type:y mandatory;-ms-scroll-snap-type:y mandatory;scroll-snap-type:y mandatory;overflow-x:hidden;overflow-y:scroll;scrollbar-width:none;text-align:center}:host::-webkit-scrollbar{display:none}:host .picker-item{padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;margin-left:0;margin-right:0;margin-top:0;margin-bottom:0;display:block;width:100%;height:34px;border:0px;outline:none;background:transparent;color:inherit;font-family:var(--ion-font-family, inherit);font-size:inherit;line-height:34px;text-align:inherit;text-overflow:ellipsis;white-space:nowrap;cursor:pointer;overflow:hidden;scroll-snap-align:center}:host .picker-item-empty,:host .picker-item[disabled]{cursor:default}:host .picker-item-empty,:host(:not([disabled])) .picker-item[disabled]{scroll-snap-align:none}:host([disabled]){overflow-y:hidden}:host .picker-item[disabled]{opacity:0.4}:host(.picker-column-active) .picker-item.picker-item-active{color:var(--ion-color-base)}@media (any-hover: hover){:host(:focus){outline:none;background:rgba(var(--ion-color-base-rgb), 0.2)}}";
-const IonPickerColumnInternalIosStyle0 = pickerColumnInternalIosCss;
+const pickerColumnCss = ":host{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;max-width:100%;height:200px;font-size:22px;text-align:center}.picker-opts{-webkit-padding-start:16px;padding-inline-start:16px;-webkit-padding-end:16px;padding-inline-end:16px;padding-top:0px;padding-bottom:0px;min-width:26px;max-height:200px;outline:none;text-align:inherit;-webkit-scroll-snap-type:y mandatory;-ms-scroll-snap-type:y mandatory;scroll-snap-type:y mandatory;overflow-x:hidden;overflow-y:scroll;scrollbar-width:none}.picker-item-empty{padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;margin-left:0;margin-right:0;margin-top:0;margin-bottom:0;display:block;width:100%;height:34px;border:0px;outline:none;background:transparent;color:inherit;font-family:var(--ion-font-family, inherit);font-size:inherit;line-height:34px;text-align:inherit;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.picker-opts::-webkit-scrollbar{display:none}::slotted(ion-picker-column-option){display:block;scroll-snap-align:center}.picker-item-empty,:host(:not([disabled])) ::slotted(ion-picker-column-option.option-disabled){scroll-snap-align:none}::slotted([slot=prefix]),::slotted([slot=suffix]){max-width:200px;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}::slotted([slot=prefix]){-webkit-padding-start:16px;padding-inline-start:16px;-webkit-padding-end:16px;padding-inline-end:16px;padding-top:0;padding-bottom:0;-ms-flex-pack:end;justify-content:end}::slotted([slot=suffix]){-webkit-padding-start:16px;padding-inline-start:16px;-webkit-padding-end:16px;padding-inline-end:16px;padding-top:0;padding-bottom:0;-ms-flex-pack:start;justify-content:start}:host(.picker-column-disabled) .picker-opts{overflow-y:hidden}:host(.picker-column-disabled) ::slotted(ion-picker-column-option){cursor:default;opacity:0.4;pointer-events:none}@media (any-hover: hover){:host(:focus) .picker-opts{outline:none;background:rgba(var(--ion-color-base-rgb), 0.2)}}";
+const IonPickerColumnStyle0 = pickerColumnCss;
 
-const pickerColumnInternalMdCss = ":host{-webkit-padding-start:16px;padding-inline-start:16px;-webkit-padding-end:16px;padding-inline-end:16px;padding-top:0px;padding-bottom:0px;height:200px;outline:none;font-size:22px;-webkit-scroll-snap-type:y mandatory;-ms-scroll-snap-type:y mandatory;scroll-snap-type:y mandatory;overflow-x:hidden;overflow-y:scroll;scrollbar-width:none;text-align:center}:host::-webkit-scrollbar{display:none}:host .picker-item{padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;margin-left:0;margin-right:0;margin-top:0;margin-bottom:0;display:block;width:100%;height:34px;border:0px;outline:none;background:transparent;color:inherit;font-family:var(--ion-font-family, inherit);font-size:inherit;line-height:34px;text-align:inherit;text-overflow:ellipsis;white-space:nowrap;cursor:pointer;overflow:hidden;scroll-snap-align:center}:host .picker-item-empty,:host .picker-item[disabled]{cursor:default}:host .picker-item-empty,:host(:not([disabled])) .picker-item[disabled]{scroll-snap-align:none}:host([disabled]){overflow-y:hidden}:host .picker-item[disabled]{opacity:0.4}:host(.picker-column-active) .picker-item.picker-item-active{color:var(--ion-color-base)}@media (any-hover: hover){:host(:focus){outline:none;background:rgba(var(--ion-color-base-rgb), 0.2)}}:host .picker-item-active{color:var(--ion-color-base)}";
-const IonPickerColumnInternalMdStyle0 = pickerColumnInternalMdCss;
-
-const PickerColumnInternal = class {
+const PickerColumn = class {
     constructor(hostRef) {
         registerInstance(this, hostRef);
         this.ionChange = createEvent(this, "ionChange", 7);
@@ -23,11 +20,11 @@ const PickerColumnInternal = class {
         this.isColumnVisible = false;
         this.canExitInputMode = true;
         this.centerPickerItemInView = (target, smooth = true, canExitInputMode = true) => {
-            const { el, isColumnVisible } = this;
-            if (isColumnVisible) {
+            const { isColumnVisible, scrollEl } = this;
+            if (isColumnVisible && scrollEl) {
                 // (Vertical offset from parent) - (three empty picker rows) + (half the height of the target to ensure the scroll triggers)
                 const top = target.offsetTop - 3 * target.clientHeight + target.clientHeight / 2;
-                if (el.scrollTop !== top) {
+                if (scrollEl.scrollTop !== top) {
                     /**
                      * Setting this flag prevents input
                      * mode from exiting in the picker column's
@@ -36,7 +33,7 @@ const PickerColumnInternal = class {
                      * of these can cause a scroll to occur.
                      */
                     this.canExitInputMode = canExitInputMode;
-                    el.scroll({
+                    scrollEl.scroll({
                         top,
                         left: 0,
                         behavior: smooth ? 'smooth' : undefined,
@@ -47,11 +44,9 @@ const PickerColumnInternal = class {
         this.setPickerItemActiveState = (item, isActive) => {
             if (isActive) {
                 item.classList.add(PICKER_ITEM_ACTIVE_CLASS);
-                item.part.add(PICKER_ITEM_ACTIVE_PART);
             }
             else {
                 item.classList.remove(PICKER_ITEM_ACTIVE_CLASS);
-                item.part.remove(PICKER_ITEM_ACTIVE_PART);
             }
         };
         /**
@@ -105,11 +100,13 @@ const PickerColumnInternal = class {
              * be disabled on Android.
              */
             const enableHaptics = isPlatform('ios');
-            const { el } = this;
+            const { el, scrollEl } = this;
             let timeout;
             let activeEl = this.activeItem;
             const scrollCallback = () => {
                 raf(() => {
+                    if (!scrollEl)
+                        return;
                     if (timeout) {
                         clearTimeout(timeout);
                         timeout = undefined;
@@ -122,21 +119,54 @@ const PickerColumnInternal = class {
                      * Select item in the center of the column
                      * which is the month/year that we want to select
                      */
-                    const bbox = el.getBoundingClientRect();
+                    const bbox = scrollEl.getBoundingClientRect();
                     const centerX = bbox.x + bbox.width / 2;
                     const centerY = bbox.y + bbox.height / 2;
-                    const activeElement = el.shadowRoot.elementFromPoint(centerX, centerY);
-                    if (activeEl !== null) {
+                    /**
+                     * elementFromPoint returns the top-most element.
+                     * This means that if an ion-backdrop is overlaying the
+                     * picker then the appropriate picker column option will
+                     * not be selected. To account for this, we use elementsFromPoint
+                     * and use an Array.find to find the appropriate column option
+                     * at that point.
+                     *
+                     * Additionally, the picker column could be used in the
+                     * Shadow DOM (i.e. in ion-datetime) so we need to make
+                     * sure we are choosing the correct host otherwise
+                     * the elements returns by elementsFromPoint will be
+                     * retargeted. To account for this, we check to see
+                     * if the picker column has a parent shadow root. If
+                     * so, we use that shadow root when doing elementsFromPoint.
+                     * Otherwise, we just use the document.
+                     */
+                    const rootNode = el.getRootNode();
+                    const hasParentShadow = rootNode instanceof ShadowRoot;
+                    const referenceNode = hasParentShadow ? rootNode : doc;
+                    /**
+                     * If the reference node is undefined
+                     * then it's likely that doc is undefined
+                     * due to being in an SSR environment.
+                     */
+                    if (referenceNode === undefined) {
+                        return;
+                    }
+                    const elementsAtPoint = referenceNode.elementsFromPoint(centerX, centerY);
+                    /**
+                     * elementsFromPoint can returns multiple elements
+                     * so find the relevant picker column option if one exists.
+                     */
+                    const newActiveElement = elementsAtPoint.find((el) => el.tagName === 'ION-PICKER-COLUMN-OPTION');
+                    if (activeEl !== undefined) {
                         this.setPickerItemActiveState(activeEl, false);
                     }
-                    if (activeElement === null || activeElement.disabled) {
+                    if (newActiveElement === undefined || newActiveElement.disabled) {
                         return;
                     }
                     /**
                      * If we are selecting a new value,
                      * we need to run haptics again.
                      */
-                    if (activeElement !== activeEl) {
+                    if (newActiveElement !== activeEl) {
                         enableHaptics && hapticSelectionChanged();
                         if (this.canExitInputMode) {
                             /**
@@ -153,8 +183,8 @@ const PickerColumnInternal = class {
                             this.exitInputMode();
                         }
                     }
-                    activeEl = activeElement;
-                    this.setPickerItemActiveState(activeElement, true);
+                    activeEl = newActiveElement;
+                    this.setPickerItemActiveState(newActiveElement, true);
                     timeout = setTimeout(() => {
                         this.isScrolling = false;
                         enableHaptics && hapticSelectionEnd();
@@ -176,20 +206,7 @@ const PickerColumnInternal = class {
                          * case, we should exit input mode.
                          */
                         this.canExitInputMode = true;
-                        const dataIndex = activeElement.getAttribute('data-index');
-                        /**
-                         * If no value it is
-                         * possible we hit one of the
-                         * empty padding columns.
-                         */
-                        if (dataIndex === null) {
-                            return;
-                        }
-                        const index = parseInt(dataIndex, 10);
-                        const selectedItem = this.items[index];
-                        if (selectedItem.value !== this.value) {
-                            this.setValue(selectedItem.value);
-                        }
+                        this.setValue(newActiveElement.value);
                     }, 250);
                 });
             };
@@ -198,9 +215,11 @@ const PickerColumnInternal = class {
              * does not fire when component is initially shown.
              */
             raf(() => {
-                el.addEventListener('scroll', scrollCallback);
+                if (!scrollEl)
+                    return;
+                scrollEl.addEventListener('scroll', scrollCallback);
                 this.destroyScrollListener = () => {
-                    el.removeEventListener('scroll', scrollCallback);
+                    scrollEl.removeEventListener('scroll', scrollCallback);
                 };
             });
         };
@@ -228,7 +247,6 @@ const PickerColumnInternal = class {
         };
         this.isActive = false;
         this.disabled = false;
-        this.items = [];
         this.value = undefined;
         this.color = 'primary';
         this.numericInput = false;
@@ -239,7 +257,7 @@ const PickerColumnInternal = class {
              * Only scroll the active item into view when the picker column
              * is actively visible to the user.
              */
-            this.scrollActiveItemIntoView();
+            this.scrollActiveItemIntoView(true);
         }
     }
     /**
@@ -277,36 +295,33 @@ const PickerColumnInternal = class {
             }
         };
         new IntersectionObserver(visibleCallback, { threshold: 0.001 }).observe(this.el);
-        const parentEl = (this.parentEl = this.el.closest('ion-picker-internal'));
+        const parentEl = (this.parentEl = this.el.closest('ion-picker'));
         if (parentEl !== null) {
             // TODO(FW-2832): type
             parentEl.addEventListener('ionInputModeChange', (ev) => this.inputModeChange(ev));
         }
     }
     componentDidRender() {
-        var _a;
-        const { activeItem, items, isColumnVisible, value } = this;
-        if (isColumnVisible) {
-            if (activeItem) {
-                this.scrollActiveItemIntoView();
-            }
-            else if (((_a = items[0]) === null || _a === void 0 ? void 0 : _a.value) !== value) {
-                /**
-                 * If the picker column does not have an active item and the current value
-                 * does not match the first item in the picker column, that means
-                 * the value is out of bounds. In this case, we assign the value to the
-                 * first item to match the scroll position of the column.
-                 *
-                 */
-                this.setValue(items[0].value);
+        const { el, activeItem, isColumnVisible, value } = this;
+        if (isColumnVisible && !activeItem) {
+            const firstOption = el.querySelector('ion-picker-column-option');
+            /**
+             * If the picker column does not have an active item and the current value
+             * does not match the first item in the picker column, that means
+             * the value is out of bounds. In this case, we assign the value to the
+             * first item to match the scroll position of the column.
+             *
+             */
+            if (firstOption !== null && firstOption.value !== value) {
+                this.setValue(firstOption.value);
             }
         }
     }
     /** @internal  */
-    async scrollActiveItemIntoView() {
+    async scrollActiveItemIntoView(smooth = false) {
         const activeEl = this.activeItem;
         if (activeEl) {
-            this.centerPickerItemInView(activeEl, false, false);
+            this.centerPickerItemInView(activeEl, smooth, false);
         }
     }
     /**
@@ -317,52 +332,53 @@ const PickerColumnInternal = class {
      * @internal
      */
     async setValue(value) {
-        const { items } = this;
+        if (this.disabled === true || this.value === value) {
+            return;
+        }
         this.value = value;
-        const findItem = items.find((item) => item.value === value && item.disabled !== true);
-        if (findItem) {
-            this.ionChange.emit(findItem);
+        this.ionChange.emit({ value });
+    }
+    /**
+     * Sets focus on the scrollable container within the picker column.
+     * Use this method instead of the global `pickerColumn.focus()`.
+     */
+    async setFocus() {
+        if (this.scrollEl) {
+            this.scrollEl.focus();
         }
     }
     get activeItem() {
-        // 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
-        const selector = `.picker-item[data-value="${this.value}"]${this.disabled ? '' : ':not([disabled])'}`;
-        return getElementRoot(this.el).querySelector(selector);
+        const { value } = this;
+        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 (!this.disabled && option.disabled) {
+                return false;
+            }
+            return option.value === value;
+        });
     }
     render() {
-        const { items, color, disabled: pickerDisabled, isActive, numericInput } = this;
+        const { color, disabled, isActive, numericInput } = this;
         const mode = getIonMode(this);
-        /**
-         * exportparts is needed so ion-datetime can expose the parts
-         * from two layers of shadow nesting. If this causes problems,
-         * the attribute can be moved to datetime.tsx and set on every
-         * instance of ion-picker-column-internal there instead.
-         */
-        return (h(Host, { key: 'd0e3818aa4ab06aefd988d1b42ae754244727b8f', exportparts: `${PICKER_ITEM_PART}, ${PICKER_ITEM_ACTIVE_PART}`, disabled: pickerDisabled, tabindex: pickerDisabled ? null : 0, class: createColorClasses(color, {
+        return (h(Host, { key: '4803f7215ee2272e74d76b562553098dc4e2f0bc', class: createColorClasses(color, {
                 [mode]: true,
                 ['picker-column-active']: isActive,
                 ['picker-column-numeric-input']: numericInput,
-            }) }, h("div", { key: 'ec3b16415db5f64e3fab37fda023560ebcdc9423', class: "picker-item picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '40c78c9a1277807572d73e23048c2730cab88f5a', class: "picker-item picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: 'c51fa817f6999356cf3568a46098e954936b45d5', class: "picker-item picker-item-empty", "aria-hidden": "true" }, "\u00A0"), items.map((item, index) => {
-            const isItemDisabled = pickerDisabled || item.disabled || false;
-            return (h("button", { tabindex: "-1", class: {
-                    'picker-item': true,
-                }, "data-value": item.value, "data-index": index, onClick: (ev) => {
-                    this.centerPickerItemInView(ev.target, true);
-                }, disabled: isItemDisabled, part: PICKER_ITEM_PART }, item.text));
-        }), h("div", { key: '80a7461dfe571f46466219b05007b021711aed32', class: "picker-item picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: 'fed82263295f58c51e2b753d0c06c7d71872b8a7', class: "picker-item picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: 'e805dff4122cc4e5fb4d7dcb96054fee8ad3bd07', class: "picker-item picker-item-empty", "aria-hidden": "true" }, "\u00A0")));
+                ['picker-column-disabled']: disabled,
+            }) }, h("slot", { key: 'f486e4903f7818021c8d02e3251300ef0bd64e7f', name: "prefix" }), h("div", { key: '3f0f2c4e77b1bd55b425235fa428c95c793d65ba', class: "picker-opts", tabindex: disabled ? undefined : 0, ref: (el) => {
+                this.scrollEl = el;
+            } }, h("div", { key: '84a373222f1e2084312de67781bdf72f6b40a9e9', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '948311d8ea52ff1ead1e52c27a2d959164cb9b67', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '7cf18267fda32b762bf20f7213810bc800136a4f', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("slot", { key: 'c068963fd65ea1eb70e2fc3dc8125c6b4deff68d' }), h("div", { key: '63442e50269c3266c907d525e66782c8e753af60', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '4f18258bd9f1822725420208491315b970d19aff', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '5d1d3e37d88872284a756ab63078943f732d2293', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0")), h("slot", { key: '7c68b8237cc1a3954d174df34aa3ab2797466a38', name: "suffix" })));
     }
     get el() { return getElement(this); }
     static get watchers() { return {
         "value": ["valueChange"]
     }; }
 };
-const PICKER_ITEM_ACTIVE_CLASS = 'picker-item-active';
-const PICKER_ITEM_PART = 'wheel-item';
-const PICKER_ITEM_ACTIVE_PART = 'active';
-PickerColumnInternal.style = {
-    ios: IonPickerColumnInternalIosStyle0,
-    md: IonPickerColumnInternalMdStyle0
-};
+const PICKER_ITEM_ACTIVE_CLASS = 'option-active';
+PickerColumn.style = IonPickerColumnStyle0;
 
-export { PickerColumnInternal as ion_picker_column_internal };
+export { PickerColumn as ion_picker_column };