@ionic/core 8.8.3-dev.11774545677.151db026 → 8.8.3-dev.11774956231.12ab3ff2

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

@@ -1,9 +1,3 @@
-/**
- * Convert a pixels given value into rem
- * 
- * @param pixels - Value in pixels to be converted (i.e. px)
- * @param context (optional) - Baseline value
- */
 /**
  * Convert a font size to a dynamic font size.
  * Fonts that participate in Dynamic Type should use
@@ -59,28 +53,6 @@
  *   }
  * }
  */
-/**
- * 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 {
   /**
    * @prop --background: Background of the button
@@ -125,6 +97,7 @@
   display: inline-block;
   width: auto;
   color: var(--color);
+  font-family: var(--ion-font-family, inherit);
   text-align: center;
   text-decoration: none;
   white-space: normal;
@@ -140,13 +113,21 @@
   pointer-events: none;
 }
 
+:host(.button-solid) {
+  --background: var(--ion-color-primary, #0054e9);
+  --color: var(--ion-color-primary-contrast, #fff);
+}
+
 :host(.button-outline) {
+  --border-color: var(--ion-color-primary, #0054e9);
   --background: transparent;
+  --color: var(--ion-color-primary, #0054e9);
 }
 
 :host(.button-clear) {
   --border-width: 0;
   --background: transparent;
+  --color: var(--ion-color-primary, #0054e9);
 }
 
 :host(.button-block) {
@@ -196,18 +177,18 @@
   padding-inline-end: var(--padding-end);
   padding-top: var(--padding-top);
   padding-bottom: var(--padding-bottom);
-  color: inherit;
   font-family: inherit;
   font-size: inherit;
   font-style: inherit;
   font-weight: inherit;
   letter-spacing: inherit;
-  text-align: inherit;
   text-decoration: inherit;
   text-indent: inherit;
   text-overflow: inherit;
   text-transform: inherit;
+  text-align: inherit;
   white-space: inherit;
+  color: inherit;
   display: flex;
   position: relative;
   align-items: center;
@@ -252,18 +233,36 @@
   flex-shrink: 0;
 }
 
-::slotted(ion-icon),
-::slotted(ion-spinner) {
+::slotted(ion-icon) {
+  font-size: 1.35em;
   pointer-events: none;
 }
 
+::slotted(ion-icon[slot=start]) {
+  -webkit-margin-start: -0.3em;
+  margin-inline-start: -0.3em;
+  -webkit-margin-end: 0.3em;
+  margin-inline-end: 0.3em;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+::slotted(ion-icon[slot=end]) {
+  -webkit-margin-start: 0.3em;
+  margin-inline-start: 0.3em;
+  -webkit-margin-end: -0.2em;
+  margin-inline-end: -0.2em;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
 ion-ripple-effect {
   color: var(--ripple-color);
 }
 
 .button-native::after {
-  right: 0;
   left: 0;
+  right: 0;
   top: 0;
   bottom: 0;
   position: absolute;
@@ -311,7 +310,7 @@ ion-ripple-effect {
 
 :host(.button-clear.ion-color) .button-native {
   background: transparent;
-  color: var(--ion-color-foreground);
+  color: var(--ion-color-base);
 }
 
 :host(.in-toolbar:not(.ion-color):not(.in-toolbar-color)) .button-native {
@@ -327,90 +326,6 @@ ion-ripple-effect {
   color: var(--ion-toolbar-background, var(--color));
 }
 
-.button-native ion-ripple-effect,
-.button-native::after {
-  border-radius: inherit;
-}
-
-:host(.button-has-badge) .button-native {
-  --overflow: visible;
-}
-
-:host ::slotted(ion-badge[vertical]:not(:empty)) {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-:host {
-  font-family: var(--ion-font-family, inherit);
-}
-
-:host(.button-solid) {
-  --background: var(--ion-color-primary, #0054e9);
-  --color: var(--ion-color-primary-contrast, #fff);
-}
-
-:host(.button-outline) {
-  --border-color: var(--ion-color-primary, #0054e9);
-  --color: var(--ion-color-primary, #0054e9);
-}
-
-:host(.button-clear) {
-  --color: var(--ion-color-primary, #0054e9);
-}
-
-::slotted(ion-icon) {
-  font-size: 1.35em;
-}
-
-::slotted(ion-icon[slot=start]) {
-  -webkit-margin-start: -0.3em;
-  margin-inline-start: -0.3em;
-  -webkit-margin-end: 0.3em;
-  margin-inline-end: 0.3em;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-::slotted(ion-icon[slot=end]) {
-  -webkit-margin-start: 0.3em;
-  margin-inline-start: 0.3em;
-  -webkit-margin-end: -0.2em;
-  margin-inline-end: -0.2em;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-.button-native ::slotted(ion-badge) {
-  position: fixed;
-}
-
-:host ::slotted(ion-badge[vertical]:not(:empty)) {
-  -webkit-padding-start: 2px;
-  padding-inline-start: 2px;
-  -webkit-padding-end: 2px;
-  padding-inline-end: 2px;
-  padding-top: 2px;
-  padding-bottom: 2px;
-}
-
-:host(.in-datetime) {
-  -webkit-margin-start: 2px;
-  margin-inline-start: 2px;
-  -webkit-margin-end: 2px;
-  margin-inline-end: 2px;
-  margin-top: 0px;
-  margin-bottom: 0px;
-  min-height: 32px;
-}
-
-/**
- * Convert a pixels given value into rem
- * 
- * @param pixels - Value in pixels to be converted (i.e. px)
- * @param context (optional) - Baseline value
- */
 /**
  * Convert a font size to a dynamic font size.
  * Fonts that participate in Dynamic Type should use
@@ -466,12 +381,6 @@ ion-ripple-effect {
  *   }
  * }
  */
-/**
- * Convert a pixels given value into rem
- * 
- * @param pixels - Value in pixels to be converted (i.e. px)
- * @param context (optional) - Baseline value
- */
 /**
  * Convert a font size to a dynamic font size.
  * Fonts that participate in Dynamic Type should use
@@ -528,6 +437,7 @@ ion-ripple-effect {
  * }
  */
 :host {
+  --border-radius: 14px;
   --padding-top: 13px;
   --padding-bottom: 13px;
   --padding-start: 1em;
@@ -555,12 +465,13 @@ ion-ripple-effect {
 }
 
 :host(.button-outline) {
+  --border-radius: 14px;
   --border-width: 1px;
   --border-style: solid;
   --background-activated: var(--ion-color-primary, #0054e9);
   --background-focused: var(--ion-color-primary, #0054e9);
   --background-hover: transparent;
-  --background-focused-opacity: 0.1;
+  --background-focused-opacity: .1;
   --color-activated: var(--ion-color-primary-contrast, #fff);
 }
 
@@ -569,7 +480,7 @@ ion-ripple-effect {
   --background-activated-opacity: 0;
   --background-focused: var(--ion-color-primary, #0054e9);
   --background-hover: transparent;
-  --background-focused-opacity: 0.1;
+  --background-focused-opacity: .1;
   font-size: min(1.0625rem, 51px);
   font-weight: normal;
 }
@@ -590,6 +501,7 @@ ion-ripple-effect {
 }
 
 :host(.button-large) {
+  --border-radius: 16px;
   --padding-top: 17px;
   --padding-start: 1em;
   --padding-end: 1em;
@@ -599,6 +511,7 @@ ion-ripple-effect {
 }
 
 :host(.button-small) {
+  --border-radius: 6px;
   --padding-top: 4px;
   --padding-start: 0.9em;
   --padding-end: 0.9em;
@@ -607,24 +520,12 @@ ion-ripple-effect {
   font-size: min(0.8125rem, 39px);
 }
 
-:host(.button-soft) {
-  --border-radius: 6px;
-}
-
-:host(.button-soft.button-large) {
-  --border-radius: 8px;
-}
-
-:host(.button-soft.button-small) {
-  --border-radius: 4px;
-}
-
 :host(.button-round) {
   --border-radius: 999px;
-}
-
-:host(.button-rectangular) {
-  --border-radius: 0px;
+  --padding-top: 0;
+  --padding-start: 26px;
+  --padding-end: 26px;
+  --padding-bottom: 0;
 }
 
 :host(.button-strong) {
@@ -647,7 +548,7 @@ ion-ripple-effect {
     *
     * Since the `ion-button` uses `rem` for the font size, we can't
     * just pass the desired icon font size in `em` to the `
-    * dynamic-font-clamp`. Instead, we need to adjust the base size
+    * dynamic-font-clamp`. Instead, we need to adjust the base size 
     * to account for the ion-button` font size.
     *
     * For example, if the default font size of `ion-button` is 16px
@@ -669,7 +570,7 @@ ion-ripple-effect {
     *
     * Since the `ion-button` uses `rem` for the font size, we can't
     * just pass the desired icon font size in `em` to the `
-    * dynamic-font-clamp`. Instead, we need to adjust the base size
+    * dynamic-font-clamp`. Instead, we need to adjust the base size 
     * to account for the ion-button` font size.
     *
     * For example, if the default font size of `ion-button` is 13px
@@ -691,7 +592,7 @@ ion-ripple-effect {
     *
     * Since the `ion-button` uses `rem` for the font size, we can't
     * just pass the desired icon font size in `em` to the `
-    * dynamic-font-clamp`. Instead, we need to adjust the base size
+    * dynamic-font-clamp`. Instead, we need to adjust the base size 
     * to account for the ion-button` font size.
     *
     * For example, if the default font size of `ion-button` is 20px
@@ -753,13 +654,4 @@ ion-ripple-effect {
 :host(.button-outline.ion-activated.in-toolbar:not(.ion-color):not(.in-toolbar-color)) .button-native {
   background: var(--ion-toolbar-color, var(--color));
   color: var(--ion-toolbar-background, var(--background), var(--ion-color-primary-contrast, #fff));
-}
-
-:host(.in-datetime) {
-  --padding-top: 3px;
-  --padding-bottom: 3px;
-  --padding-start: 5px;
-  --padding-end: 5px;
-  font-size: clamp(17px, 1.0625rem, 21.08px);
-  font-weight: 400;
 }

package/dist/collection/components/button/button.js

@@ -5,10 +5,9 @@ import { Host, forceUpdate, h } from "@stencil/core";
 import { inheritAriaAttributes, hasShadowDom } from "../../utils/helpers";
 import { printIonWarning } from "../../utils/logging/index";
 import { createColorClasses, hostContext, openURL } from "../../utils/theme";
-import { getIonTheme, getIonMode } from "../../global/ionic-global";
+import { getIonMode } from "../../global/ionic-global";
 /**
- * @virtualProp {"ios" | "md"} mode - The mode determines the platform behaviors of the component.
- * @virtualProp {"ios" | "md" | "ionic"} theme - The theme determines the visual appearance of the component.
+ * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use.
  *
  * @slot - Content is placed between the named slots if provided without a slot.
  * @slot icon-only - Should be used on an icon in a button that has no text.
@@ -19,10 +18,9 @@ import { getIonTheme, getIonMode } from "../../global/ionic-global";
  */
 export class Button {
     constructor() {
-        this.inDatetime = false;
         this.inItem = false;
         this.inListHeader = false;
-        this.inButtons = false;
+        this.inToolbar = false;
         this.formButtonEl = null;
         this.formEl = null;
         this.inheritedAttributes = {};
@@ -128,51 +126,23 @@ export class Button {
         }
     }
     componentWillLoad() {
-        this.inDatetime = hostContext('ion-datetime', this.el);
-        this.inButtons = hostContext('ion-buttons', this.el);
-        this.inListHeader = hostContext('ion-list-header', this.el);
-        this.inItem = hostContext('ion-item', this.el) || hostContext('ion-item-divider', this.el);
+        this.inToolbar = !!this.el.closest('ion-buttons');
+        this.inListHeader = !!this.el.closest('ion-list-header');
+        this.inItem = !!this.el.closest('ion-item') || !!this.el.closest('ion-item-divider');
         this.inheritedAttributes = inheritAriaAttributes(this.el);
     }
     get hasIconOnly() {
         return !!this.el.querySelector('[slot="icon-only"]');
     }
-    get hasBadge() {
-        return !!this.el.querySelector('ion-badge');
-    }
     get rippleType() {
         const hasClearFill = this.fill === undefined || this.fill === 'clear';
-        // Use the unbounded "circular" ripple effect if it:
-        // - Has a clear fill (the default)
-        // - Only has an icon and
-        // - Is inside of buttons (used in a toolbar) or a datetime
-        if (hasClearFill && this.hasIconOnly && (this.inButtons || this.inDatetime)) {
+        // If the button is in a toolbar, has a clear fill (which is the default)
+        // and only has an icon we use the unbounded "circular" ripple effect
+        if (hasClearFill && this.hasIconOnly && this.inToolbar) {
             return 'unbounded';
         }
         return 'bounded';
     }
-    /**
-     * Set the shape based on the theme
-     */
-    getShape() {
-        const theme = getIonTheme(this);
-        const { shape } = this;
-        if (shape === undefined) {
-            return theme === 'ios' ? 'soft' : 'round';
-        }
-        return shape;
-    }
-    /**
-     * Get the default size. If size is unset and the button is inside an item,
-     * the default size is "small". Otherwise, it uses the value of size.
-     */
-    getSize() {
-        const { size } = this;
-        if (size === undefined) {
-            return this.inItem ? 'small' : 'medium';
-        }
-        return size;
-    }
     /**
      * Finds the form element based on the provided `form` selector
      * or element reference provided.
@@ -233,11 +203,9 @@ export class Button {
         }
     }
     render() {
-        const { buttonType, type, disabled, rel, target, href, color, expand, hasIconOnly, hasBadge, strong, inheritedAttributes, } = this;
-        const theme = getIonTheme(this);
         const mode = getIonMode(this);
-        const size = this.getSize();
-        const shape = this.getShape();
+        const { buttonType, type, disabled, rel, target, size, href, color, expand, hasIconOnly, shape, strong, inheritedAttributes, } = this;
+        const finalSize = size === undefined && this.inItem ? 'small' : size;
         const TagType = href === undefined ? 'button' : 'a';
         const attrs = TagType === 'button'
             ? { type }
@@ -249,7 +217,7 @@ export class Button {
             };
         let fill = this.fill;
         if (fill === undefined) {
-            fill = this.inDatetime || this.inButtons || this.inListHeader ? 'clear' : 'solid';
+            fill = this.inToolbar || this.inListHeader ? 'clear' : 'solid';
         }
         /**
          * We call renderHiddenButton in the render function to account
@@ -261,39 +229,35 @@ export class Button {
         {
             type !== 'button' && this.renderHiddenButton();
         }
-        return (h(Host, { key: '9e59432c723f240b0b7b2d5536b175ea13ac9fdd', onClick: this.handleClick, "aria-disabled": disabled ? 'true' : null, class: createColorClasses(color, {
-                [theme]: true,
+        return (h(Host, { key: 'd148ed2332917f03fafd63dbbef10131df0ec5f0', onClick: this.handleClick, "aria-disabled": disabled ? 'true' : null, class: createColorClasses(color, {
+                [mode]: true,
                 [buttonType]: true,
                 [`${buttonType}-${expand}`]: expand !== undefined,
-                [`${buttonType}-${size}`]: size !== undefined,
-                [`${buttonType}-${shape}`]: true,
+                [`${buttonType}-${finalSize}`]: finalSize !== undefined,
+                [`${buttonType}-${shape}`]: shape !== undefined,
                 [`${buttonType}-${fill}`]: true,
                 [`${buttonType}-strong`]: strong,
-                'in-datetime': this.inDatetime,
                 'in-toolbar': hostContext('ion-toolbar', this.el),
                 'in-toolbar-color': hostContext('ion-toolbar[color]', this.el),
-                'in-buttons': this.inButtons,
+                'in-buttons': hostContext('ion-buttons', this.el),
                 'button-has-icon-only': hasIconOnly,
-                'button-has-badge': hasBadge,
                 'button-disabled': disabled,
                 'ion-activatable': true,
                 'ion-focusable': true,
-            }) }, h(TagType, Object.assign({ key: '8f003ff3e91da74d83ff20fe14bc16133d20d3fb' }, attrs, { class: "button-native", part: "native", disabled: disabled, onFocus: this.onFocus, onBlur: this.onBlur }, inheritedAttributes), h("span", { key: 'fb0f32c83c884d131a5f62464990434a552c2221', class: "button-inner" }, h("slot", { key: '163f8bd2e1fc0790aed3db9691f564bb2796a4ee', name: "icon-only", onSlotchange: this.slotChanged }), h("slot", { key: 'a858bcdf6040488745720147d9e653746a329623', name: "start" }), h("slot", { key: 'c36663965130158fa0e29cd889dedfec9d4d7a07' }), h("slot", { key: '5f567b14d90ed9a00e2958d4383659a13535c66f', name: "end" })), mode === 'md' && h("ion-ripple-effect", { key: '15d3a9674f73b4757c8c7d5a5df75ac113f10ba5', type: this.rippleType }))));
+            }) }, h(TagType, Object.assign({ key: '9da73c530017d510839a224bc4d5315bd44f60ed' }, attrs, { class: "button-native", part: "native", disabled: disabled, onFocus: this.onFocus, onBlur: this.onBlur }, inheritedAttributes), h("span", { key: '9046184db918cc53e90796860c43d1dfb7d1f85c', class: "button-inner" }, h("slot", { key: '9dd37ab124803e703567ddde4154c81ed1922be1', name: "icon-only", onSlotchange: this.slotChanged }), h("slot", { key: '01713ecf19c68be05072ffcd00ed7ff2d76c4551', name: "start" }), h("slot", { key: '121124874ba1357bc10ffaf4f7ed13803a02add9' }), h("slot", { key: '09317cf5ced153fbb94d4ebba69db858f9dbe570', name: "end" })), mode === 'md' && h("ion-ripple-effect", { key: '8bdd9d082f48582be903221b13b67095046cd9aa', type: this.rippleType }))));
     }
     static get is() { return "ion-button"; }
     static get encapsulation() { return "shadow"; }
     static get originalStyleUrls() {
         return {
             "ios": ["button.ios.scss"],
-            "md": ["button.md.scss"],
-            "ionic": ["button.ionic.scss"]
+            "md": ["button.md.scss"]
         };
     }
     static get styleUrls() {
         return {
             "ios": ["button.ios.css"],
-            "md": ["button.md.css"],
-            "ionic": ["button.ionic.css"]
+            "md": ["button.md.css"]
         };
     }
     static get properties() {
@@ -395,7 +359,7 @@ export class Button {
                 "optional": true,
                 "docs": {
                     "tags": [],
-                    "text": "Set to `\"clear\"` for a transparent button that resembles a flat button, to `\"outline\"`\nfor a transparent button with a border, or to `\"solid\"` for a button with a filled background.\nThe default fill is `\"solid\"` except when inside of a buttons or datetime component, where\nthe default fill is `\"clear\"`."
+                    "text": "Set to `\"clear\"` for a transparent button that resembles a flat button, to `\"outline\"`\nfor a transparent button with a border, or to `\"solid\"` for a button with a filled background.\nThe default fill is `\"solid\"` except inside of a toolbar, where the default is `\"clear\"`."
                 },
                 "getter": false,
                 "setter": false,
@@ -514,15 +478,15 @@ export class Button {
                 "type": "string",
                 "mutable": false,
                 "complexType": {
-                    "original": "'soft' | 'round' | 'rectangular'",
-                    "resolved": "\"rectangular\" | \"round\" | \"soft\" | undefined",
+                    "original": "'round'",
+                    "resolved": "\"round\" | undefined",
                     "references": {}
                 },
                 "required": false,
                 "optional": true,
                 "docs": {
                     "tags": [],
-                    "text": "Set to `\"soft\"` for a button with slightly rounded corners, `\"round\"` for a button with fully\nrounded corners, or `\"rectangular\"` for a button without rounded corners.\nDefaults to `\"soft\"` for the `\"ios\"` theme and `\"round\"` for all other themes."
+                    "text": "Set to `\"round\"` for a button with more rounded corners."
                 },
                 "getter": false,
                 "setter": false,
@@ -533,15 +497,15 @@ export class Button {
                 "type": "string",
                 "mutable": false,
                 "complexType": {
-                    "original": "'small' | 'default' | 'medium' | 'large'",
-                    "resolved": "\"default\" | \"large\" | \"medium\" | \"small\" | undefined",
+                    "original": "'small' | 'default' | 'large'",
+                    "resolved": "\"default\" | \"large\" | \"small\" | undefined",
                     "references": {}
                 },
                 "required": false,
                 "optional": true,
                 "docs": {
                     "tags": [],
-                    "text": "Set to `\"small\"` for a button with less height and padding, to `\"medium\"`\nfor a button with the medium height and padding, or to `\"large\"` for a button\nwith more height and padding. By default the size is unset, unless the button\nis inside of an item, where the size is `\"small\"` by default. Set the size to\n`\"default\"` inside of an item to make it a standard size button."
+                    "text": "Set to `\"small\"` for a button with less height and padding, to `\"default\"`\nfor a button with the default height and padding, or to `\"large\"` for a button\nwith more height and padding. By default the size is unset, unless the button\nis inside of an item, where the size is `\"small\"` by default. Set the size to\n`\"default\"` inside of an item to make it a standard size button."
                 },
                 "getter": false,
                 "setter": false,