@ionic/core 7.7.2-dev.11707425083.192d8103 → 7.7.2-dev.11707881769.185d2a14

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

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

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

@@ -401,14 +401,4 @@ 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 ion-picker-column-option');
+            const monthColumnItems = page.locator('ion-datetime .month-column .picker-item:not(.picker-item-empty)');
             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 ion-picker-column-option');
+            const monthColumnItems = page.locator('ion-datetime .month-column .picker-item:not(.picker-item-empty)');
             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 { PickerColumn } from "../../../picker-column/picker-column";
-import { Picker } from "../../../picker/picker";
+import { PickerColumnInternal } from "../../../picker-column-internal/picker-column-internal";
+import { PickerInternal } from "../../../picker-internal/picker-internal";
 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, PickerColumn, Picker],
+            components: [Datetime, PickerColumnInternal, PickerInternal],
             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');
+        const columns = datetime.shadowRoot.querySelectorAll('ion-picker-column-internal');
         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" max="2022" min="2022"></ion-datetime>
+        <ion-datetime prefer-wheel="true" locale="ar-EG" presentation="date" value="2022-01-01"></ion-datetime>
       `, config);
             await page.locator('.datetime-ready').waitFor();
-            const datetimeYear = page.locator('ion-datetime .year-column ion-picker-column-option').nth(0);
+            const datetimeYear = page.locator('ion-datetime .year-column .picker-item[data-value="2022"]');
             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:nth-child(1) ion-picker-column-option');
-                const minutes = page.locator('ion-popover ion-picker-column:nth-child(2) ion-picker-column-option');
+                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)');
                 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:first-of-type ion-picker-column-option');
+            const hourPickerItems = page.locator('ion-datetime ion-picker-column-internal:first-of-type .picker-item:not(.picker-item-empty)');
             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:first-of-type ion-picker-column-option');
+            const hourPickerItems = page.locator('ion-datetime ion-picker-column-internal:first-of-type .picker-item:not(.picker-item-empty)');
             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 ion-picker-column-option');
+                const monthColumnItems = page.locator('ion-datetime .month-column .picker-item:not(.picker-item-empty)');
                 const ionChange = await page.spyOnEvent('ionChange');
                 await page.locator('.datetime-ready').waitFor();
                 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:nth-child(1) ion-picker-column-option');
+                const hours = page.locator('ion-popover ion-picker-column-internal:nth-child(1) .picker-item:not(.picker-item-empty)');
                 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 > .calendar-month-year-toggle');
+            const pickerButton = page.locator('#date-time .calendar-month-year > ion-item');
             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.locator('.datetime-ready').waitFor();
-                const dayValues = page.locator('ion-datetime .day-column ion-picker-column-option');
+                const dayValues = page.locator('ion-datetime .day-column .picker-item[data-value]');
                 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.locator('.datetime-ready').waitFor();
-                const dayValues = page.locator('ion-datetime .day-column ion-picker-column-option');
+                const dayValues = page.locator('ion-datetime .day-column .picker-item[data-value]');
                 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.locator('.datetime-ready').waitFor();
-                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');
+                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]');
                 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.locator('.datetime-ready').waitFor();
-                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');
+                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)');
                 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.locator('.datetime-ready').waitFor();
                 const ionChange = await page.spyOnEvent('ionChange');
-                const monthValues = page.locator('.month-column ion-picker-column-option');
+                const monthValues = page.locator('.month-column .picker-item:not(.picker-item-empty)');
                 // 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.locator('.datetime-ready').waitFor();
                 const ionChange = await page.spyOnEvent('ionChange');
-                const dayValues = page.locator('.day-column ion-picker-column-option');
+                const dayValues = page.locator('.day-column .picker-item:not(.picker-item-empty)');
                 // 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.locator('.datetime-ready').waitFor();
                 const ionChange = await page.spyOnEvent('ionChange');
-                const yearValues = page.locator('.year-column ion-picker-column-option');
+                const yearValues = page.locator('.year-column .picker-item:not(.picker-item-empty)');
                 /**
                  * 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 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');
+                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');
                 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.locator('.datetime-ready').waitFor();
-                    const monthValues = page.locator('.month-column ion-picker-column-option');
-                    const dayValues = page.locator('.day-column ion-picker-column-option');
+                    const monthValues = page.locator('.month-column .picker-item:not(.picker-item-empty)');
+                    const dayValues = page.locator('.day-column .picker-item:not(.picker-item-empty)');
                     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.locator('.datetime-ready').waitFor();
-                    const columns = page.locator('ion-picker-column');
+                    const columns = page.locator('ion-picker-column-internal');
                     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.locator('.datetime-ready').waitFor();
-                    const columns = page.locator('ion-picker-column');
+                    const columns = page.locator('ion-picker-column-internal');
                     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.locator('.datetime-ready').waitFor();
-                const dayValues = page.locator('ion-datetime .date-column ion-picker-column-option');
+                const dayValues = page.locator('ion-datetime .date-column .picker-item[data-value]');
                 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.locator('.datetime-ready').waitFor();
-                const dayValues = page.locator('ion-datetime .date-column ion-picker-column-option');
+                const dayValues = page.locator('ion-datetime .date-column .picker-item[data-value]');
                 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.locator('.datetime-ready').waitFor();
-                const disabledDates = page.locator('.date-column ion-picker-column-option.option-disabled');
+                const disabledDates = page.locator('.date-column .picker-item[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.locator('.datetime-ready').waitFor();
-                const dateValues = page.locator('.date-column ion-picker-column-option');
+                const dateValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
                 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.locator('.datetime-ready').waitFor();
-                const dateValues = page.locator('.date-column ion-picker-column-option');
+                const dateValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
                 await expect(dateValues).toHaveText(['2月1日(火)', '2月2日(水)', '2月3日(木)']);
             });
             test('should respect min and max bounds even across years', async ({ page }) => {
@@ -327,16 +327,15 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
         `, config);
                 await page.locator('.datetime-ready').waitFor();
                 const dateColumn = page.locator('.date-column');
-                const dateColumnScrollEl = dateColumn.locator('.picker-opts');
-                const dateValues = dateColumn.locator('ion-picker-column-option');
+                const dateValues = dateColumn.locator('.picker-item:not(.picker-item-empty)');
                 expect(await dateValues.count()).toBe(90);
                 /**
                  * Select 1st item to change the dates rendered
                  */
-                await expect(dateValues.nth(0)).toHaveJSProperty('value', '2022-1-1');
-                await dateColumnScrollEl.evaluate((el) => (el.scrollTop = 0));
+                await expect(dateValues.nth(0)).toHaveAttribute('data-value', '2022-1-1');
+                await dateColumn.evaluate((el) => (el.scrollTop = 0));
                 await page.waitForChanges();
-                await expect(dateValues.nth(0)).toHaveJSProperty('value', '2021-12-1');
+                await expect(dateValues.nth(0)).toHaveAttribute('data-value', '2021-12-1');
             });
             test('should keep sliding window if default window is within min and max constraints', async ({ page }) => {
                 await page.setContent(`
@@ -349,7 +348,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           ></ion-datetime>
         `, config);
                 await page.locator('.datetime-ready').waitFor();
-                const dayValues = page.locator('.date-column ion-picker-column-option');
+                const dayValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
                 expect(await dayValues.count()).toBe(92);
             });
             test('should narrow sliding window if default window is not within min and max constraints', async ({ page }) => {
@@ -363,7 +362,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           ></ion-datetime>
         `, config);
                 await page.locator('.datetime-ready').waitFor();
-                const dayValues = page.locator('.date-column ion-picker-column-option');
+                const dayValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
                 expect(await dayValues.count()).toBe(15);
             });
             test('selecting date should update value when no value is set', async ({ page }) => {
@@ -375,7 +374,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
         `, config);
                 await page.locator('.datetime-ready').waitFor();
                 const ionChange = await page.spyOnEvent('ionChange');
-                const dayValues = page.locator('.date-column ion-picker-column-option');
+                const dayValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
                 // Change day/month value
                 await dayValues.nth(0).click();
                 await ionChange.next();
@@ -387,7 +386,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.locator('.datetime-ready').waitFor();
-                const dayValues = page.locator('ion-datetime .date-column ion-picker-column-option');
+                const dayValues = page.locator('ion-datetime .date-column .picker-item[data-value]');
                 expect(await dayValues.count()).toEqual(57);
             });
             test('should respect the max bounds', async ({ page }) => {
@@ -395,7 +394,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.locator('.datetime-ready').waitFor();
-                const dayValues = page.locator('ion-datetime .date-column ion-picker-column-option');
+                const dayValues = page.locator('ion-datetime .date-column .picker-item[data-value]');
                 expect(await dayValues.count()).toEqual(41);
             });
             test('should respect isDateEnabled preference', async ({ page }) => {
@@ -413,7 +412,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           </script>
         `, config);
                 await page.locator('.datetime-ready').waitFor();
-                const disabledDates = page.locator('.date-column ion-picker-column-option.option-disabled');
+                const disabledDates = page.locator('.date-column .picker-item[disabled]');
                 expect(await disabledDates.count()).toBe(44);
             });
             test('should respect month, day, and year preferences', async ({ page }) => {
@@ -428,7 +427,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           ></ion-datetime>
         `, config);
                 await page.locator('.datetime-ready').waitFor();
-                const dateValues = page.locator('.date-column ion-picker-column-option');
+                const dateValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
                 expect(await dateValues.count()).toBe(5);
             });
             test('should correctly localize the date data', async ({ page }) => {
@@ -443,7 +442,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
           ></ion-datetime>
         `, config);
                 await page.locator('.datetime-ready').waitFor();
-                const dateValues = page.locator('.date-column ion-picker-column-option');
+                const dateValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
                 await expect(dateValues).toHaveText(['2月1日(火)', '2月2日(水)', '2月3日(木)']);
             });
             test('should respect min and max bounds even across years', async ({ page }) => {
@@ -458,16 +457,15 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
         `, config);
                 await page.locator('.datetime-ready').waitFor();
                 const dateColumn = page.locator('.date-column');
-                const dateColumnScrollEl = dateColumn.locator('.picker-opts');
-                const dateValues = dateColumn.locator('ion-picker-column-option');
+                const dateValues = dateColumn.locator('.picker-item:not(.picker-item-empty)');
                 expect(await dateValues.count()).toBe(90);
                 /**
                  * Select 1st item to change the dates rendered
                  */
-                await expect(dateValues.nth(0)).toHaveJSProperty('value', '2022-1-1');
-                await dateColumnScrollEl.evaluate((el) => (el.scrollTop = 0));
+                await expect(dateValues.nth(0)).toHaveAttribute('data-value', '2022-1-1');
+                await dateColumn.evaluate((el) => (el.scrollTop = 0));
                 await page.waitForChanges();
-                await expect(dateValues.nth(0)).toHaveJSProperty('value', '2021-12-1');
+                await expect(dateValues.nth(0)).toHaveAttribute('data-value', '2021-12-1');
             });
             test('should keep sliding window if default window is within min and max constraints', async ({ page }) => {
                 await page.setContent(`
@@ -480,7 +478,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
         ></ion-datetime>
       `, config);
                 await page.locator('.datetime-ready').waitFor();
-                const dayValues = page.locator('.date-column ion-picker-column-option');
+                const dayValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
                 expect(await dayValues.count()).toBe(92);
             });
             test('should narrow sliding window if default window is not within min and max constraints', async ({ page }) => {
@@ -494,7 +492,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
         ></ion-datetime>
       `, config);
                 await page.locator('.datetime-ready').waitFor();
-                const dayValues = page.locator('.date-column ion-picker-column-option');
+                const dayValues = page.locator('.date-column .picker-item:not(.picker-item-empty)');
                 expect(await dayValues.count()).toBe(15);
             });
         });

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

@@ -161,7 +161,7 @@ class TimePickerFixture {
         await this.page.waitForChanges();
     }
     async expectTime(hour, minute, ampm) {
-        const pickerColumns = this.timePicker.locator('ion-picker-column');
+        const pickerColumns = this.timePicker.locator('ion-picker-column-internal');
         await expect(pickerColumns.nth(0)).toHaveJSProperty('value', hour);
         await expect(pickerColumns.nth(1)).toHaveJSProperty('value', minute);
         await expect(pickerColumns.nth(2)).toHaveJSProperty('value', ampm);

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

@@ -34,7 +34,7 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config, scree
             await expect(calendarMonthYear).toHaveText('February 2022');
             await calendarMonthYear.click();
             await page.waitForChanges();
-            await page.locator('.month-column ion-picker-column-option').nth(2).click();
+            await page.locator('.month-column .picker-item[data-value="3"]').click();
             await page.waitForChanges();
             await expect(calendarMonthYear).toHaveText('March 2022');
             await expect(ionChange).not.toHaveReceivedEvent();
@@ -46,14 +46,14 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config, scree
             const tabKey = browserName === 'webkit' ? 'Alt+Tab' : 'Tab';
             await page.locator('.datetime-ready').waitFor();
             const calendarMonthYear = page.locator('ion-datetime .calendar-month-year');
-            const monthYearButton = page.locator('.calendar-month-year-toggle');
+            const monthYearButton = page.locator('.calendar-month-year ion-item');
             await expect(calendarMonthYear).toHaveText('February 2022');
             await page.keyboard.press(tabKey);
             await expect(monthYearButton).toBeFocused();
             await page.waitForChanges();
             await page.keyboard.press('Enter');
             await page.waitForChanges();
-            const marchPickerItem = page.locator('.month-column ion-picker-column-option').nth(2);
+            const marchPickerItem = page.locator('.month-column .picker-item[data-value="3"]');
             await expect(marchPickerItem).toBeVisible();
         });
         test('should view next month via next button', async ({ page }) => {
@@ -75,7 +75,7 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config, scree
     `, config);
             const tabKey = browserName === 'webkit' ? 'Alt+Tab' : 'Tab';
             const datetime = page.locator('ion-datetime');
-            const monthYearButton = page.locator('.calendar-month-year-toggle');
+            const monthYearButton = page.locator('.calendar-month-year ion-item');
             const prevButton = page.locator('.calendar-next-prev ion-button:nth-child(1)');
             const nextButton = page.locator('.calendar-next-prev ion-button:nth-child(2)');
             const calendarMonthYear = page.locator('ion-datetime .calendar-month-year');

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

@@ -22,28 +22,28 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
             await page.setContent(`
         <ion-datetime locale="en-US" presentation="month-year" month-values="5,6,10"></ion-datetime>
       `, config);
-            const items = page.locator('.month-column ion-picker-column-option');
+            const items = page.locator('.month-column .picker-item:not(.picker-item-empty)');
             await expect(items).toHaveText(['May', 'June', 'October']);
         });
         test('should render correct years', async ({ page }) => {
             await page.setContent(`
         <ion-datetime locale="en-US" presentation="month-year" year-values="2022,2021,2020"></ion-datetime>
       `, config);
-            const items = page.locator('.year-column ion-picker-column-option');
+            const items = page.locator('.year-column .picker-item:not(.picker-item-empty)');
             await expect(items).toHaveText(['2022', '2021', '2020']);
         });
         test('should render correct hours', async ({ page }) => {
             await page.setContent(`
         <ion-datetime locale="en-US" presentation="time" hour-values="1,2,3"></ion-datetime>
       `, config);
-            const items = page.locator('ion-picker-column:first-of-type ion-picker-column-option');
+            const items = page.locator('ion-picker-column-internal:first-of-type .picker-item:not(.picker-item-empty)');
             await expect(items).toHaveText(['1', '2', '3']);
         });
         test('should render correct minutes', async ({ page }) => {
             await page.setContent(`
         <ion-datetime locale="en-US" presentation="time" minute-values="1,2,3"></ion-datetime>
       `, config);
-            const items = page.locator('ion-picker-column:nth-of-type(2) ion-picker-column-option');
+            const items = page.locator('ion-picker-column-internal:nth-of-type(2) .picker-item:not(.picker-item-empty)');
             await expect(items).toHaveText(['01', '02', '03']);
         });
         test('should adjust default parts for allowed hour and minute values', async ({ page }) => {
@@ -69,22 +69,19 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
         </script>
       `, config);
             await page.locator('.datetime-ready').waitFor();
-            const minuteColumn = page.locator('ion-picker-column').nth(1);
-            const minuteItems = minuteColumn.locator('ion-picker-column-option');
+            const minuteItems = page.locator('ion-picker-column-internal:nth-of-type(2) .picker-item:not(.picker-item-empty)');
             await expect(minuteItems).toHaveText(['00', '15', '30', '45']);
-            await expect(minuteColumn).toHaveJSProperty('value', 15);
-            const hourColumn = page.locator('ion-picker-column').nth(0);
-            const hourItems = hourColumn.locator('ion-picker-column-option');
+            await expect(minuteItems.nth(1)).toHaveClass(/picker-item-active/);
+            const hourItems = page.locator('ion-picker-column-internal:nth-of-type(1) .picker-item:not(.picker-item-empty)');
             await expect(hourItems).toHaveText(['2']);
-            await expect(hourColumn).toHaveJSProperty('value', 2);
+            await expect(hourItems.nth(0)).toHaveClass(/picker-item-active/);
             /**
              * Since the allowed hour is 2AM, the time period
              * should switch from PM to AM.
              */
-            const ampmColumn = page.locator('ion-picker-column').nth(2);
-            const ampmItems = ampmColumn.locator('ion-picker-column-option');
+            const ampmItems = page.locator('ion-picker-column-internal:nth-of-type(3) .picker-item:not(.picker-item-empty)');
             await expect(ampmItems).toHaveText(['AM', 'PM']);
-            await expect(ampmColumn).toHaveJSProperty('value', 'am');
+            await expect(ampmItems.nth(0)).toHaveClass(/picker-item-active/);
         });
         test('should adjust default parts month for allowed month values', async ({ page }) => {
             /**
@@ -109,9 +106,9 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
         </script>
       `, config);
             await page.locator('.datetime-ready').waitFor();
-            const monthItems = page.locator('.month-column ion-picker-column-option');
+            const monthItems = page.locator('.month-column .picker-item:not(.picker-item-empty)');
             await expect(monthItems).toHaveText(['January']);
-            await expect(monthItems.nth(0)).toHaveClass(/option-active/);
+            await expect(monthItems.nth(0)).toHaveClass(/picker-item-active/);
         });
         test('today date highlight should persist even if disallowed from dayValues', async ({ page }) => {
             /**

package/dist/collection/components/datetime/utils/data.js

@@ -323,7 +323,7 @@ export const getMonthColumnData = (locale, refParts, minParts, maxParts, monthVa
  * @param minParts The minimum bound on the date that can be returned
  * @param maxParts The maximum bound on the date that can be returned
  * @param dayValues The allowed date values
- * @returns Date data to be used in ion-picker-column
+ * @returns Date data to be used in ion-picker-column-internal
  */
 export const getDayColumnData = (locale, refParts, minParts, maxParts, dayValues, formatOptions = {
     day: 'numeric',

package/dist/collection/components/datetime-button/{datetime-button.md.css → datetime-button.css}

@@ -62,6 +62,12 @@
 
 :host button {
   border-radius: 8px;
+  -webkit-padding-start: 12px;
+  padding-inline-start: 12px;
+  -webkit-padding-end: 12px;
+  padding-inline-end: 12px;
+  padding-top: 6px;
+  padding-bottom: 6px;
   -webkit-margin-start: 2px;
   margin-inline-start: 2px;
   -webkit-margin-end: 2px;
@@ -91,13 +97,4 @@
 
 :host(.datetime-button-disabled) button {
   opacity: 0.4;
-}
-
-:host button {
-  -webkit-padding-start: 12px;
-  padding-inline-start: 12px;
-  -webkit-padding-end: 12px;
-  padding-inline-end: 12px;
-  padding-top: 6px;
-  padding-bottom: 6px;
 }