@ionic/core 7.6.2-dev.11702924017.193c825c → 7.6.2-dev.11702933439.181fa64e

package/dist/collection/components/{picker-column/picker-column.css → picker-column-internal/picker-column-internal.md.css}

@@ -54,48 +54,15 @@
  * }
  */
 :host {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  max-width: 100%;
-  height: 200px;
-  font-size: 22px;
-  text-align: center;
-}
-
-.picker-opts {
-  /**
-   * This padding must be set here and not on the
-   * host to ensure that the focus highlight on the
-   * column is not overly narrow.
-   */
   -webkit-padding-start: 16px;
   padding-inline-start: 16px;
   -webkit-padding-end: 16px;
   padding-inline-end: 16px;
   padding-top: 0px;
   padding-bottom: 0px;
-  /**
-   * When using reactive data, such as in datetime's
-   * wheel picker, there may be layout shifts between
-   * individual columns in a picker as the columns
-   * shrink to fit the widest item in the column.
-   * Setting a minimum width avoids this layout shifting.
-   *
-   * Note that we need this min-width set on the same
-   * element as the vertical padding (i.e. not on the
-   * host).
-   */
-  min-width: 26px;
-  max-height: 200px;
+  height: 200px;
   outline: none;
-  /**
-   * Added so that text-align can be set on the host
-   * from external components. For example, datetime
-   * changes the alignment of specific columns in its
-   * wheel pickers.
-   */
-  text-align: inherit;
+  font-size: 22px;
   scroll-snap-type: y mandatory;
   /**
    * Need to explicitly set overflow-x: hidden
@@ -104,9 +71,17 @@
   overflow-x: hidden;
   overflow-y: scroll;
   scrollbar-width: none;
+  text-align: center;
 }
 
-.picker-item-empty {
+/**
+ * Hide scrollbars on Chrome and Safari
+ */
+:host::-webkit-scrollbar {
+  display: none;
+}
+
+:host .picker-item {
   padding-left: 0;
   padding-right: 0;
   padding-top: 0;
@@ -128,82 +103,94 @@
   text-align: inherit;
   text-overflow: ellipsis;
   white-space: nowrap;
+  cursor: pointer;
   overflow: hidden;
-}
-
-/**
- * Hide scrollbars on Chrome and Safari
- */
-.picker-opts::-webkit-scrollbar {
-  display: none;
-}
-
-::slotted(ion-picker-column-option) {
-  display: block;
   scroll-snap-align: center;
 }
 
-.picker-item-empty,
-:host(:not([disabled])) ::slotted(ion-picker-column-option.option-disabled) {
-  scroll-snap-align: none;
-}
-
-::slotted([slot=prefix]), ::slotted([slot=suffix]) {
-  max-width: 200px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-}
-
-::slotted([slot=prefix]) {
-  /**
-   * This is added in addition to the column's own padding so that there is white
-   * space between the slot and the column's focus highlight.
-   */
-  -webkit-padding-start: 16px;
-  padding-inline-start: 16px;
-  -webkit-padding-end: 16px;
-  padding-inline-end: 16px;
-  padding-top: 0;
-  padding-bottom: 0;
-  justify-content: end;
+:host .picker-item-empty,
+:host .picker-item[disabled] {
+  cursor: default;
 }
 
-::slotted([slot=suffix]) {
-  /**
-   * This is added in addition to the column's own padding so that there is white
-   * space between the slot and the column's focus highlight.
-   */
-  -webkit-padding-start: 16px;
-  padding-inline-start: 16px;
-  -webkit-padding-end: 16px;
-  padding-inline-end: 16px;
-  padding-top: 0;
-  padding-bottom: 0;
-  justify-content: start;
+:host .picker-item-empty,
+:host(:not([disabled])) .picker-item[disabled] {
+  scroll-snap-align: none;
 }
 
-:host(.picker-column-disabled) .picker-opts {
+:host([disabled]) {
   overflow-y: hidden;
 }
 
-/**
- * When the column is disabled, none of the options
- * should be interactive. However, we do not disable
- * the buttons because that would require overriding the
- * app's preference for each option. In this case,
- * the picker column interactive as a whole is
- * disabled, not individual options.
- */
-:host(.picker-column-disabled) ::slotted(ion-picker-column-option) {
-  cursor: default;
+:host .picker-item[disabled] {
   opacity: 0.4;
-  pointer-events: none;
+}
+
+:host(.picker-column-active) .picker-item.picker-item-active {
+  color: var(--ion-color-base);
 }
 
 @media (any-hover: hover) {
-  :host(:focus) .picker-opts {
+  :host(:focus) {
     outline: none;
     background: rgba(var(--ion-color-base-rgb), 0.2);
   }
+}
+/**
+ * Convert a font size to a dynamic font size.
+ * Fonts that participate in Dynamic Type should use
+ * dynamic font sizes.
+ * @param size - The initial font size including the unit (i.e. px or pt)
+ * @param unit (optional) - The unit to convert to. Use this if you want to
+ * convert to a unit other than $baselineUnit.
+ */
+/**
+ * Convert a font size to a dynamic font size but impose
+ * a maximum font size.
+ * @param size - The initial font size including the unit (i.e. px or pt)
+ * @param maxScale - The maximum scale of the font (i.e. 2.5 for a maximum 250% scale).
+ * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to
+ * convert to a unit other than $baselineUnit.
+ */
+/**
+ * Convert a font size to a dynamic font size but impose
+ * a minimum font size.
+ * @param size - The initial font size including the unit (i.e. px or pt)
+ * @param minScale - The minimum scale of the font (i.e. 0.8 for a minimum 80% scale).
+ * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to
+ * convert to a unit other than $baselineUnit.
+ */
+/**
+ * Convert a font size to a dynamic font size but impose
+ * maximum and minimum font sizes.
+ * @param size - The initial font size including the unit (i.e. px or pt)
+ * @param minScale - The minimum scale of the font (i.e. 0.8 for a minimum 80% scale).
+ * @param maxScale - The maximum scale of the font (i.e. 2.5 for a maximum 250% scale).
+ * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to
+ * convert to a unit other than $baselineUnit.
+ */
+/**
+ * A heuristic that applies CSS to tablet
+ * viewports.
+ *
+ * Usage:
+ * @include tablet-viewport() {
+ *   :host {
+ *     background-color: green;
+ *   }
+ * }
+ */
+/**
+ * A heuristic that applies CSS to mobile
+ * viewports (i.e. phones, not tablets).
+ *
+ * Usage:
+ * @include mobile-viewport() {
+ *   :host {
+ *     background-color: blue;
+ *   }
+ * }
+ */
+:host .picker-item-active {
+  color: var(--ion-color-base);
 }

package/dist/collection/components/{picker-column/test/basic/picker-column.e2e.js → picker-column-internal/test/basic/picker-column-internal.e2e.js}

@@ -7,20 +7,20 @@ import { configs, test } from "../../../../utils/test/playwright/index";
  * This behavior does not vary across modes/directions.
  */
 configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) => {
-    test.describe(title('picker-column'), () => {
+    test.describe(title('picker-column-internal'), () => {
         test.beforeEach(async ({ page }) => {
-            await page.goto('/src/components/picker-column/test/basic', config);
+            await page.goto('/src/components/picker-column-internal/test/basic', config);
         });
         test('should render a picker item for each item', async ({ page }) => {
-            const columns = page.locator('ion-picker-column ion-picker-column-option');
+            const columns = page.locator('ion-picker-column-internal .picker-item:not(.picker-item-empty)');
             await expect(columns).toHaveCount(24);
         });
         test('should render 6 empty picker items', async ({ page }) => {
-            const columns = page.locator('ion-picker-column .picker-item-empty');
+            const columns = page.locator('ion-picker-column-internal .picker-item-empty');
             await expect(columns).toHaveCount(6);
         });
         test('should not have an active item when value is not set', async ({ page }) => {
-            const activeColumn = page.locator('ion-picker-column ion-picker-column-option.option-active');
+            const activeColumn = page.locator('ion-picker-column-internal .picker-item-active');
             await expect(activeColumn).toHaveCount(0);
         });
         test('should have an active item when value is set', async ({ page }) => {
@@ -28,7 +28,7 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
                 el.value = '12';
             });
             await page.waitForChanges();
-            const activeColumn = page.locator('ion-picker-column ion-picker-column-option.option-active');
+            const activeColumn = page.locator('ion-picker-column-internal .picker-item-active');
             expect(activeColumn).not.toBeNull();
         });
         // TODO FW-3616
@@ -38,8 +38,8 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
                 el.scrollTop = 801;
             });
             await page.waitForChanges();
-            const activeColumn = page.locator('ion-picker-column ion-picker-column-option.option-active');
-            await expect(activeColumn).toHaveJSProperty('value', 23);
+            const activeColumn = page.locator('ion-picker-column-internal .picker-item-active');
+            expect(await (activeColumn === null || activeColumn === void 0 ? void 0 : activeColumn.innerText())).toEqual('23');
         });
         test('should not emit ionChange when the value is modified externally', async ({ page, skip }) => {
             skip.browser('firefox', 'https://bugzilla.mozilla.org/show_bug.cgi?id=1766890');

package/dist/collection/components/picker-column-internal/test/disabled/picker-column-internal.e2e.js

@@ -0,0 +1,162 @@
+/*!
+ * (C) Ionic http://ionicframework.com - MIT License
+ */
+import { expect } from "@playwright/test";
+import { configs, test } from "../../../../utils/test/playwright/index";
+/**
+ * This behavior does not vary across directions.
+ */
+configs({ directions: ['ltr'] }).forEach(({ title, screenshot, config }) => {
+    test.describe(title('picker-column-internal: disabled rendering'), () => {
+        test('should not have visual regressions', async ({ page }) => {
+            await page.setContent(`
+        <ion-picker-internal>
+          <ion-picker-column-internal value="b"></ion-picker-column-internal>
+        </ion-picker-internal>
+
+        <script>
+          const column = document.querySelector('ion-picker-column-internal');
+          column.items = [
+            { text: 'A', value: 'a', disabled: true },
+            { text: 'B', value: 'b' },
+            { text: 'C', value: 'c', disabled: true }
+          ]
+        </script>
+      `, config);
+            const picker = page.locator('ion-picker-internal');
+            await expect(picker).toHaveScreenshot(screenshot(`picker-internal-disabled`));
+        });
+    });
+});
+/**
+ * This behavior does not vary across modes/directions.
+ */
+configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) => {
+    test.describe(title('picker-column-internal: disabled items'), () => {
+        test('all picker items should be enabled by default', async ({ page }) => {
+            await page.setContent(`
+        <ion-picker-internal>
+          <ion-picker-column-internal></ion-picker-column-internal>
+        </ion-picker-internal>
+
+        <script>
+          const column = document.querySelector('ion-picker-column-internal');
+          column.items = [
+            { text: 'A', value: 'a' },
+            { text: 'B', value: 'b' },
+            { text: 'C', value: 'c' }
+          ]
+        </script>
+      `, config);
+            const pickerItems = page.locator('ion-picker-column-internal .picker-item:not(.picker-item-empty, [disabled])');
+            expect(await pickerItems.count()).toBe(3);
+        });
+        test('disabled picker item should not be interactive', async ({ page }) => {
+            await page.setContent(`
+        <ion-picker-internal>
+          <ion-picker-column-internal></ion-picker-column-internal>
+        </ion-picker-internal>
+
+        <script>
+          const column = document.querySelector('ion-picker-column-internal');
+          column.items = [
+            { text: 'A', value: 'a' },
+            { text: 'B', value: 'b', disabled: true },
+            { text: 'C', value: 'c' }
+          ]
+        </script>
+      `, config);
+            const disabledItem = page.locator('ion-picker-column-internal .picker-item[disabled]');
+            await expect(disabledItem).not.toBeEnabled();
+        });
+        test('disabled picker item should not be considered active', async ({ page }) => {
+            await page.setContent(`
+        <ion-picker-internal>
+          <ion-picker-column-internal value="b"></ion-picker-column-internal>
+        </ion-picker-internal>
+
+        <script>
+          const column = document.querySelector('ion-picker-column-internal');
+          column.items = [
+            { text: 'A', value: 'a' },
+            { text: 'B', value: 'b', disabled: true },
+            { text: 'C', value: 'c' }
+          ]
+        </script>
+      `, config);
+            const disabledItem = page.locator('ion-picker-column-internal .picker-item[data-value="b"]');
+            await expect(disabledItem).not.toHaveClass(/picker-item-active/);
+        });
+        test('setting the value to a disabled item should not cause that item to be active', async ({ page }) => {
+            await page.setContent(`
+        <ion-picker-internal>
+          <ion-picker-column-internal></ion-picker-column-internal>
+        </ion-picker-internal>
+
+        <script>
+          const column = document.querySelector('ion-picker-column-internal');
+          column.items = [
+            { text: 'A', value: 'a' },
+            { text: 'B', value: 'b', disabled: true },
+            { text: 'C', value: 'c' }
+          ]
+        </script>
+      `, config);
+            const pickerColumn = page.locator('ion-picker-column-internal');
+            await pickerColumn.evaluate((el) => (el.value = 'b'));
+            await page.waitForChanges();
+            const disabledItem = page.locator('ion-picker-column-internal .picker-item[data-value="b"]');
+            await expect(disabledItem).toBeDisabled();
+            await expect(disabledItem).not.toHaveClass(/picker-item-active/);
+        });
+        test('defaulting the value to a disabled item should not cause that item to be active', async ({ page }) => {
+            await page.setContent(`
+        <ion-picker-internal>
+          <ion-picker-column-internal></ion-picker-column-internal>
+        </ion-picker-internal>
+
+        <script>
+          const column = document.querySelector('ion-picker-column-internal');
+          column.items = [
+            { text: 'A', value: 'a' },
+            { text: 'B', value: 'b', disabled: true },
+            { text: 'C', value: 'c' }
+          ]
+          column.value = 'b'
+        </script>
+      `, config);
+            const disabledItem = page.locator('ion-picker-column-internal .picker-item[data-value="b"]');
+            await expect(disabledItem).toBeDisabled();
+            await expect(disabledItem).not.toHaveClass(/picker-item-active/);
+        });
+    });
+});
+/**
+ * This behavior does not vary across directions.
+ */
+configs({ directions: ['ltr'] }).forEach(({ title, screenshot, config }) => {
+    test.describe(title('picker-column-internal: disabled column rendering'), () => {
+        test.beforeEach(async ({ page }) => {
+            await page.goto('/src/components/picker-column-internal/test/disabled', config);
+        });
+        test('disabled column should not have visual regressions', async ({ page }) => {
+            const disabledColumn = page.locator('#column-disabled');
+            await page.waitForChanges();
+            await expect(disabledColumn).toHaveScreenshot(screenshot('picker-internal-disabled-column'));
+        });
+    });
+});
+/**
+ * This behavior does not vary across modes/directions.
+ */
+configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) => {
+    test.describe(title('picker-column-internal: disabled column'), () => {
+        test.beforeEach(async ({ page }) => {
+            await page.goto('/src/components/picker-column-internal/test/disabled', config);
+        });
+        test('item in disabled column should not be interactive', async ({ page }) => {
+            const secondItem = page.locator('#column-disabled .picker-item:not(.picker-item-empty)').nth(1);
+            await expect(secondItem).toBeDisabled();
+        });
+    });
+});