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

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

@@ -61,6 +61,8 @@
    *
    * @prop --wheel-highlight-background: The background of the highlight under the selected
    * item when using a wheel style layout, or in the month/year picker for grid style layouts.
+   * @prop --wheel-highlight-border-radius: The border radius of the highlight under the selected
+   * item when using a wheel style layout, or in the month/year picker for grid style layouts.
    * @prop --wheel-fade-background-rgb: The color of the gradient covering non-selected items
    * when using a wheel style layout, or in the month/year picker for grid style layouts. Must
    * be in RGB format, e.g. `255, 255, 255`.
@@ -71,19 +73,6 @@
   overflow: hidden;
 }
 
-/**
- * When using the wheel picker to switch
- * between months, sometimes the allowed
- * dates may be filtered. As a result, it
- * is possible to get a layout shift as
- * the picker column will shrink to fit the
- * widest item in the column. Setting a minimum
- * width avoids this layout shifting.
- */
-ion-picker-column-internal {
-  min-width: 26px;
-}
-
 :host(.datetime-size-fixed) {
   width: auto;
   height: auto;
@@ -94,7 +83,7 @@ ion-picker-column-internal {
 }
 
 /**
- * This ensures that the picker is apppropriately
+ * This ensures that the picker is appropriately
  * sized and never truncates the text.
  */
 :host(.datetime-size-fixed.datetime-prefer-wheel) {
@@ -317,24 +306,8 @@ ion-picker-column-internal {
   justify-content: space-between;
 }
 
-:host .calendar-action-buttons ion-item,
 :host .calendar-action-buttons ion-button {
-  --background: translucent;
-}
-
-:host .calendar-action-buttons ion-item ion-label {
-  display: flex;
-  align-items: center;
-  width: auto;
-}
-
-:host .calendar-action-buttons ion-item ion-icon {
-  -webkit-padding-start: 4px;
-  padding-inline-start: 4px;
-  -webkit-padding-end: 0;
-  padding-inline-end: 0;
-  padding-top: 0;
-  padding-bottom: 0;
+  --background: transparent;
 }
 
 :host .calendar-days-of-week {
@@ -516,8 +489,66 @@ ion-picker-column-internal {
   position: static;
 }
 
-:host(.show-month-and-year) .calendar-action-buttons ion-item {
-  --color: var(--ion-color-base);
+:host(.show-month-and-year) .calendar-action-buttons .calendar-month-year-toggle {
+  color: var(--ion-color-base);
+}
+
+.calendar-month-year {
+  min-width: 0;
+}
+
+.calendar-month-year-toggle {
+  font-family: inherit;
+  font-size: inherit;
+  font-style: inherit;
+  font-weight: inherit;
+  letter-spacing: inherit;
+  text-decoration: inherit;
+  text-indent: inherit;
+  text-overflow: inherit;
+  text-transform: inherit;
+  text-align: inherit;
+  white-space: inherit;
+  color: inherit;
+  position: relative;
+  border: 0;
+  outline: none;
+  background: transparent;
+  cursor: pointer;
+  z-index: 1;
+}
+.calendar-month-year-toggle::after {
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  position: absolute;
+  content: "";
+  opacity: 0;
+  transition: opacity 15ms linear, background-color 15ms linear;
+  z-index: -1;
+}
+.calendar-month-year-toggle.ion-focused::after {
+  background: currentColor;
+}
+.calendar-month-year-toggle:disabled {
+  opacity: 0.3;
+  pointer-events: none;
+}
+
+.calendar-month-year-toggle ion-icon {
+  -webkit-padding-start: 4px;
+  padding-inline-start: 4px;
+  -webkit-padding-end: 0;
+  padding-inline-end: 0;
+  padding-top: 0;
+  padding-bottom: 0;
+  flex-shrink: 0;
+}
+
+.calendar-month-year-toggle #toggle-wrapper {
+  display: inline-flex;
+  align-items: center;
 }
 
 /**
@@ -601,15 +632,36 @@ ion-picker-column-internal {
   font-size: 2.125rem;
 }
 
-:host .datetime-calendar .calendar-action-buttons ion-item {
-  --padding-start: 20px;
-}
-
-:host .calendar-action-buttons ion-item,
 :host .calendar-action-buttons ion-button {
   --color: var(--ion-color-step-650, #595959);
 }
 
+.calendar-month-year-toggle {
+  -webkit-padding-start: 20px;
+  padding-inline-start: 20px;
+  -webkit-padding-end: 16px;
+  padding-inline-end: 16px;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  min-height: 48px;
+  background: transparent;
+  color: var(--ion-color-step-650, #595959);
+  z-index: 1;
+}
+.calendar-month-year-toggle.ion-focused::after {
+  opacity: 0.04;
+}
+
+.calendar-month-year-toggle ion-ripple-effect {
+  color: currentColor;
+}
+
+@media (any-hover: hover) {
+  .calendar-month-year-toggle.ion-activatable:not(.ion-focused):hover::after {
+    background: currentColor;
+    opacity: 0.04;
+  }
+}
 :host .calendar-days-of-week {
   -webkit-padding-start: 10px;
   padding-inline-start: 10px;

package/dist/collection/components/datetime/test/a11y/datetime.e2e.js

@@ -38,7 +38,7 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
     `, config);
             const tabKey = browserName === 'webkit' ? 'Alt+Tab' : 'Tab';
             const datetime = page.locator('ion-datetime');
-            const monthYearButton = page.locator('.calendar-month-year ion-item');
+            const monthYearButton = page.locator('.calendar-month-year-toggle');
             const prevButton = page.locator('.calendar-next-prev ion-button:nth-child(1)');
             const nextButton = page.locator('.calendar-next-prev ion-button:nth-child(2)');
             await page.keyboard.press(tabKey);

package/dist/collection/components/datetime/test/a11y/datetime.spec.js

@@ -2,7 +2,6 @@
  * (C) Ionic http://ionicframework.com - MIT License
  */
 import { newSpecPage } from "@stencil/core/testing";
-import { Item } from "../../../item/item";
 import { Datetime } from "../../datetime";
 describe('datetime', () => {
     beforeEach(() => {
@@ -18,25 +17,23 @@ describe('datetime', () => {
         let page;
         beforeEach(async () => {
             page = await newSpecPage({
-                components: [Datetime, Item],
+                components: [Datetime],
                 html: `<ion-datetime></ion-datetime>`,
             });
         });
         it('should have aria-label "Show year picker" when collapsed', async () => {
             const datetime = page.body.querySelector('ion-datetime');
-            const item = datetime.shadowRoot.querySelector('.calendar-month-year ion-item');
-            const monthYearToggleBtn = item.shadowRoot.querySelector('button');
+            const monthYearToggleBtn = datetime.shadowRoot.querySelector('.calendar-month-year .calendar-month-year-toggle');
             const ariaLabel = monthYearToggleBtn.getAttribute('aria-label');
             expect(ariaLabel).toContain('Show year picker');
         });
         it('should have aria-label "Hide year picker" when expanded', async () => {
             const datetime = page.body.querySelector('ion-datetime');
-            const item = datetime.shadowRoot.querySelector('.calendar-month-year ion-item');
-            item.click();
+            const monthYearToggleBtn = datetime.shadowRoot.querySelector('.calendar-month-year .calendar-month-year-toggle');
+            monthYearToggleBtn.click();
             await page.waitForChanges();
-            const itemAfter = datetime.shadowRoot.querySelector('.calendar-month-year ion-item');
-            const monthYearToggleBtn = itemAfter.shadowRoot.querySelector('button');
-            const ariaLabel = monthYearToggleBtn.getAttribute('aria-label');
+            const monthYearToggleBtnAfter = datetime.shadowRoot.querySelector('.calendar-month-year .calendar-month-year-toggle');
+            const ariaLabel = monthYearToggleBtnAfter.getAttribute('aria-label');
             expect(ariaLabel).toContain('Hide year picker');
         });
     });

package/dist/collection/components/datetime/test/basic/datetime.e2e.js

@@ -372,4 +372,14 @@ configs({ directions: ['ltr'] }).forEach(({ title, screenshot, config }) => {
             await expect(datetime).toHaveScreenshot(screenshot(`datetime-focus-calendar-day`));
         });
     });
+    test.describe(title('datetime: calendar month toggle'), () => {
+        test('should have focus styles', async ({ page }) => {
+            await page.setContent('<ion-datetime value="2021-01-01"></ion-datetime>', config);
+            const datetime = page.locator('ion-datetime');
+            await page.waitForSelector('.datetime-ready');
+            const monthYearToggle = datetime.locator('.calendar-month-year-toggle');
+            monthYearToggle.evaluate((el) => el.classList.add('ion-focused'));
+            await expect(datetime).toHaveScreenshot(screenshot(`date-month-toggle-focused`));
+        });
+    });
 });

package/dist/collection/components/datetime/test/datetime.e2e.js

@@ -13,7 +13,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
         });
         test('should switch the calendar header when moving to a month with a different number of days', async ({ page, }) => {
             const monthYearToggle = page.locator('ion-datetime .calendar-month-year');
-            const monthColumnItems = page.locator('ion-datetime .month-column .picker-item:not(.picker-item-empty)');
+            const monthColumnItems = page.locator('ion-datetime .month-column ion-picker-column-option');
             await expect(monthYearToggle).toContainText('January 2022');
             await monthYearToggle.click();
             await page.waitForChanges();
@@ -24,7 +24,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
         });
         test('should adjust the selected day when moving to a month with a different number of days', async ({ page }) => {
             const monthYearToggle = page.locator('ion-datetime .calendar-month-year');
-            const monthColumnItems = page.locator('ion-datetime .month-column .picker-item:not(.picker-item-empty)');
+            const monthColumnItems = page.locator('ion-datetime .month-column ion-picker-column-option');
             const datetime = page.locator('ion-datetime');
             const ionChange = await page.spyOnEvent('ionChange');
             await monthYearToggle.click();

package/dist/collection/components/datetime/test/disabled/datetime.spec.js

@@ -4,8 +4,8 @@
 import { h } from "@stencil/core";
 import { newSpecPage } from "@stencil/core/testing";
 import { Datetime } from "../../../datetime/datetime";
-import { PickerColumnInternal } from "../../../picker-column-internal/picker-column-internal";
-import { PickerInternal } from "../../../picker-internal/picker-internal";
+import { PickerColumn } from "../../../picker-column/picker-column";
+import { Picker } from "../../../picker/picker";
 describe('ion-datetime disabled', () => {
     beforeEach(() => {
         // IntersectionObserver isn't available in test environment
@@ -19,12 +19,12 @@ describe('ion-datetime disabled', () => {
     });
     it('picker should be disabled in prefer wheel mode', async () => {
         const page = await newSpecPage({
-            components: [Datetime, PickerColumnInternal, PickerInternal],
+            components: [Datetime, PickerColumn, Picker],
             template: () => (h("ion-datetime", { id: "inline-datetime-wheel", disabled: true, "prefer-wheel": true, value: "2022-04-21T00:00:00" })),
         });
         await page.waitForChanges();
         const datetime = page.body.querySelector('ion-datetime');
-        const columns = datetime.shadowRoot.querySelectorAll('ion-picker-column-internal');
+        const columns = datetime.shadowRoot.querySelectorAll('ion-picker-column');
         await expect(columns.length).toEqual(4);
         columns.forEach((column) => {
             expect(column.disabled).toBe(true);

package/dist/collection/components/datetime/test/locale/datetime.e2e.js

@@ -85,10 +85,10 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
         });
         test('should correctly localize year column data', async ({ page }) => {
             await page.setContent(`
-        <ion-datetime prefer-wheel="true" locale="ar-EG" presentation="date" value="2022-01-01"></ion-datetime>
+        <ion-datetime prefer-wheel="true" locale="ar-EG" presentation="date" value="2022-01-01" max="2022" min="2022"></ion-datetime>
       `, config);
             await page.waitForSelector('.datetime-ready');
-            const datetimeYear = page.locator('ion-datetime .year-column .picker-item[data-value="2022"]');
+            const datetimeYear = page.locator('ion-datetime .year-column ion-picker-column-option').nth(0);
             await expect(datetimeYear).toHaveText('٢٠٢٢');
         });
     });

package/dist/collection/components/datetime/test/minmax/datetime.e2e.js

@@ -81,8 +81,8 @@ configs({ directions: ['ltr'], modes: ['ios'] }).forEach(({ title, config }) =>
                 const ionPopoverDidPresent = await page.spyOnEvent('ionPopoverDidPresent');
                 await page.click('.time-body');
                 await ionPopoverDidPresent.next();
-                const hours = page.locator('ion-popover ion-picker-column-internal:nth-child(1) .picker-item:not(.picker-item-empty)');
-                const minutes = page.locator('ion-popover ion-picker-column-internal:nth-child(2) .picker-item:not(.picker-item-empty)');
+                const hours = page.locator('ion-popover ion-picker-column:nth-child(1) ion-picker-column-option');
+                const minutes = page.locator('ion-popover ion-picker-column:nth-child(2) ion-picker-column-option');
                 expect(await hours.count()).toBe(12);
                 expect(await minutes.count()).toBe(60);
             });
@@ -159,7 +159,7 @@ configs({ directions: ['ltr'], modes: ['ios'] }).forEach(({ title, config }) =>
           value="2022-04-25T08:30:00"
         ></ion-datetime>
       `, config);
-            const hourPickerItems = page.locator('ion-datetime ion-picker-column-internal:first-of-type .picker-item:not(.picker-item-empty)');
+            const hourPickerItems = page.locator('ion-datetime ion-picker-column:first-of-type ion-picker-column-option');
             await expect(hourPickerItems).toHaveText(['8', '9', '10', '11']);
         });
         test('should include 12PM when minimum is greater than 12', async ({ page }) => {
@@ -175,7 +175,7 @@ configs({ directions: ['ltr'], modes: ['ios'] }).forEach(({ title, config }) =>
           value="2022-07-29T12:00:00"
         ></ion-datetime>
       `, config);
-            const hourPickerItems = page.locator('ion-datetime ion-picker-column-internal:first-of-type .picker-item:not(.picker-item-empty)');
+            const hourPickerItems = page.locator('ion-datetime ion-picker-column:first-of-type ion-picker-column-option');
             await expect(hourPickerItems).toHaveText(['12', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11']);
         });
         test.describe('minmax value adjustment when out of bounds', () => {
@@ -218,7 +218,7 @@ configs({ directions: ['ltr'], modes: ['ios'] }).forEach(({ title, config }) =>
           ></ion-datetime>
         `, config);
                 const datetime = page.locator('ion-datetime');
-                const monthColumnItems = page.locator('ion-datetime .month-column .picker-item:not(.picker-item-empty)');
+                const monthColumnItems = page.locator('ion-datetime .month-column ion-picker-column-option');
                 const ionChange = await page.spyOnEvent('ionChange');
                 await page.waitForSelector('.datetime-ready');
                 await monthColumnItems.nth(0).click(); // switch to January
@@ -258,7 +258,7 @@ configs({ directions: ['ltr'], modes: ['ios'] }).forEach(({ title, config }) =>
                 const timeButton = page.locator('ion-datetime .time-body');
                 await timeButton.click();
                 await ionPopoverDidPresent.next();
-                const hours = page.locator('ion-popover ion-picker-column-internal:nth-child(1) .picker-item:not(.picker-item-empty)');
+                const hours = page.locator('ion-popover ion-picker-column:nth-child(1) ion-picker-column-option');
                 await expect(await hours.count()).toBe(4);
             });
         });

package/dist/collection/components/datetime/test/month-year-picker/datetime.e2e.js

@@ -16,7 +16,7 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
         test('should hide the footer when picker is open', async ({ page }) => {
             const datetimeFooter = page.locator('#date-time .datetime-footer');
             await expect(datetimeFooter).toBeVisible();
-            const pickerButton = page.locator('#date-time .calendar-month-year > ion-item');
+            const pickerButton = page.locator('#date-time .calendar-month-year > .calendar-month-year-toggle');
             await pickerButton.click();
             await page.waitForChanges();
             await expect(datetimeFooter).not.toBeVisible();

package/dist/collection/components/datetime/test/prefer-wheel/datetime.e2e.js

@@ -60,7 +60,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           <ion-datetime presentation="date" prefer-wheel="true" min="2019-05-05" max="2023-10-01" value="2019-05-30"></ion-datetime>
         `, config);
                 await page.waitForSelector('.datetime-ready');
-                const dayValues = page.locator('ion-datetime .day-column .picker-item[data-value]');
+                const dayValues = page.locator('ion-datetime .day-column ion-picker-column-option');
                 expect(await dayValues.count()).toEqual(27);
             });
             test('should respect the max bounds', async ({ page }) => {
@@ -68,7 +68,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           <ion-datetime presentation="date" prefer-wheel="true" min="2019-05-05" max="2023-10-01" value="2023-10-01"></ion-datetime>
         `, config);
                 await page.waitForSelector('.datetime-ready');
-                const dayValues = page.locator('ion-datetime .day-column .picker-item[data-value]');
+                const dayValues = page.locator('ion-datetime .day-column ion-picker-column-option');
                 expect(await dayValues.count()).toEqual(1);
             });
             test('should respect isDateEnabled preference', async ({ page }) => {
@@ -86,9 +86,9 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           </script>
         `, config);
                 await page.waitForSelector('.datetime-ready');
-                const disabledMonths = page.locator('.month-column .picker-item[disabled]');
-                const disabledYears = page.locator('.year-column .picker-item[disabled]');
-                const disabledDays = page.locator('.day-column .picker-item[disabled]');
+                const disabledMonths = page.locator('.month-column ion-picker-column-option.option-disabled');
+                const disabledYears = page.locator('.year-column ion-picker-column-option.option-disabled');
+                const disabledDays = page.locator('.day-column ion-picker-column-option.option-disabled');
                 expect(await disabledMonths.count()).toBe(0);
                 expect(await disabledYears.count()).toBe(0);
                 expect(await disabledDays.count()).toBe(15);
@@ -105,9 +105,9 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           ></ion-datetime>
         `, config);
                 await page.waitForSelector('.datetime-ready');
-                const monthValues = page.locator('.month-column .picker-item:not(.picker-item-empty)');
-                const yearValues = page.locator('.year-column .picker-item:not(.picker-item-empty)');
-                const dayValues = page.locator('.day-column .picker-item:not(.picker-item-empty)');
+                const monthValues = page.locator('.month-column ion-picker-column-option');
+                const yearValues = page.locator('.year-column ion-picker-column-option');
+                const dayValues = page.locator('.day-column ion-picker-column-option');
                 expect(await monthValues.count()).toBe(2);
                 expect(await yearValues.count()).toBe(3);
                 expect(await dayValues.count()).toBe(5);
@@ -134,7 +134,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
         `, config);
                 await page.waitForSelector('.datetime-ready');
                 const ionChange = await page.spyOnEvent('ionChange');
-                const monthValues = page.locator('.month-column .picker-item:not(.picker-item-empty)');
+                const monthValues = page.locator('.month-column ion-picker-column-option');
                 // Change month value
                 await monthValues.nth(0).click();
                 await ionChange.next();
@@ -161,7 +161,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
         `, config);
                 await page.waitForSelector('.datetime-ready');
                 const ionChange = await page.spyOnEvent('ionChange');
-                const dayValues = page.locator('.day-column .picker-item:not(.picker-item-empty)');
+                const dayValues = page.locator('.day-column ion-picker-column-option');
                 // Change day value
                 await dayValues.nth(0).click();
                 await ionChange.next();
@@ -175,7 +175,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
         `, config);
                 await page.waitForSelector('.datetime-ready');
                 const ionChange = await page.spyOnEvent('ionChange');
-                const yearValues = page.locator('.year-column .picker-item:not(.picker-item-empty)');
+                const yearValues = page.locator('.year-column ion-picker-column-option');
                 /**
                  * Change year value
                  * The 0th index is the current
@@ -192,9 +192,9 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
                 const datetime = page.locator('ion-datetime');
                 await datetime.evaluate((el) => (el.value = '2021-05-25T12:40:00.000Z'));
                 await page.waitForChanges();
-                const selectedMonth = datetime.locator('.month-column .picker-item-active');
-                const selectedDay = datetime.locator('.day-column .picker-item-active');
-                const selectedYear = datetime.locator('.year-column .picker-item-active');
+                const selectedMonth = datetime.locator('.month-column ion-picker-column-option.option-active');
+                const selectedDay = datetime.locator('.day-column ion-picker-column-option.option-active');
+                const selectedYear = datetime.locator('.year-column ion-picker-column-option.option-active');
                 await expect(selectedMonth).toHaveText(/May/);
                 await expect(selectedDay).toHaveText(/25/);
                 await expect(selectedYear).toHaveText(/2021/);
@@ -213,8 +213,8 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
             ></ion-datetime>
           `, config);
                     await page.waitForSelector('.datetime-ready');
-                    const monthValues = page.locator('.month-column .picker-item:not(.picker-item-empty)');
-                    const dayValues = page.locator('.day-column .picker-item:not(.picker-item-empty)');
+                    const monthValues = page.locator('.month-column ion-picker-column-option');
+                    const dayValues = page.locator('.day-column ion-picker-column-option');
                     await expect(monthValues).toHaveText(['1月', '2月', '3月']);
                     await expect(dayValues).toHaveText(['1日', '2日', '3日']);
                 });
@@ -228,7 +228,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
             ></ion-datetime>
           `, config);
                     await page.waitForSelector('.datetime-ready');
-                    const columns = page.locator('ion-picker-column-internal');
+                    const columns = page.locator('ion-picker-column');
                     await expect(columns.nth(0)).toHaveClass(/month-column/);
                     await expect(columns.nth(1)).toHaveClass(/day-column/);
                     await expect(columns.nth(2)).toHaveClass(/year-column/);
@@ -243,7 +243,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
             ></ion-datetime>
           `, config);
                     await page.waitForSelector('.datetime-ready');
-                    const columns = page.locator('ion-picker-column-internal');
+                    const columns = page.locator('ion-picker-column');
                     await expect(columns.nth(0)).toHaveClass(/day-column/);
                     await expect(columns.nth(1)).toHaveClass(/month-column/);
                     await expect(columns.nth(2)).toHaveClass(/year-column/);
@@ -256,7 +256,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           <ion-datetime presentation="date-time" prefer-wheel="true" min="2019-05-05" value="2019-05-10T16:30:00"></ion-datetime>
         `, config);
                 await page.waitForSelector('.datetime-ready');
-                const dayValues = page.locator('ion-datetime .date-column .picker-item[data-value]');
+                const dayValues = page.locator('ion-datetime .date-column ion-picker-column-option');
                 expect(await dayValues.count()).toEqual(57);
             });
             test('should respect the max bounds', async ({ page }) => {
@@ -264,7 +264,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           <ion-datetime presentation="date-time" prefer-wheel="true" max="2023-06-10" value="2023-06-05T16:30:00"></ion-datetime>
         `, config);
                 await page.waitForSelector('.datetime-ready');
-                const dayValues = page.locator('ion-datetime .date-column .picker-item[data-value]');
+                const dayValues = page.locator('ion-datetime .date-column ion-picker-column-option');
                 expect(await dayValues.count()).toEqual(41);
             });
             test('should respect isDateEnabled preference', async ({ page }) => {
@@ -282,7 +282,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           </script>
         `, config);
                 await page.waitForSelector('.datetime-ready');
-                const disabledDates = page.locator('.date-column .picker-item[disabled]');
+                const disabledDates = page.locator('.date-column ion-picker-column-option.option-disabled');
                 expect(await disabledDates.count()).toBe(44);
             });
             test('should respect month, day, and year preferences', async ({ page }) => {
@@ -297,7 +297,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           ></ion-datetime>
         `, config);
                 await page.waitForSelector('.datetime-ready');
-                const dateValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
+                const dateValues = page.locator('.date-column ion-picker-column-option');
                 expect(await dateValues.count()).toBe(5);
             });
             test('should correctly localize the date data', async ({ page }) => {
@@ -312,7 +312,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           ></ion-datetime>
         `, config);
                 await page.waitForSelector('.datetime-ready');
-                const dateValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
+                const dateValues = page.locator('.date-column ion-picker-column-option');
                 await expect(dateValues).toHaveText(['2月1日(火)', '2月2日(水)', '2月3日(木)']);
             });
             test('should respect min and max bounds even across years', async ({ page }) => {
@@ -327,15 +327,16 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
         `, config);
                 await page.waitForSelector('.datetime-ready');
                 const dateColumn = page.locator('.date-column');
-                const dateValues = dateColumn.locator('.picker-item:not(.picker-item-empty)');
+                const dateColumnScrollEl = dateColumn.locator('.picker-opts');
+                const dateValues = dateColumn.locator('ion-picker-column-option');
                 expect(await dateValues.count()).toBe(90);
                 /**
                  * Select 1st item to change the dates rendered
                  */
-                await expect(dateValues.nth(0)).toHaveAttribute('data-value', '2022-1-1');
-                await dateColumn.evaluate((el) => (el.scrollTop = 0));
+                await expect(dateValues.nth(0)).toHaveJSProperty('value', '2022-1-1');
+                await dateColumnScrollEl.evaluate((el) => (el.scrollTop = 0));
                 await page.waitForChanges();
-                await expect(dateValues.nth(0)).toHaveAttribute('data-value', '2021-12-1');
+                await expect(dateValues.nth(0)).toHaveJSProperty('value', '2021-12-1');
             });
             test('should keep sliding window if default window is within min and max constraints', async ({ page }) => {
                 await page.setContent(`
@@ -348,7 +349,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           ></ion-datetime>
         `, config);
                 await page.waitForSelector('.datetime-ready');
-                const dayValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
+                const dayValues = page.locator('.date-column ion-picker-column-option');
                 expect(await dayValues.count()).toBe(92);
             });
             test('should narrow sliding window if default window is not within min and max constraints', async ({ page }) => {
@@ -362,7 +363,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           ></ion-datetime>
         `, config);
                 await page.waitForSelector('.datetime-ready');
-                const dayValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
+                const dayValues = page.locator('.date-column ion-picker-column-option');
                 expect(await dayValues.count()).toBe(15);
             });
             test('selecting date should update value when no value is set', async ({ page }) => {
@@ -374,7 +375,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
         `, config);
                 await page.waitForSelector('.datetime-ready');
                 const ionChange = await page.spyOnEvent('ionChange');
-                const dayValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
+                const dayValues = page.locator('.date-column ion-picker-column-option');
                 // Change day/month value
                 await dayValues.nth(0).click();
                 await ionChange.next();
@@ -386,7 +387,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           <ion-datetime presentation="time-date" prefer-wheel="true" min="2019-05-05" value="2019-05-10T16:30:00"></ion-datetime>
         `, config);
                 await page.waitForSelector('.datetime-ready');
-                const dayValues = page.locator('ion-datetime .date-column .picker-item[data-value]');
+                const dayValues = page.locator('ion-datetime .date-column ion-picker-column-option');
                 expect(await dayValues.count()).toEqual(57);
             });
             test('should respect the max bounds', async ({ page }) => {
@@ -394,7 +395,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           <ion-datetime presentation="time-date" prefer-wheel="true" max="2023-06-10" value="2023-06-05T16:30:00"></ion-datetime>
         `, config);
                 await page.waitForSelector('.datetime-ready');
-                const dayValues = page.locator('ion-datetime .date-column .picker-item[data-value]');
+                const dayValues = page.locator('ion-datetime .date-column ion-picker-column-option');
                 expect(await dayValues.count()).toEqual(41);
             });
             test('should respect isDateEnabled preference', async ({ page }) => {
@@ -412,7 +413,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           </script>
         `, config);
                 await page.waitForSelector('.datetime-ready');
-                const disabledDates = page.locator('.date-column .picker-item[disabled]');
+                const disabledDates = page.locator('.date-column ion-picker-column-option.option-disabled');
                 expect(await disabledDates.count()).toBe(44);
             });
             test('should respect month, day, and year preferences', async ({ page }) => {
@@ -427,7 +428,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           ></ion-datetime>
         `, config);
                 await page.waitForSelector('.datetime-ready');
-                const dateValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
+                const dateValues = page.locator('.date-column ion-picker-column-option');
                 expect(await dateValues.count()).toBe(5);
             });
             test('should correctly localize the date data', async ({ page }) => {
@@ -442,7 +443,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           ></ion-datetime>
         `, config);
                 await page.waitForSelector('.datetime-ready');
-                const dateValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
+                const dateValues = page.locator('.date-column ion-picker-column-option');
                 await expect(dateValues).toHaveText(['2月1日(火)', '2月2日(水)', '2月3日(木)']);
             });
             test('should respect min and max bounds even across years', async ({ page }) => {
@@ -457,15 +458,16 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
         `, config);
                 await page.waitForSelector('.datetime-ready');
                 const dateColumn = page.locator('.date-column');
-                const dateValues = dateColumn.locator('.picker-item:not(.picker-item-empty)');
+                const dateColumnScrollEl = dateColumn.locator('.picker-opts');
+                const dateValues = dateColumn.locator('ion-picker-column-option');
                 expect(await dateValues.count()).toBe(90);
                 /**
                  * Select 1st item to change the dates rendered
                  */
-                await expect(dateValues.nth(0)).toHaveAttribute('data-value', '2022-1-1');
-                await dateColumn.evaluate((el) => (el.scrollTop = 0));
+                await expect(dateValues.nth(0)).toHaveJSProperty('value', '2022-1-1');
+                await dateColumnScrollEl.evaluate((el) => (el.scrollTop = 0));
                 await page.waitForChanges();
-                await expect(dateValues.nth(0)).toHaveAttribute('data-value', '2021-12-1');
+                await expect(dateValues.nth(0)).toHaveJSProperty('value', '2021-12-1');
             });
             test('should keep sliding window if default window is within min and max constraints', async ({ page }) => {
                 await page.setContent(`
@@ -478,7 +480,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
         ></ion-datetime>
       `, config);
                 await page.waitForSelector('.datetime-ready');
-                const dayValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
+                const dayValues = page.locator('.date-column ion-picker-column-option');
                 expect(await dayValues.count()).toBe(92);
             });
             test('should narrow sliding window if default window is not within min and max constraints', async ({ page }) => {
@@ -492,7 +494,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
         ></ion-datetime>
       `, config);
                 await page.waitForSelector('.datetime-ready');
-                const dayValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
+                const dayValues = page.locator('.date-column ion-picker-column-option');
                 expect(await dayValues.count()).toBe(15);
             });
         });