@ionic/core 7.5.8-dev.11701876182.1e71e7a0 → 7.5.8-dev.11702056888.11188f48

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

@@ -3,17 +3,17 @@
  */
 import { r as registerInstance, d as createEvent, h, H as Host, f as getElement } from './index-08d686eb.js';
 import { g as getTimeGivenProgression } from './cubic-bezier-fe2083dc.js';
-import { G as GESTURE_CONTROLLER } from './gesture-controller-1bf57181.js';
+import { G as GESTURE_CONTROLLER } from './gesture-controller-314a54f6.js';
 import { p as isEndSide, i as inheritAriaAttributes, o as assert, l as clamp } from './helpers-ae653409.js';
-import { m as menuController } from './index-0c12c22b.js';
-import { q as getPresentedOverlay } from './overlays-32ef481d.js';
+import { m as menuController } from './index-80492ed3.js';
+import { q as getPresentedOverlay } from './overlays-fbc5cab5.js';
 import { c as config, b as getIonMode } from './ionic-global-c0cda98e.js';
 import { c as createColorClasses, h as hostContext } from './theme-01f3f29c.js';
 import { u as menuOutline, v as menuSharp } from './index-c132c5f1.js';
-import './index-a5d50daf.js';
-import './hardware-back-button-b2bc76db.js';
 import './index-9b0d46f4.js';
-import './animation-dde8cc0d.js';
+import './hardware-back-button-b2bc76db.js';
+import './animation-fb0e0f6f.js';
+import './index-7a14ecec.js';
 import './framework-delegate-bc1fd82a.js';
 
 const menuIosCss = ":host{--width:304px;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:auto;--background:var(--ion-background-color, #fff);left:0;right:0;top:0;bottom:0;display:none;position:absolute;contain:strict}:host(.show-menu){display:block}.menu-inner{-webkit-transform:translateX(-9999px);transform:translateX(-9999px);display:-ms-flexbox;display:flex;position:absolute;-ms-flex-direction:column;flex-direction:column;-ms-flex-pack:justify;justify-content:space-between;width:var(--width);min-width:var(--min-width);max-width:var(--max-width);height:var(--height);min-height:var(--min-height);max-height:var(--max-height);background:var(--background);contain:strict}:host(.menu-side-start) .menu-inner{--ion-safe-area-right:0px;top:0;bottom:0}@supports (inset-inline-start: 0){:host(.menu-side-start) .menu-inner{inset-inline-start:0;inset-inline-end:auto}}@supports not (inset-inline-start: 0){:host(.menu-side-start) .menu-inner{left:0;right:auto}:host-context([dir=rtl]):host(.menu-side-start) .menu-inner,:host-context([dir=rtl]).menu-side-start .menu-inner{left:unset;right:unset;left:auto;right:0}@supports selector(:dir(rtl)){:host(.menu-side-start:dir(rtl)) .menu-inner{left:unset;right:unset;left:auto;right:0}}}:host-context([dir=rtl]):host(.menu-side-start) .menu-inner,:host-context([dir=rtl]).menu-side-start .menu-inner{--ion-safe-area-right:unset;--ion-safe-area-left:0px}@supports selector(:dir(rtl)){:host(.menu-side-start:dir(rtl)) .menu-inner{--ion-safe-area-right:unset;--ion-safe-area-left:0px}}:host(.menu-side-end) .menu-inner{--ion-safe-area-left:0px;top:0;bottom:0}@supports (inset-inline-start: 0){:host(.menu-side-end) .menu-inner{inset-inline-start:auto;inset-inline-end:0}}@supports not (inset-inline-start: 0){:host(.menu-side-end) .menu-inner{left:auto;right:0}:host-context([dir=rtl]):host(.menu-side-end) .menu-inner,:host-context([dir=rtl]).menu-side-end .menu-inner{left:unset;right:unset;left:0;right:auto}@supports selector(:dir(rtl)){:host(.menu-side-end:dir(rtl)) .menu-inner{left:unset;right:unset;left:0;right:auto}}}:host-context([dir=rtl]):host(.menu-side-end) .menu-inner,:host-context([dir=rtl]).menu-side-end .menu-inner{--ion-safe-area-left:unset;--ion-safe-area-right:0px}@supports selector(:dir(rtl)){:host(.menu-side-end:dir(rtl)) .menu-inner{--ion-safe-area-left:unset;--ion-safe-area-right:0px}}ion-backdrop{display:none;opacity:0.01;z-index:-1}@media (max-width: 340px){.menu-inner{--width:264px}}:host(.menu-type-reveal){z-index:0}:host(.menu-type-reveal.show-menu) .menu-inner{-webkit-transform:translate3d(0,  0,  0);transform:translate3d(0,  0,  0)}:host(.menu-type-overlay){z-index:1000}:host(.menu-type-overlay) .show-backdrop{display:block;cursor:pointer}:host(.menu-pane-visible){width:var(--width);min-width:var(--min-width);max-width:var(--max-width)}:host(.menu-pane-visible) .menu-inner{left:0;right:0;width:auto;-webkit-transform:none !important;transform:none !important;-webkit-box-shadow:none !important;box-shadow:none !important}:host(.menu-pane-visible) ion-backdrop{display:hidden !important;}:host(.menu-type-push){z-index:1000}:host(.menu-type-push) .show-backdrop{display:block}";
@@ -129,7 +129,7 @@ const Menu = class {
         // register this menu with the app's menu controller
         menuController._register(this);
         this.menuChanged();
-        this.gesture = (await import('./index-2cf77112.js')).createGesture({
+        this.gesture = (await import('./index-39782642.js')).createGesture({
             el: document,
             gestureName: 'menu-swipe',
             gesturePriority: 30,

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

@@ -7,19 +7,19 @@ import { C as CoreDelegate, a as attachComponent, d as detachComponent } from '.
 import { g as getElementRoot, l as clamp, r as raf, k as inheritAttributes, m as hasLazyBuild } from './helpers-ae653409.js';
 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, n as activeAnimations, g as dismiss, h as eventMethod } from './overlays-32ef481d.js';
+import { g as getCapacitor } from './capacitor-b0e5fe83.js';
+import { G as GESTURE, e as createTriggerController, B as BACKDROP, j as prepareOverlay, k as setOverlayId, f as present, n as activeAnimations, g as dismiss, h as eventMethod } from './overlays-fbc5cab5.js';
 import { g as getClassMap } from './theme-01f3f29c.js';
-import { e as deepReady, w as waitForMount } from './index-1932b201.js';
+import { e as deepReady, w as waitForMount } from './index-d8817fb0.js';
 import { b as getIonMode, c as config } from './ionic-global-c0cda98e.js';
-import { KEYBOARD_DID_OPEN } from './keyboard-52278bd7.js';
-import { c as createAnimation } from './animation-dde8cc0d.js';
+import { KEYBOARD_DID_OPEN } from './keyboard-c402e885.js';
+import { c as createAnimation } from './animation-fb0e0f6f.js';
 import { g as getTimeGivenProgression } from './cubic-bezier-fe2083dc.js';
-import { createGesture } from './index-2cf77112.js';
-import { w as win } from './index-a5d50daf.js';
+import { createGesture } from './index-39782642.js';
+import { w as win } from './index-7a14ecec.js';
+import './gesture-controller-314a54f6.js';
 import './hardware-back-button-b2bc76db.js';
-import './keyboard-73175e24.js';
-import './gesture-controller-1bf57181.js';
+import './keyboard-dbb05fb9.js';
 
 var Style;
 (function (Style) {
@@ -504,7 +504,7 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss) =>
     const gesture = createGesture({
         el,
         gestureName: 'modalSwipeToClose',
-        gesturePriority: OVERLAY_GESTURE_PRIORITY,
+        gesturePriority: 39,
         direction: 'y',
         threshold: 10,
         canStart,

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

@@ -4,7 +4,7 @@
 import { r as registerInstance, d as createEvent, h, f as getElement, H as Host } from './index-08d686eb.js';
 import { g as getTimeGivenProgression } from './cubic-bezier-fe2083dc.js';
 import { o as assert, s as shallowEqualStringMap } from './helpers-ae653409.js';
-import { l as lifecycle, t as transition, s as setPageHidden, d as LIFECYCLE_WILL_UNLOAD, b as LIFECYCLE_WILL_LEAVE, c as LIFECYCLE_DID_LEAVE } from './index-1932b201.js';
+import { l as lifecycle, t as transition, s as setPageHidden, d as LIFECYCLE_WILL_UNLOAD, b as LIFECYCLE_WILL_LEAVE, c as LIFECYCLE_DID_LEAVE } from './index-d8817fb0.js';
 import { b as getIonMode, c as config } from './ionic-global-c0cda98e.js';
 import { a as attachComponent } from './framework-delegate-bc1fd82a.js';
 
@@ -131,7 +131,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-a6f386fc.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-a8ca7f93.js')).createSwipeBackGesture(this.el, this.canStart.bind(this), this.onStart.bind(this), this.onMove.bind(this), this.onEnd.bind(this));
         this.swipeGestureChanged();
     }
     connectedCallback() {

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

@@ -0,0 +1,100 @@
+/*!
+ * (C) Ionic http://ionicframework.com - MIT License
+ */
+import { r as registerInstance, h, H as Host, f as getElement } from './index-08d686eb.js';
+import { k as inheritAttributes } from './helpers-ae653409.js';
+import { c as createColorClasses } from './theme-01f3f29c.js';
+import { b as getIonMode } from './ionic-global-c0cda98e.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 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 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, { class: createColorClasses(color, {
+                [mode]: true,
+                ['option-disabled']: disabled,
+            }) }, h("button", { tabindex: "-1", "aria-label": ariaLabel, disabled: disabled, onClick: () => this.onClick() }, h("slot", null))));
+    }
+    get el() { return getElement(this); }
+    static get watchers() { return {
+        "aria-label": ["onAriaLabelChange"]
+    }; }
+};
+PickerColumnOption.style = {
+    ios: pickerColumnOptionIosCss,
+    md: pickerColumnOptionMdCss
+};
+
+export { PickerColumnOption as ion_picker_column_option };

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

@@ -2,18 +2,16 @@
  * (C) Ionic http://ionicframework.com - MIT License
  */
 import { r as registerInstance, d as createEvent, h, H as Host, f as getElement } from './index-08d686eb.js';
+import { d as doc } from './index-7a14ecec.js';
 import { r as raf, g as getElementRoot } from './helpers-ae653409.js';
-import { a as hapticSelectionStart, b as hapticSelectionChanged, h as hapticSelectionEnd } from './haptic-554688a5.js';
+import { a as hapticSelectionStart, b as hapticSelectionChanged, h as hapticSelectionEnd } from './haptic-152c4172.js';
 import { a as isPlatform, b as getIonMode } from './ionic-global-c0cda98e.js';
 import { c as createColorClasses } from './theme-01f3f29c.js';
-import './capacitor-59395cbd.js';
-import './index-a5d50daf.js';
+import './capacitor-b0e5fe83.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 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 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 PickerColumnInternal = class {
+const PickerColumn = class {
     constructor(hostRef) {
         registerInstance(this, hostRef);
         this.ionChange = createEvent(this, "ionChange", 7);
@@ -21,11 +19,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
@@ -34,7 +32,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,
@@ -45,11 +43,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);
             }
         };
         /**
@@ -103,11 +99,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;
@@ -120,21 +118,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) {
                             /**
@@ -151,8 +182,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();
@@ -174,20 +205,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);
                 });
             };
@@ -196,9 +214,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);
                 };
             });
         };
@@ -226,7 +246,6 @@ const PickerColumnInternal = class {
         };
         this.isActive = false;
         this.disabled = false;
-        this.items = [];
         this.value = undefined;
         this.color = 'primary';
         this.numericInput = false;
@@ -237,7 +256,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);
         }
     }
     /**
@@ -275,36 +294,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);
         }
     }
     /**
@@ -315,52 +331,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, { exportparts: `${PICKER_ITEM_PART}, ${PICKER_ITEM_ACTIVE_PART}`, disabled: pickerDisabled, tabindex: pickerDisabled ? null : 0, class: createColorClasses(color, {
+        return (h(Host, { class: createColorClasses(color, {
                 [mode]: true,
                 ['picker-column-active']: isActive,
                 ['picker-column-numeric-input']: numericInput,
-            }) }, h("div", { class: "picker-item picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { class: "picker-item picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { 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", { class: "picker-item picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { class: "picker-item picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { class: "picker-item picker-item-empty", "aria-hidden": "true" }, "\u00A0")));
+                ['picker-column-disabled']: disabled,
+            }) }, h("slot", { name: "prefix" }), h("div", { class: "picker-opts", tabindex: disabled ? undefined : 0, ref: (el) => {
+                this.scrollEl = el;
+            } }, h("div", { class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("slot", null), h("div", { class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0")), h("slot", { 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: pickerColumnInternalIosCss,
-    md: pickerColumnInternalMdCss
-};
+const PICKER_ITEM_ACTIVE_CLASS = 'option-active';
+PickerColumn.style = pickerColumnCss;
 
-export { PickerColumnInternal as ion_picker_column_internal };
+export { PickerColumn as ion_picker_column };