@supersoniks/concorde 5.0.0 → 5.0.2

package/src/core/components/ui/toast/toast-item.ts

@@ -10,19 +10,28 @@ import { renderToastContent } from "@supersoniks/concorde/core/components/ui/toa
 import { normalizeStyleSheets } from "@supersoniks/concorde/core/components/ui/modal/modal-utils";
 import { customScroll } from "@supersoniks/concorde/core/components/ui/_css/scroll";
 import { HTML } from "@supersoniks/concorde/utils";
+import {
+  isToastDismissed,
+  markToastDismissed,
+} from "@supersoniks/concorde/core/components/ui/toast/dismissed";
+import { resolveToastCloseLabel } from "@supersoniks/concorde/core/components/ui/_i18n/ui-aria-labels";
 
-const icon: Record<string, string> = {
-  warning: "warning-circled-outline",
-  success: "check-circled-outline",
-  error: "warning-circled-outline",
-  info: "info-empty",
-};
+import {
+  statusAriaLive,
+  statusAriaRole,
+  statusColor,
+  statusIcon,
+  toStatus,
+} from "@supersoniks/concorde/core/components/ui/_css/type";
+
+const AUTO_HIDE_DELAY = 6000;
 const tagName = "sonic-toast-item";
 
 @customElement(tagName)
 export class SonicToastItem extends LitElement {
   static styles = [
     customScroll,
+    statusColor,
     css`
       * {
         box-sizing: border-box;
@@ -31,7 +40,6 @@ export class SonicToastItem extends LitElement {
         display: block;
         pointer-events: auto;
         position: relative;
-        --sc-toast-status-color: transparent;
         --sc-toast-color: var(--sc-base-content, #000);
         --sc-toast-bg: var(--sc-base, #fff);
         --sc-toast-rounded: var(--sc-rounded-md);
@@ -52,14 +60,13 @@ export class SonicToastItem extends LitElement {
         pointer-events: auto;
         overflow: hidden;
         line-height: 1.25;
-        color: var(--sc-toast-color);
         box-shadow: var(--sc-toast-shadow);
         border-radius: var(--sc-toast-rounded);
         background: var(--sc-toast-bg);
       }
 
       .sonic-toast-content {
-        padding: 1em 2.5rem 1em 1em;
+        padding: 0.8em 2.25rem 0.8em 0.8em;
         display: flex;
         gap: 0.5rem;
         overflow: auto;
@@ -67,6 +74,7 @@ export class SonicToastItem extends LitElement {
       }
 
       .sonic-toast-text {
+        color: var(--sc-toast-color);
         align-self: center;
         margin-top: auto;
         margin-bottom: auto;
@@ -114,6 +122,7 @@ export class SonicToastItem extends LitElement {
         border-radius: 50%;
         text-align: center;
         opacity: 0.5;
+        color: var(--sc-toast-color);
         background: rgba(0, 0, 0, 0);
       }
 
@@ -133,39 +142,21 @@ export class SonicToastItem extends LitElement {
       /*Title*/
       .sonic-toast-title {
         font-weight: bold;
-        font-size: 1.15rem;
-        margin: 0.15em 0 0.25em;
+        font-size: 1.125rem;
+        margin: 0.15em 0 0.15em;
         line-height: 1.2;
       }
 
-      /*STATUS*/
-      .success {
-        --sc-toast-status-color: var(
-          --sc-success,
-          var(--sc-base-content, #000)
-        );
+      /*STATUS — accent via statusColor (--sc-_color) */
+      :host([status]) .sonic-toast {
+        border-top: 3px solid var(--sc-_color);
       }
 
-      .error {
-        --sc-toast-status-color: var(--sc-danger, var(--sc-base-content, #000));
-      }
-
-      .warning {
-        --sc-toast-status-color: var(
-          --sc-warning,
-          var(--sc-base-content, #000)
-        );
-      }
-
-      .info {
-        --sc-toast-status-color: var(--sc-info, var(--sc-base-content, #000));
-      }
-
-      .success,
-      .error,
-      .info,
-      .warning {
-        border-top: 3px solid var(--sc-toast-status-color, currentColor);
+      :host([status="success"]) .sonic-toast:before,
+      :host([status="error"]) .sonic-toast:before,
+      :host([status="info"]) .sonic-toast:before,
+      :host([status="warning"]) .sonic-toast:before {
+        background-color: var(--sc-_color);
       }
 
       .sonic-toast:before {
@@ -180,20 +171,12 @@ export class SonicToastItem extends LitElement {
         pointer-events: none;
         transition: 0.2s;
         border-radius: var(--sc-toast-rounded);
-        background-color: var(--sc-toast-status-color);
       }
 
       .sonic-toast:hover:before {
         opacity: 0.025;
       }
 
-      .info .sonic-toast-icon,
-      .error .sonic-toast-icon,
-      .success .sonic-toast-icon,
-      .warning .sonic-toast-icon {
-        color: var(--sc-toast-status-color, currentColor);
-      }
-
       .sonic-toast-icon {
         position: sticky;
         top: 0;
@@ -209,7 +192,7 @@ export class SonicToastItem extends LitElement {
   @property() label: ToastContent = "";
   @property({ type: String }) id = "";
   @property() text: ToastContent = "";
-  @property({ type: String }) status: ToastStatus = "";
+  @property({ type: String, reflect: true }) status: ToastStatus = "";
   @property({ type: Boolean }) ghost = false;
   @property({ type: Boolean }) preserve = false;
   @property({ type: Boolean }) dismissForever = false;
@@ -218,7 +201,42 @@ export class SonicToastItem extends LitElement {
   @property({ attribute: false }) styleSheet?: ToastStyleSheetInput;
   @state() visible = true;
   @state() private _titleId: string = "";
+  @state() private _dismissed = false;
   private _adoptedStyleSheets: Array<CSSStyleSheet> = [];
+  private _hideTimer?: ReturnType<typeof setTimeout>;
+  private _hideRemaining = AUTO_HIDE_DELAY;
+  private _hideStartedAt = 0;
+  private _hovered = false;
+  private _focused = false;
+  private _hidden = false;
+
+  connectedCallback(): void {
+    super.connectedCallback();
+    this.addEventListener("mouseenter", this._onMouseEnter);
+    this.addEventListener("mouseleave", this._onMouseLeave);
+    this.addEventListener("focusin", this._onFocusIn);
+    this.addEventListener("focusout", this._onFocusOut);
+  }
+
+  disconnectedCallback(): void {
+    this._clearHideTimer();
+    this.removeEventListener("mouseenter", this._onMouseEnter);
+    this.removeEventListener("mouseleave", this._onMouseLeave);
+    this.removeEventListener("focusin", this._onFocusIn);
+    this.removeEventListener("focusout", this._onFocusOut);
+    super.disconnectedCallback();
+  }
+
+  protected willUpdate(changedProperties: PropertyValues): void {
+    if (
+      changedProperties.has("dismissForever") ||
+      changedProperties.has("id")
+    ) {
+      this._dismissed =
+        this.dismissForever && !!this.id && isToastDismissed(this.id);
+    }
+    super.willUpdate(changedProperties);
+  }
 
   // @queryAssignedElements({flatten: true, slot: main"})
   // textSlot!: HTMLElement[];
@@ -229,7 +247,7 @@ export class SonicToastItem extends LitElement {
    * - "status" pour les autres (messages informatifs)
    */
   getAriaRole(): "alert" | "status" {
-    return this.status === "error" ? "alert" : "status";
+    return statusAriaRole(toStatus(this.status) ?? "default");
   }
 
   /**
@@ -238,7 +256,7 @@ export class SonicToastItem extends LitElement {
    * - "polite" pour les autres (peut attendre)
    */
   getAriaLive(): "polite" | null {
-    return this.status === "error" ? null : "polite";
+    return statusAriaLive(toStatus(this.status) ?? "default");
   }
 
   /**
@@ -254,33 +272,8 @@ export class SonicToastItem extends LitElement {
     return this._titleId;
   }
 
-  /**
-   * Génère un label ARIA descriptif pour le bouton de fermeture
-   */
-  getCloseButtonLabel(): string {
-    const statusLabels: Record<string, string> = {
-      error: "Fermer le message d'erreur",
-      warning: "Fermer l'avertissement",
-      success: "Fermer le message de succès",
-      info: "Fermer l'information",
-    };
-    const statusLabel = this.status
-      ? statusLabels[this.status] || "Fermer la notification"
-      : "Fermer la notification";
-    return statusLabel;
-  }
-
   render() {
-    // check if the toast is dismissed
-    if (this.dismissForever) {
-      const dismissed = localStorage.getItem("sonic-toast-dismissed") || "{}";
-      const dismissedObj = JSON.parse(dismissed);
-      if (dismissedObj[this.id]) {
-        return nothing;
-      }
-    }
-
-    if (!this.visible) {
+    if (this._dismissed || !this.visible) {
       return nothing;
     }
 
@@ -295,14 +288,14 @@ export class SonicToastItem extends LitElement {
 
     const ariaLive = this.getAriaLive();
     return html`<div
-      class="sonic-toast ${this.status} ${this.ghost ? "ghost" : ""}"
+      class="sonic-toast ${this.ghost ? "ghost" : ""}"
       role=${this.getAriaRole()}
       aria-live=${ariaLive || nothing}
       aria-atomic="true"
       aria-label=${ariaLabel || nothing}
     >
       <button
-        aria-label=${this.getCloseButtonLabel()}
+        aria-label=${resolveToastCloseLabel(this.status)}
         class="sonic-toast-close"
         @click=${() => this.hide()}
       >
@@ -314,9 +307,9 @@ export class SonicToastItem extends LitElement {
       >
         ${this.status &&
         html`<sonic-icon
-          name=${icon[this.status]}
+          name=${statusIcon[toStatus(this.status) ?? "default"]}
           class="sonic-toast-icon"
-          size="2xl"
+          size="xl"
           aria-hidden="true"
         ></sonic-icon>`}
 
@@ -329,8 +322,6 @@ export class SonicToastItem extends LitElement {
           ${this.useSlot ? nothing : renderToastContent(this.text)}
           <slot></slot>
         </div>
-
-        ${!this.preserve ? this.autoHide() : ""}
       </div>
     </div>`;
   }
@@ -339,6 +330,13 @@ export class SonicToastItem extends LitElement {
     if (_changedProperties.has("styleSheet")) {
       this.syncAdoptedStyleSheets();
     }
+    if (
+      _changedProperties.has("preserve") ||
+      _changedProperties.has("visible") ||
+      _changedProperties.has("_dismissed")
+    ) {
+      this._syncHideTimer();
+    }
   }
 
   syncAdoptedStyleSheets() {
@@ -357,30 +355,80 @@ export class SonicToastItem extends LitElement {
   }
 
   hide() {
+    this._clearHideTimer();
+    this._hidden = true;
     if (!HTML.getClosestElement(this, "sonic-toast")) {
       this.visible = false;
     }
 
     if (this.dismissForever) {
-      // set in local Storage an Object with the id as key and if it's dismissed as value
-      const dismissed = localStorage.getItem("sonic-toast-dismissed") || "{}";
-      const dismissedObj = JSON.parse(dismissed);
-      dismissedObj[this.id] = true;
-      localStorage.setItem(
-        "sonic-toast-dismissed",
-        JSON.stringify(dismissedObj),
-      );
+      markToastDismissed(this.id);
     }
     this.dispatchEvent(new CustomEvent("hide", { bubbles: true }));
   }
 
   show() {
+    this._hidden = false;
+    this._hideRemaining = AUTO_HIDE_DELAY;
     this.visible = true;
+    this._syncHideTimer();
   }
 
-  autoHide() {
-    setTimeout(() => {
+  private _syncHideTimer() {
+    const shouldRun =
+      !this.preserve &&
+      this.visible &&
+      !this._hidden &&
+      !this._dismissed &&
+      !this._hovered &&
+      !this._focused;
+
+    if (!shouldRun) {
+      this._pauseHideTimer();
+      return;
+    }
+    if (this._hideTimer) return;
+
+    this._hideStartedAt = Date.now();
+    this._hideTimer = setTimeout(() => {
+      this._hideTimer = undefined;
       this.hide();
-    }, 6000);
+    }, this._hideRemaining);
   }
+
+  private _pauseHideTimer() {
+    if (!this._hideTimer) return;
+    clearTimeout(this._hideTimer);
+    this._hideTimer = undefined;
+    this._hideRemaining = Math.max(
+      0,
+      this._hideRemaining - (Date.now() - this._hideStartedAt),
+    );
+  }
+
+  private _clearHideTimer() {
+    clearTimeout(this._hideTimer);
+    this._hideTimer = undefined;
+  }
+
+  private _onMouseEnter = () => {
+    this._hovered = true;
+    this._syncHideTimer();
+  };
+
+  private _onMouseLeave = () => {
+    this._hovered = false;
+    this._syncHideTimer();
+  };
+
+  private _onFocusIn = () => {
+    this._focused = true;
+    this._syncHideTimer();
+  };
+
+  private _onFocusOut = (e: FocusEvent) => {
+    if (this.contains(e.relatedTarget as Node | null)) return;
+    this._focused = false;
+    this._syncHideTimer();
+  };
 }

package/src/core/components/ui/toast/toast.ts

@@ -8,6 +8,7 @@ import { ifDefined } from "lit/directives/if-defined.js";
 import { styleMap, StyleInfo } from "lit/directives/style-map.js";
 import "@supersoniks/concorde/core/components/ui/toast/toast-item";
 import { renderToastContent } from "@supersoniks/concorde/core/components/ui/toast/render-content";
+import { isToastDismissed } from "@supersoniks/concorde/core/components/ui/toast/dismissed";
 import {
   Toast,
   ToastContent,
@@ -66,7 +67,7 @@ export class SonicToast extends LitElement {
         bottom: "1.25rem",
         right: "1.25rem",
         zIndex: "10000",
-        maxWidth: "64ch",
+        maxWidth: "45ch",
         flexDirection: "column-reverse",
       };
     }
@@ -215,12 +216,8 @@ export class SonicToast extends LitElement {
     };
 
     // check if the toast is dismissed
-    if (conf.dismissForever && conf.id) {
-      const dismissed = localStorage.getItem("sonic-toast-dismissed") || "{}";
-      const dismissedObj = JSON.parse(dismissed);
-      if (dismissedObj[conf.id]) {
-        return null;
-      }
+    if (conf.dismissForever && conf.id && isToastDismissed(conf.id)) {
+      return null;
     }
 
     if (toastComponent?.toasts.length) {