@ionic/core 8.7.13-dev.11765921002.107104c2 → 8.7.13-dev.11765925297.1bb45463

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

@@ -1,3 +1,9 @@
+/**
+ * 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
@@ -53,6 +59,28 @@
  *   }
  * }
  */
+/**
+ * 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
@@ -97,7 +125,6 @@
   display: inline-block;
   width: auto;
   color: var(--color);
-  font-family: var(--ion-font-family, inherit);
   text-align: center;
   text-decoration: none;
   white-space: normal;
@@ -113,21 +140,13 @@
   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) {
@@ -177,18 +196,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;
@@ -233,36 +252,18 @@
   flex-shrink: 0;
 }
 
-::slotted(ion-icon) {
-  font-size: 1.35em;
+::slotted(ion-icon),
+::slotted(ion-spinner) {
   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 {
-  left: 0;
   right: 0;
+  left: 0;
   top: 0;
   bottom: 0;
   position: absolute;
@@ -310,7 +311,7 @@ ion-ripple-effect {
 
 :host(.button-clear.ion-color) .button-native {
   background: transparent;
-  color: var(--ion-color-base);
+  color: var(--ion-color-foreground);
 }
 
 :host(.in-toolbar:not(.ion-color):not(.in-toolbar-color)) .button-native {
@@ -326,6 +327,80 @@ 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;
+}
+
+/**
+ * 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
@@ -381,6 +456,12 @@ 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
@@ -437,7 +518,6 @@ ion-ripple-effect {
  * }
  */
 :host {
-  --border-radius: 14px;
   --padding-top: 13px;
   --padding-bottom: 13px;
   --padding-start: 1em;
@@ -465,13 +545,12 @@ 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: .1;
+  --background-focused-opacity: 0.1;
   --color-activated: var(--ion-color-primary-contrast, #fff);
 }
 
@@ -480,7 +559,7 @@ ion-ripple-effect {
   --background-activated-opacity: 0;
   --background-focused: var(--ion-color-primary, #0054e9);
   --background-hover: transparent;
-  --background-focused-opacity: .1;
+  --background-focused-opacity: 0.1;
   font-size: min(1.0625rem, 51px);
   font-weight: normal;
 }
@@ -501,7 +580,6 @@ ion-ripple-effect {
 }
 
 :host(.button-large) {
-  --border-radius: 16px;
   --padding-top: 17px;
   --padding-start: 1em;
   --padding-end: 1em;
@@ -511,7 +589,6 @@ ion-ripple-effect {
 }
 
 :host(.button-small) {
-  --border-radius: 6px;
   --padding-top: 4px;
   --padding-start: 0.9em;
   --padding-end: 0.9em;
@@ -520,12 +597,24 @@ 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;
-  --padding-top: 0;
-  --padding-start: 26px;
-  --padding-end: 26px;
-  --padding-bottom: 0;
+}
+
+:host(.button-rectangular) {
+  --border-radius: 0px;
 }
 
 :host(.button-strong) {
@@ -548,7 +637,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
@@ -570,7 +659,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
@@ -592,7 +681,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

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

@@ -5,9 +5,10 @@ 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 { getIonMode } from "../../global/ionic-global";
+import { getIonTheme, getIonMode } from "../../global/ionic-global";
 /**
- * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use.
+ * @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.
  *
  * @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.
@@ -134,6 +135,9 @@ export class Button {
     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';
         // If the button is in a toolbar, has a clear fill (which is the default)
@@ -143,6 +147,28 @@ export class Button {
         }
         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.
@@ -203,9 +229,11 @@ 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 { buttonType, type, disabled, rel, target, size, href, color, expand, hasIconOnly, shape, strong, inheritedAttributes, } = this;
-        const finalSize = size === undefined && this.inItem ? 'small' : size;
+        const size = this.getSize();
+        const shape = this.getShape();
         const TagType = href === undefined ? 'button' : 'a';
         const attrs = TagType === 'button'
             ? { type }
@@ -229,35 +257,38 @@ export class Button {
         {
             type !== 'button' && this.renderHiddenButton();
         }
-        return (h(Host, { key: 'ed82ea53705523f9afc5f1a9addff44cc6424f27', onClick: this.handleClick, "aria-disabled": disabled ? 'true' : null, class: createColorClasses(color, {
-                [mode]: true,
+        return (h(Host, { key: '5671a9919b9e5b98d58d9e383e24531de3550c2b', onClick: this.handleClick, "aria-disabled": disabled ? 'true' : null, class: createColorClasses(color, {
+                [theme]: true,
                 [buttonType]: true,
                 [`${buttonType}-${expand}`]: expand !== undefined,
-                [`${buttonType}-${finalSize}`]: finalSize !== undefined,
-                [`${buttonType}-${shape}`]: shape !== undefined,
+                [`${buttonType}-${size}`]: size !== undefined,
+                [`${buttonType}-${shape}`]: true,
                 [`${buttonType}-${fill}`]: true,
                 [`${buttonType}-strong`]: strong,
                 'in-toolbar': hostContext('ion-toolbar', this.el),
                 'in-toolbar-color': hostContext('ion-toolbar[color]', this.el),
                 '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: 'fadec13053469dd0405bbbc61b70ced568aa4826' }, attrs, { class: "button-native", part: "native", disabled: disabled, onFocus: this.onFocus, onBlur: this.onBlur }, inheritedAttributes), h("span", { key: '6bf0e5144fb1148002e88038522402b789689d2c', class: "button-inner" }, h("slot", { key: '25da0ca155cfa9e2754842c34f4fd09f576ac2d2', name: "icon-only", onSlotchange: this.slotChanged }), h("slot", { key: '51414065bb11953ec9d818f8d9353589bc9072c5', name: "start" }), h("slot", { key: 'c9b5f8842aeabd20628df2f4600f1257ea913d8d' }), h("slot", { key: '478dd3671c7be1909fc84e672f0fa8dfe6082263', name: "end" })), mode === 'md' && h("ion-ripple-effect", { key: 'e1d55f85a55144d743f58a5914cd116cb065fa8c', type: this.rippleType }))));
+            }) }, h(TagType, Object.assign({ key: 'a09a2057f5946df8a7dc88d4dcb0d73aa5c62d99' }, attrs, { class: "button-native", part: "native", disabled: disabled, onFocus: this.onFocus, onBlur: this.onBlur }, inheritedAttributes), h("span", { key: '8badace792aa30f57a9ff2a2c8c163eb62ff0323', class: "button-inner" }, h("slot", { key: '645d5ed35b168d08dd3cbdd9b296a3f28738ed2c', name: "icon-only", onSlotchange: this.slotChanged }), h("slot", { key: '169713d7b2c3609bd56c79887d501fbca6fe3e7e', name: "start" }), h("slot", { key: '3c57f6c11e7490593ab96907118858d4a060f1c3' }), h("slot", { key: 'd21a64e784fcbdc04bc46b6b5e9bd51fdf9190e4', name: "end" })), mode === 'md' && h("ion-ripple-effect", { key: '120cd2669087a6911001fa06f091752b3bdee18e', 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"]
+            "md": ["button.md.scss"],
+            "ionic": ["button.ionic.scss"]
         };
     }
     static get styleUrls() {
         return {
             "ios": ["button.ios.css"],
-            "md": ["button.md.css"]
+            "md": ["button.md.css"],
+            "ionic": ["button.ionic.css"]
         };
     }
     static get properties() {
@@ -475,15 +506,15 @@ export class Button {
                 "type": "string",
                 "mutable": false,
                 "complexType": {
-                    "original": "'round'",
-                    "resolved": "\"round\" | undefined",
+                    "original": "'soft' | 'round' | 'rectangular'",
+                    "resolved": "\"rectangular\" | \"round\" | \"soft\" | undefined",
                     "references": {}
                 },
                 "required": false,
                 "optional": true,
                 "docs": {
                     "tags": [],
-                    "text": "Set to `\"round\"` for a button with more rounded corners."
+                    "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."
                 },
                 "getter": false,
                 "setter": false,
@@ -494,15 +525,15 @@ export class Button {
                 "type": "string",
                 "mutable": false,
                 "complexType": {
-                    "original": "'small' | 'default' | 'large'",
-                    "resolved": "\"default\" | \"large\" | \"small\" | undefined",
+                    "original": "'small' | 'default' | 'medium' | 'large'",
+                    "resolved": "\"default\" | \"large\" | \"medium\" | \"small\" | undefined",
                     "references": {}
                 },
                 "required": false,
                 "optional": true,
                 "docs": {
                     "tags": [],
-                    "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."
+                    "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."
                 },
                 "getter": false,
                 "setter": false,