@ionic/core 7.5.8-dev.11701894917.1c1465bd → 7.5.8-dev.11702074871.1238046f

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 .picker-item:not(.picker-item-empty)');
+            const items = page.locator('.month-column ion-picker-column-option');
             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 .picker-item:not(.picker-item-empty)');
+            const items = page.locator('.year-column ion-picker-column-option');
             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-internal:first-of-type .picker-item:not(.picker-item-empty)');
+            const items = page.locator('ion-picker-column:first-of-type ion-picker-column-option');
             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-internal:nth-of-type(2) .picker-item:not(.picker-item-empty)');
+            const items = page.locator('ion-picker-column:nth-of-type(2) ion-picker-column-option');
             await expect(items).toHaveText(['01', '02', '03']);
         });
         test('should adjust default parts for allowed hour and minute values', async ({ page }) => {
@@ -69,19 +69,22 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
         </script>
       `, config);
             await page.waitForSelector('.datetime-ready');
-            const minuteItems = page.locator('ion-picker-column-internal:nth-of-type(2) .picker-item:not(.picker-item-empty)');
+            const minuteColumn = page.locator('ion-picker-column').nth(1);
+            const minuteItems = minuteColumn.locator('ion-picker-column-option');
             await expect(minuteItems).toHaveText(['00', '15', '30', '45']);
-            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(minuteColumn).toHaveJSProperty('value', 15);
+            const hourColumn = page.locator('ion-picker-column').nth(0);
+            const hourItems = hourColumn.locator('ion-picker-column-option');
             await expect(hourItems).toHaveText(['2']);
-            await expect(hourItems.nth(0)).toHaveClass(/picker-item-active/);
+            await expect(hourColumn).toHaveJSProperty('value', 2);
             /**
              * Since the allowed hour is 2AM, the time period
              * should switch from PM to AM.
              */
-            const ampmItems = page.locator('ion-picker-column-internal:nth-of-type(3) .picker-item:not(.picker-item-empty)');
+            const ampmColumn = page.locator('ion-picker-column').nth(2);
+            const ampmItems = ampmColumn.locator('ion-picker-column-option');
             await expect(ampmItems).toHaveText(['AM', 'PM']);
-            await expect(ampmItems.nth(0)).toHaveClass(/picker-item-active/);
+            await expect(ampmColumn).toHaveJSProperty('value', 'am');
         });
         test('should adjust default parts month for allowed month values', async ({ page }) => {
             /**
@@ -106,9 +109,9 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
         </script>
       `, config);
             await page.waitForSelector('.datetime-ready');
-            const monthItems = page.locator('.month-column .picker-item:not(.picker-item-empty)');
+            const monthItems = page.locator('.month-column ion-picker-column-option');
             await expect(monthItems).toHaveText(['January']);
-            await expect(monthItems.nth(0)).toHaveClass(/picker-item-active/);
+            await expect(monthItems.nth(0)).toHaveClass(/option-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-internal
+ * @returns Date data to be used in ion-picker-column
  */
 export const getDayColumnData = (locale, refParts, minParts, maxParts, dayValues, formatOptions = {
     day: 'numeric',

package/dist/collection/components/picker/picker.ios.css

@@ -53,134 +53,6 @@
  *   }
  * }
  */
-:host {
-  /**
-   * @prop --background: Background of the picker
-   * @prop --background-rgb: Background of the picker in rgb format
-   *
-   * @prop --border-radius: Border radius of the picker
-   * @prop --border-color: Border color of the picker
-   * @prop --border-width: Border width of the picker
-   * @prop --border-style: Border style of the picker
-   *
-   * @prop --min-width: Minimum width of the picker
-   * @prop --width: Width of the picker
-   * @prop --max-width: Maximum width of the picker
-   *
-   * @prop --min-height: Minimum height of the picker
-   * @prop --height: Height of the picker
-   * @prop --max-height: Maximum height of the picker
-   *
-   * @prop --backdrop-opacity: Opacity of the backdrop
-   */
-  --border-radius: 0;
-  --border-style: solid;
-  --min-width: auto;
-  --width: 100%;
-  --max-width: 500px;
-  --min-height: auto;
-  --max-height: auto;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  top: 0;
-  display: block;
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  outline: none;
-  font-family: var(--ion-font-family, inherit);
-  contain: strict;
-  user-select: none;
-  z-index: 1001;
-}
-@supports (inset-inline-start: 0) {
-  :host {
-    inset-inline-start: 0;
-  }
-}
-@supports not (inset-inline-start: 0) {
-  :host {
-    left: 0;
-  }
-  :host-context([dir=rtl]) {
-    left: unset;
-    right: unset;
-    right: 0;
-  }
-  @supports selector(:dir(rtl)) {
-    :host(:dir(rtl)) {
-      left: unset;
-      right: unset;
-      right: 0;
-    }
-  }
-}
-
-:host(.overlay-hidden) {
-  display: none;
-}
-
-.picker-wrapper {
-  border-radius: var(--border-radius);
-  left: 0;
-  right: 0;
-  bottom: 0;
-  -webkit-margin-start: auto;
-  margin-inline-start: auto;
-  -webkit-margin-end: auto;
-  margin-inline-end: auto;
-  margin-top: auto;
-  margin-bottom: auto;
-  transform: translate3d(0,  100%,  0);
-  display: flex;
-  position: absolute;
-  flex-direction: column;
-  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);
-  border-width: var(--border-width);
-  border-style: var(--border-style);
-  border-color: var(--border-color);
-  background: var(--background);
-  contain: strict;
-  overflow: hidden;
-  z-index: 10;
-}
-
-.picker-toolbar {
-  width: 100%;
-  background: transparent;
-  contain: strict;
-  z-index: 1;
-}
-
-.picker-button {
-  border: 0;
-  font-family: inherit;
-}
-
-.picker-button:active, .picker-button:focus {
-  outline: none;
-}
-
-.picker-columns {
-  display: flex;
-  position: relative;
-  justify-content: center;
-  margin-bottom: var(--ion-safe-area-bottom, 0);
-  contain: strict;
-  overflow: hidden;
-}
-
-.picker-above-highlight,
-.picker-below-highlight {
-  display: none;
-  pointer-events: none;
-}
-
 /**
  * Convert a font size to a dynamic font size.
  * Fonts that participate in Dynamic Type should use
@@ -237,89 +109,68 @@
  * }
  */
 :host {
-  --background: var(--ion-background-color, #fff);
-  --border-width: 1px 0 0;
-  --border-color: var(--ion-item-border-color, var(--ion-border-color, var(--ion-color-step-250, #c8c7cc)));
-  --height: 260px;
-  --backdrop-opacity: var(--ion-backdrop-opacity, 0.26);
-  color: var(--ion-item-color, var(--ion-text-color, #000));
-}
-
-.picker-toolbar {
+  /**
+  * @prop --highlight-background: Background of the picker highlight for the selected item
+  * @prop --highlight-border-radius: Border radius of the picker highlight for the selected item
+  *
+  * @prop --fade-background-rgb: Background of the gradient covering non-selected items in rgb format
+  */
+  --highlight-border-radius: 8px;
   display: flex;
-  height: 44px;
-  border-bottom: 0.55px solid var(--border-color);
-}
-
-.picker-toolbar-button {
-  flex: 1;
-  text-align: end;
-}
-
-.picker-toolbar-button:last-child .picker-button {
-  font-weight: 600;
-}
-
-.picker-toolbar-button:first-child {
-  font-weight: normal;
-  text-align: start;
-}
-
-.picker-button,
-.picker-button.ion-activated {
-  margin-left: 0;
-  margin-right: 0;
-  margin-top: 0;
-  margin-bottom: 0;
-  -webkit-padding-start: 1em;
-  padding-inline-start: 1em;
-  -webkit-padding-end: 1em;
-  padding-inline-end: 1em;
-  padding-top: 0;
-  padding-bottom: 0;
-  height: 44px;
-  background: transparent;
-  color: var(--ion-color-primary, #3880ff);
-  font-size: 16px;
+  position: relative;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 200px;
+  /**
+   * Picker columns should display
+   * in the order in which developers
+   * added them and should ignore
+   * LTR vs RTL directions.
+   */
+  direction: ltr;
+  /**
+   * This is required otherwise the
+   * highlight will appear behind
+   * the picker when used inline.
+   */
+  z-index: 0;
 }
 
-.picker-columns {
-  height: 215px;
-  perspective: 1000px;
+:host .picker-before,
+:host .picker-after {
+  position: absolute;
+  width: 100%;
+  /**
+   * The transform and z-index
+   * are needed for WebKit otherwise
+   * the fade will appear underneath the picker.
+   */
+  transform: translateZ(0);
+  z-index: 1;
+  pointer-events: none;
 }
 
-.picker-above-highlight {
+:host .picker-before {
   top: 0;
-  transform: translate3d(0,  0,  90px);
-  display: block;
-  position: absolute;
-  width: 100%;
-  height: 81px;
-  border-bottom: 1px solid var(--border-color);
-  background: linear-gradient(to bottom, var(--background, var(--ion-background-color, #fff)) 20%, rgba(var(--background-rgb, var(--ion-background-color-rgb, 255, 255, 255)), 0.8) 100%);
-  z-index: 10;
+  height: 83px;
 }
 @supports (inset-inline-start: 0) {
-  .picker-above-highlight {
+  :host .picker-before {
     inset-inline-start: 0;
   }
 }
 @supports not (inset-inline-start: 0) {
-  .picker-above-highlight {
+  :host .picker-before {
     left: 0;
   }
-  :host-context([dir=rtl]) .picker-above-highlight {
-    left: unset;
-    right: unset;
-    right: 0;
-  }
-  [dir=rtl] .picker-above-highlight {
+  :host-context([dir=rtl]) .picker-before {
     left: unset;
     right: unset;
     right: 0;
   }
   @supports selector(:dir(rtl)) {
-    .picker-above-highlight:dir(rtl) {
+    :host(:dir(rtl)) .picker-before {
       left: unset;
       right: unset;
       right: 0;
@@ -327,41 +178,92 @@
   }
 }
 
-.picker-below-highlight {
-  top: 115px;
-  transform: translate3d(0,  0,  90px);
-  display: block;
-  position: absolute;
-  width: 100%;
-  height: 119px;
-  border-top: 1px solid var(--border-color);
-  background: linear-gradient(to top, var(--background, var(--ion-background-color, #fff)) 30%, rgba(var(--background-rgb, var(--ion-background-color-rgb, 255, 255, 255)), 0.8) 100%);
-  z-index: 11;
+:host .picker-after {
+  top: 116px;
+  height: 84px;
 }
 @supports (inset-inline-start: 0) {
-  .picker-below-highlight {
+  :host .picker-after {
     inset-inline-start: 0;
   }
 }
 @supports not (inset-inline-start: 0) {
-  .picker-below-highlight {
+  :host .picker-after {
     left: 0;
   }
-  :host-context([dir=rtl]) .picker-below-highlight {
-    left: unset;
-    right: unset;
-    right: 0;
-  }
-  [dir=rtl] .picker-below-highlight {
+  :host-context([dir=rtl]) .picker-after {
     left: unset;
     right: unset;
     right: 0;
   }
   @supports selector(:dir(rtl)) {
-    .picker-below-highlight:dir(rtl) {
+    :host(:dir(rtl)) .picker-after {
       left: unset;
       right: unset;
       right: 0;
     }
   }
+}
+
+:host .picker-highlight {
+  border-radius: var(--highlight-border-radius);
+  left: 0;
+  right: 0;
+  top: 50%;
+  bottom: 0;
+  -webkit-margin-start: auto;
+  margin-inline-start: auto;
+  -webkit-margin-end: auto;
+  margin-inline-end: auto;
+  margin-top: 0;
+  margin-bottom: 0;
+  position: absolute;
+  width: calc(100% - 16px);
+  height: 34px;
+  transform: translateY(-50%);
+  background: var(--highlight-background);
+  z-index: -1;
+}
+
+:host input {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  clip: rect(0 0 0 0);
+  opacity: 0;
+  overflow: hidden;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+}
+
+:host ::slotted(ion-picker-column:first-of-type) {
+  text-align: start;
+}
+
+:host ::slotted(ion-picker-column:last-of-type) {
+  text-align: end;
+}
+
+:host ::slotted(ion-picker-column:only-child) {
+  text-align: center;
+}
+
+:host .picker-before {
+  background: linear-gradient(to bottom, rgba(var(--fade-background-rgb, var(--background-rgb, var(--ion-background-color-rgb, 255, 255, 255))), 1) 20%, rgba(var(--fade-background-rgb, var(--background-rgb, var(--ion-background-color-rgb, 255, 255, 255))), 0.8) 100%);
+}
+
+:host .picker-after {
+  background: linear-gradient(to top, rgba(var(--fade-background-rgb, var(--background-rgb, var(--ion-background-color-rgb, 255, 255, 255))), 1) 20%, rgba(var(--fade-background-rgb, var(--background-rgb, var(--ion-background-color-rgb, 255, 255, 255))), 0.8) 100%);
+}
+
+:host .picker-highlight {
+  background: var(--highlight-background, var(--ion-color-step-150, #eeeeef));
 }