Merge branch 'next' into ROU-11251

Author: thetaPC

core/api.txt

@@ -317,6 +317,7 @@ ion-badge,prop,mode,"ios" | "md",undefined,false,false
 ion-badge,prop,shape,"round | rectangular" | "soft" | undefined,undefined,false,false
 ion-badge,prop,size,"large" | "medium" | "small" | "xlarge" | "xsmall" | "xxsmall" | undefined,undefined,false,false
 ion-badge,prop,theme,"ios" | "md" | "ionic",undefined,false,false
+ion-badge,prop,vertical,"bottom" | "top" | undefined,undefined,false,false
 ion-badge,css-prop,--background,ionic
 ion-badge,css-prop,--background,ios
 ion-badge,css-prop,--background,md

core/src/components.d.ts

@@ -334,6 +334,7 @@ export namespace Components {
         "mode"?: "ios" | "md";
         /**
           * Used to set focus on an element that uses `ion-focusable`. Do not use this if focusing the element as a result of a keyboard event as the focus utility should handle this for us. This method should be used when we want to programmatically focus an element as a result of another user action. (Ex: We focus the first element inside of a popover when the user presents it, but the popover is not always presented as a result of keyboard action.)
+          * @param elements - The elements to set focus on.
          */
         "setFocus": (elements: HTMLElement[]) => Promise<void>;
         /**
@@ -440,6 +441,10 @@ export namespace Components {
           * The theme determines the visual appearance of the component.
          */
         "theme"?: "ios" | "md" | "ionic";
+        /**
+          * Set to `"top"` to position the badge on top right absolute position of the parent element. Set to `"bottom"` to position the badge on bottom right absolute position of the parent element.
+         */
+        "vertical"?: 'top' | 'bottom';
     }
     interface IonBreadcrumb {
         /**
@@ -5808,6 +5813,10 @@ declare namespace LocalJSX {
           * The theme determines the visual appearance of the component.
          */
         "theme"?: "ios" | "md" | "ionic";
+        /**
+          * Set to `"top"` to position the badge on top right absolute position of the parent element. Set to `"bottom"` to position the badge on bottom right absolute position of the parent element.
+         */
+        "vertical"?: 'top' | 'bottom';
     }
     interface IonBreadcrumb {
         /**

core/src/components/app/app.tsx

@@ -1,6 +1,6 @@
 import type { ComponentInterface } from '@stencil/core';
 import { Component, Element, Host, Method, h } from '@stencil/core';
-import { getOrInitFocusVisibleUtility } from '@utils/focus-visible';
+import { focusElements } from '@utils/focus-visible';
 
 import { config } from '../../global/config';
 import { getIonTheme } from '../../global/ionic-global';
@@ -24,11 +24,16 @@ export class App implements ComponentInterface {
    * a result of another user action. (Ex: We focus the first element
    * inside of a popover when the user presents it, but the popover is not always
    * presented as a result of keyboard action.)
+   *
+   * @param elements - The elements to set focus on.
    */
   @Method()
   async setFocus(elements: HTMLElement[]) {
-    const focusVisible = getOrInitFocusVisibleUtility();
-    focusVisible.setFocus(elements);
+    /**
+     * The focus-visible utility is used to set focus on an
+     * element that uses `ion-focusable`.
+     */
+    focusElements(elements);
   }
 
   render() {

core/src/components/avatar/avatar.common.scss

@@ -10,6 +10,8 @@
   @include border-radius(var(--border-radius));
 
   display: block;
+
+  position: relative;
 }
 
 ::slotted(ion-img),

core/src/components/avatar/avatar.ionic.scss

@@ -152,3 +152,22 @@
   width: globals.$ion-scale-1000;
   height: globals.$ion-scale-1000;
 }
+
+// Avatar Empty Badge (hint)
+// --------------------------------------------------
+
+:host ::slotted(ion-badge.badge-vertical-top:empty) {
+  transform: translate(globals.$ion-scale-050, calc(globals.$ion-scale-050 * -1));
+}
+
+:host(.avatar-xxsmall) ::slotted(ion-badge.badge-vertical-top:empty) {
+  transform: translate(globals.$ion-scale-100, calc(globals.$ion-scale-100 * -1));
+}
+
+:host ::slotted(ion-badge.badge-vertical-bottom:empty) {
+  transform: translate(0, globals.$ion-scale-100);
+}
+
+:host(.avatar-xxsmall) ::slotted(ion-badge.badge-vertical-bottom:empty) {
+  transform: translate(globals.$ion-scale-100, calc(globals.$ion-scale-100));
+}

core/src/components/avatar/avatar.md.scss

@@ -10,3 +10,14 @@
   width: $avatar-md-width;
   height: $avatar-md-height;
 }
+
+// Avatar Empty Badge (hint)
+// --------------------------------------------------
+
+::slotted(ion-badge.badge-vertical-top:empty) {
+  transform: translate(-50%, 50%);
+}
+
+::slotted(ion-badge.badge-vertical-bottom:empty) {
+  transform: translateX(-100%);
+}

core/src/components/badge/badge.common.scss

@@ -48,6 +48,18 @@
   color: #{color.current-color(contrast)};
 }
 
-:host(:empty) {
-  display: none;
+// Badge Empty (hint)
+// --------------------------------------------------
+
+:host([vertical]) {
+  @include position(null, 0, null, null);
+  position: absolute;
+}
+
+:host(:empty.badge-vertical-top) {
+  top: 0;
+}
+
+:host(:empty.badge-vertical-bottom) {
+  bottom: 0;
 }

core/src/components/badge/badge.ionic.scss

@@ -145,3 +145,32 @@
   width: globals.$ion-scale-1000;
   height: globals.$ion-scale-1000;
 }
+
+// Badge Empty
+// --------------------------------------------------
+
+:host(:empty) {
+  --padding-start: 0;
+  --padding-end: 0;
+}
+
+// Badge Sizes Empty
+// --------------------------------------------------
+
+/* sm */
+:host(.badge-small:empty) {
+  min-width: globals.$ion-scale-200;
+  height: globals.$ion-scale-200;
+}
+
+/* md */
+:host(.badge-medium:empty) {
+  min-width: globals.$ion-scale-300;
+  height: globals.$ion-scale-300;
+}
+
+/* lg */
+:host(.badge-large:empty) {
+  min-width: globals.$ion-scale-400;
+  height: globals.$ion-scale-400;
+}

core/src/components/badge/badge.native.scss

@@ -11,3 +11,16 @@
 
   font-family: $font-family-base;
 }
+
+// TODO(ROU-10747): Review size styles when sizes are defined for native themes.
+:host(:empty) {
+  --padding-start: 0;
+  --padding-end: 0;
+  --padding-bottom: 0;
+  --padding-top: 0;
+
+  @include border-radius(999px);
+
+  width: $badge-min-width;
+  height: $badge-min-width;
+}

core/src/components/badge/badge.tsx

@@ -47,6 +47,12 @@ export class Badge implements ComponentInterface {
    */
   @Prop() size?: 'xxsmall' | 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
 
+  /**
+   * Set to `"top"` to position the badge on top right absolute position of the parent element.
+   * Set to `"bottom"` to position the badge on bottom right absolute position of the parent element.
+   */
+  @Prop() vertical?: 'top' | 'bottom';
+
   private getShape(): string | undefined {
     const theme = getIonTheme(this);
     const { shape } = this;
@@ -89,6 +95,7 @@ export class Badge implements ComponentInterface {
           [theme]: true,
           [`badge-${shape}`]: shape !== undefined,
           [`badge-${size}`]: size !== undefined,
+          [`badge-vertical-${this.vertical}`]: this.vertical !== undefined,
         })}
       >
         <slot></slot>