@supersoniks/concorde 4.9.98-visual-stack.1 → 4.9.98-visual-stack.3

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

@@ -58,13 +58,13 @@ export class Modal extends Subscriber(LitElement) {
         --sc-modal-py: 2.5rem;
         --sc-modal-px: 1.5rem;
 
-        --sc_backdrop-bg: var(
-          --sc_overlay-bg,
+        --sc-_backdrop-bg: var(
+          --sc-_overlay-bg,
           var(--sc-base-200, rgba(0, 0, 0, 0.12))
         );
-        --sc_backdrop-opacity: 0;
-        --sc_rounded: var(--sc-rounded-lg);
-        --sc_z-index: 990;
+        --sc-_backdrop-opacity: 0;
+        --sc-_rounded: var(--sc-rounded-lg);
+        --sc-_z-index: 990;
       }
 
       * {
@@ -76,7 +76,7 @@ export class Modal extends Subscriber(LitElement) {
         color: var(--sc-base-content, #000);
         width: 100%;
         box-shadow: var(--sc-shadow-lg);
-        border-radius: var(--sc_rounded) var(--sc_rounded);
+        border-radius: var(--sc-_rounded) var(--sc-_rounded);
         transform: translateZ(0);
         border: none;
         outline: none;
@@ -87,16 +87,16 @@ export class Modal extends Subscriber(LitElement) {
         opacity: 0;
         position: fixed;
         inset: 0;
-        z-index: var(--sc_z-index);
+        z-index: var(--sc-_z-index);
       }
 
       #backdrop {
-        opacity: var(--sc_backdrop-opacity, 0);
-        background: var(--sc_backdrop-bg);
+        opacity: var(--sc-_backdrop-opacity, 0);
+        background: var(--sc-_backdrop-bg);
         transition: opacity 0.15s linear;
         inset: 0;
         position: fixed;
-        z-index: var(--sc_z-index);
+        z-index: var(--sc-_z-index);
       }
 
       #modal-content {
@@ -112,12 +112,12 @@ export class Modal extends Subscriber(LitElement) {
           max-width: none !important;
           margin: auto 0 0 !important;
           width: 100% !important;
-          border-radius: var(--sc_rounded) var(--sc_rounded) 0 0 !important;
+          border-radius: var(--sc-_rounded) var(--sc-_rounded) 0 0 !important;
         }
       }
 
       :host([fullScreen]) {
-        --sc_rounded: 0;
+        --sc-_rounded: 0;
       }
       :host([fullScreen]) #modal {
         width: 100% !important;
@@ -161,11 +161,11 @@ export class Modal extends Subscriber(LitElement) {
       /* Close button */
       ::slotted(sonic-modal-close),
       sonic-modal-close {
-        --sc_top: 0.25rem;
-        --sc_x: 0.25rem;
+        --sc-_top: 0.25rem;
+        --sc-_x: 0.25rem;
         position: sticky;
         display: block;
-        top: var(--sc_top);
+        top: var(--sc-_top);
         margin-left: auto;
         margin-bottom: -1rem;
         margin-top: calc(-1 * var(--sc-modal-py) - 0.25rem);
@@ -312,7 +312,7 @@ export class Modal extends Subscriber(LitElement) {
     }
 
     if (_changedProperties.has("zIndex")) {
-      this.style.setProperty("--sc_z-index", this.zIndex || "990");
+      this.style.setProperty("--sc-_z-index", this.zIndex || "990");
     }
 
     if (_changedProperties.has("paddingX")) {
@@ -530,10 +530,10 @@ export class Modal extends Subscriber(LitElement) {
       // Backdrop
       if (!this.fullScreen) {
         if (isEntering) {
-          this.style.setProperty("--sc_backdrop-opacity", "0.8");
+          this.style.setProperty("--sc-_backdrop-opacity", "0.8");
         } else {
           setTimeout(() => {
-            this.style.setProperty("--sc_backdrop-opacity", "0");
+            this.style.setProperty("--sc-_backdrop-opacity", "0");
           }, 150);
         }
       }

package/src/core/components/ui/pop/pop.md

@@ -30,7 +30,43 @@
   </template>
 </sonic-code>
 
+Default placement is `bottom`. Placement is written `side-align`, like `sonic-tooltip`: `side` is `top`, `right`, `bottom` or `left`, `align` is `start`, `center` or `end`. Without `align`, content is aligned on the start of the trigger. If there is not enough room, content flips to the opposite side and stays inside the viewport.
+
+The former space syntax (`placement="bottom center"`) still works but is deprecated.
+
+<sonic-code>
+  <template>
+    <sonic-pop class="inline-block" placement="bottom-center">
+      <sonic-button>Bottom center</sonic-button>
+      <sonic-menu slot="content">
+        <sonic-menu-item><sonic-icon library="iconoir" name="bell-notification" slot="prefix"></sonic-icon>Notifications</sonic-menu-item>
+      </sonic-menu>
+    </sonic-pop>
+    <sonic-pop class="inline-block" placement="top-center">
+      <sonic-button>Top center</sonic-button>
+      <sonic-menu slot="content">
+        <sonic-menu-item><sonic-icon library="iconoir" name="bell-notification" slot="prefix"></sonic-icon>Notifications</sonic-menu-item>
+      </sonic-menu>
+    </sonic-pop>
+    <sonic-pop class="inline-block" placement="left-center">
+      <sonic-button>Left center</sonic-button>
+      <sonic-menu slot="content">
+        <sonic-menu-item><sonic-icon library="iconoir" name="bell-notification" slot="prefix"></sonic-icon>Notifications</sonic-menu-item>
+      </sonic-menu>
+    </sonic-pop>
+    <sonic-pop class="inline-block" placement="right-center">
+      <sonic-button>Right center</sonic-button>
+      <sonic-menu slot="content">
+        <sonic-menu-item><sonic-icon library="iconoir" name="bell-notification" slot="prefix"></sonic-icon>Notifications</sonic-menu-item>
+      </sonic-menu>
+    </sonic-pop>
+  </template>
+</sonic-code>
+
 ## Shadow
+
+Default shadow is `lg`.
+
 <sonic-code>
   <template>
     <sonic-pop class="inline-block" shadow="none" placement='top' >
@@ -60,6 +96,26 @@
   </template>
 </sonic-code>
 
+## Inline
+
+By default, pop is vertically aligned to the middle. Use `inline` to align it on the text baseline, e.g. inside a sentence.
+
+<sonic-code>
+  <template>
+    <p>
+      The Concorde flew from Paris to
+      <sonic-pop inline>
+        <sonic-button variant="link">New York</sonic-button>
+        <sonic-menu slot="content">
+          <sonic-menu-item>See flights</sonic-menu-item>
+          <sonic-menu-item>Book a seat</sonic-menu-item>
+        </sonic-menu>
+      </sonic-pop>
+      in about 3.5 hours.
+    </p>
+  </template>
+</sonic-code>
+
 ## noToggle
 <sonic-code>
   <template>
@@ -93,4 +149,52 @@
       Click to open pop
     </sonic-button>
   </template>
-</sonic-code>
+</sonic-code>
+
+## Keep open on select
+
+By default, a click inside the content closes the pop, as well as a click outside. Add `data-on-select="keep"` on the content, or on any of its elements, to keep the pop open when interacting with it.
+
+<sonic-code>
+  <template>
+    <sonic-pop class="inline-block">
+      <sonic-button>Closes on select</sonic-button>
+      <div slot="content" class="grid gap-2 p-3">
+        <sonic-checkbox>Option A</sonic-checkbox>
+        <sonic-checkbox>Option B</sonic-checkbox>
+      </div>
+    </sonic-pop>
+    <sonic-pop class="inline-block">
+      <sonic-button>Stays open on select</sonic-button>
+      <div slot="content" class="grid gap-2 p-3" data-on-select="keep">
+        <sonic-checkbox>Option A</sonic-checkbox>
+        <sonic-checkbox>Option B</sonic-checkbox>
+      </div>
+    </sonic-pop>
+  </template>
+</sonic-code>
+
+## Keyboard
+
+- `ArrowDown` on the trigger opens the pop.
+- `Escape` closes the last opened pop and gives focus back to its trigger.
+
+## Methods and events
+
+`show()` and `hide()` open and close the pop programmatically (see `manual` above). The pop dispatches a `show` event when it opens and a `hide` event when it closes.
+
+```js
+const pop = document.querySelector("sonic-pop");
+pop.addEventListener("hide", () => console.log("pop closed"));
+pop.show();
+```
+
+## Styling
+
+The content can be styled from outside with `::part(content)`.
+
+```css
+sonic-pop::part(content) {
+  border-radius: 0;
+}
+```

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

@@ -1,27 +1,44 @@
 import { html, LitElement, css, PropertyValues } from "lit";
 import { customElement, query, state, property } from "lit/decorators.js";
+import { ifDefined } from "lit/directives/if-defined.js";
 
 import HTML, {
   SearchableDomElement,
 } from "@supersoniks/concorde/core/utils/HTML";
+import {
+  computeFloatingPosition,
+  FloatingPlacement,
+  FloatingSide,
+  getFloatingBounds,
+  parsePlacement,
+  startFrameLoop,
+  supportsPopover,
+} from "@supersoniks/concorde/core/utils/positioning";
 import { Shadow, shadowable } from "../_css/shadow";
-// Toast
-type PopPlacement =
-  | "bottom"
-  | "top"
-  | "right"
-  | "left"
-  | "top"
-  | "bottom center"
-  | "top center"
-  | "right center"
-  | "left center";
+
+/** @deprecated écriture avec espace, utiliser `"bottom-center"`. */
+type LegacyPopPlacement = `${FloatingSide} center`;
+type PopPlacement = FloatingPlacement | LegacyPopPlacement;
+
+let legacyPlacementWarned = false;
+
+function normalizePopPlacement(placement: PopPlacement): FloatingPlacement {
+  if (!placement.includes(" ")) return placement as FloatingPlacement;
+  if (!legacyPlacementWarned) {
+    legacyPlacementWarned = true;
+    console.warn(
+      `[concorde] sonic-pop placement="${placement}" est déprécié, utiliser placement="${placement.replace(" ", "-")}".`,
+    );
+  }
+  return placement.replace(" ", "-") as FloatingPlacement;
+}
 
 const tagName = "sonic-pop";
 
 @customElement(tagName)
 export class Pop extends LitElement {
   static pops = new Set<Pop>();
+  static readonly supportsPopover = supportsPopover;
   static styles = [
     css`
       :host {
@@ -44,7 +61,7 @@ export class Pop extends LitElement {
         border-radius: min(calc(var(--sc-btn-rounded) * 2), 0.4em);
       }
 
-      slot[name="content"].is-open:not(.is-empty) {
+      slot[name="content"].is-open {
         transform: translateY(0) scale(1);
         opacity: 1;
         pointer-events: auto;
@@ -52,6 +69,36 @@ export class Pop extends LitElement {
         transition-timing-function: cubic-bezier(0.25, 0.25, 0.42, 1.225);
       }
 
+      slot[name="content"][popover] {
+        inset: auto;
+        width: auto;
+        height: auto;
+        margin: 0;
+        padding: 0;
+        border: none;
+        overflow: visible;
+        color: inherit;
+        /* display / overlay en allow-discrete : reste dans le top layer pendant le fondu de fermeture */
+        transition-property: all, display, overlay;
+        transition-behavior: normal, allow-discrete, allow-discrete;
+      }
+
+      slot[name="content"][popover]:not(:popover-open) {
+        display: none;
+      }
+
+      slot[name="content"][popover].is-open {
+        transition-property: scale, opacity, display, overlay;
+        transition-behavior: normal, normal, allow-discrete, allow-discrete;
+      }
+
+      @starting-style {
+        slot[name="content"][popover].is-open:popover-open {
+          transform: translateY(1rem) scale(0.95);
+          opacity: 0;
+        }
+      }
+
       :host([inline]) {
         vertical-align: baseline;
       }
@@ -72,7 +119,6 @@ export class Pop extends LitElement {
   @property({ type: String, reflect: true }) shadow: Shadow = "lg";
 
   @property({ type: String }) placement: PopPlacement = "bottom";
-  positioningRuns = false;
   lastContentX = 0;
   lastContentY = 0;
   resizeObserver: ResizeObserver = new ResizeObserver(() =>
@@ -80,13 +126,9 @@ export class Pop extends LitElement {
   );
 
   @state() private triggerElement: HTMLElement | null = null;
-
-  runPositioningLoop() {
-    if (!this.positioningRuns) return;
-    this.positioningRuns = true;
-    this.computePosition(this.placement);
-    window.requestAnimationFrame(() => this.runPositioningLoop());
-  }
+  private stopPositioning?: () => void;
+  private hideDisplayTimeout?: ReturnType<typeof setTimeout>;
+  private pendingShow = false;
 
   toggle(e: Event) {
     if (this.open && this.noToggle) return;
@@ -99,40 +141,76 @@ export class Pop extends LitElement {
       this.triggerElement = e.target as HTMLElement;
     }
 
-    this.open = !this.open;
-    this.open ? this.show() : this.hide();
+    if (this.open) this.hide();
+    else this.show();
   }
 
   show() {
-    this.setMaxZindex();
+    if (!this.popContent) {
+      this.pendingShow = true;
+      this.updateComplete.then(() => {
+        if (this.pendingShow) this.show();
+      });
+      return;
+    }
+    this.pendingShow = false;
+    if (this.open) return;
+    if (!Pop.supportsPopover) this.setMaxZindex();
+    clearTimeout(this.hideDisplayTimeout);
     this.popContent?.style?.removeProperty("display");
+    if (Pop.supportsPopover && !this.popContent.matches(":popover-open")) {
+      this.popContent.showPopover();
+    }
     this.open = true;
+    // Pop.pops suit l'ordre d'ouverture : Escape ferme le dernier ouvert.
+    if (Pop.pops.delete(this)) Pop.pops.add(this);
     this.popContent.setAttribute("tabindex", "0");
-    if (this.popBtn && this.popContent && !this.positioningRuns) {
-      this.positioningRuns = true;
+    if (this.popBtn && this.popContent && !this.stopPositioning) {
       this.lastContentX = 0;
       this.lastContentY = 0;
-      this.runPositioningLoop();
+      this.stopPositioning = startFrameLoop(() =>
+        this.computePosition(this.placement),
+      );
     }
     this.dispatchEvent(new CustomEvent("show"));
   }
 
   hide() {
-    this.resetZindexes();
+    this.pendingShow = false;
+    if (!this.popContent) {
+      this.dispatchEvent(new CustomEvent("hide"));
+      return;
+    }
+    if (!Pop.supportsPopover) this.resetZindexes();
+    if (Pop.supportsPopover && this.popContent?.matches(":popover-open")) {
+      this.popContent.hidePopover();
+    }
     this.open = false;
     this.popContent.setAttribute("tabindex", "-1");
-    this.positioningRuns = false;
+    this.stopPositionLoop();
+    if (!Pop.supportsPopover) this.hideContentAfterTransition();
     if (this.triggerElement) {
       this.triggerElement.focus();
       this.triggerElement = null;
     }
-    Object.assign(this.popContent.style, {
-      left: `${this.lastContentX}px`,
-      top: `${this.lastContentY}px`,
-    });
     this.dispatchEvent(new CustomEvent("hide"));
   }
 
+  private stopPositionLoop() {
+    this.stopPositioning?.();
+    this.stopPositioning = undefined;
+  }
+
+  /** Sans display:none, le contenu masqué par opacité resterait atteignable au clavier. */
+  private hideContentAfterTransition() {
+    clearTimeout(this.hideDisplayTimeout);
+    const duration =
+      parseFloat(getComputedStyle(this.popContent).transitionDuration) * 1000;
+    this.hideDisplayTimeout = setTimeout(() => {
+      if (!this.open) this.popContent.style.display = "none";
+    }, duration || 0);
+  }
+
   /**
    * Remonte dans la structure html de parents en parents et si ils on une position relative ou absolute, on met leur z-index élévé
    */
@@ -174,6 +252,7 @@ export class Pop extends LitElement {
     const target = path[0] as HTMLElement;
 
     Pop.pops.forEach((pop: Pop) => {
+      if (!pop.open) return;
       const popContainsTarget = path.includes(pop);
       const popContentContainsTarget = path.includes(
         pop.querySelector('[slot="content"]') as EventTarget,
@@ -195,7 +274,8 @@ export class Pop extends LitElement {
     if (Pop.pops.size == 0) {
       document.addEventListener("pointerdown", this._handleClosePop);
       document.addEventListener("click", this._handleClosePop);
-      document.addEventListener("keydown", this._handleKeyDown);
+      // Capture : passer avant les écouteurs Escape des ancêtres (ex. sonic-modal).
+      document.addEventListener("keydown", Pop._handleKeyDown, true);
     }
     Pop.pops.add(this);
   }
@@ -212,133 +292,56 @@ export class Pop extends LitElement {
     if (this.popContent) {
       this.resizeObserver.unobserve(this.popContent);
     }
+    this.stopPositionLoop();
+    clearTimeout(this.hideDisplayTimeout);
+    if (this.open) {
+      if (!Pop.supportsPopover) this.resetZindexes();
+      this.open = false;
+      this.triggerElement = null;
+      this.popContent?.style.setProperty("display", "none");
+    }
     super.disconnectedCallback();
     Pop.pops.delete(this);
     if (Pop.pops.size == 0) {
       document.removeEventListener("pointerdown", this._handleClosePop);
       document.removeEventListener("click", this._handleClosePop);
-      document.removeEventListener("keydown", this._handleKeyDown);
+      document.removeEventListener("keydown", Pop._handleKeyDown, true);
     }
   }
 
   computePosition(placement: PopPlacement) {
-    const placementSplit = placement.split(" ");
-    const placementBase = placementSplit[0];
-    let placementSec = placementSplit[1];
-
-    const padding = 5;
-    const thisRect = this.getBoundingClientRect();
-
-    const scrollableAncestor = HTML.getScrollableAncestor(
-      this.popContent,
-    ) as HTMLElement;
-    const scrollableAncestorRect = scrollableAncestor?.getBoundingClientRect();
-    const minX = Math.max(0, scrollableAncestorRect?.left || 0) + padding;
-    const minY = Math.max(0, scrollableAncestorRect?.top || 0) + padding;
-    const maxX =
-      Math.min(
-        window.innerWidth,
-        scrollableAncestorRect?.right || window.innerWidth,
-      ) - padding;
-    const maxY =
-      Math.min(
-        window.innerHeight,
-        scrollableAncestorRect?.bottom || window.innerHeight,
-      ) - padding;
-    const x0 = thisRect.left;
-    const y0 = thisRect.top;
-    let x = x0,
-      y = y0;
-    let contentRect = this.popContent?.getBoundingClientRect();
-    const yTop = y0 - contentRect.height;
-    const xLeft = x0 - contentRect.width;
-    const xRight = x0 + thisRect.width;
-    const yBottom = y0 + thisRect.height;
-    const xCenter = x0 + (thisRect.width - contentRect.width) * 0.5;
-    const yCenter = y0 + (thisRect.height - contentRect.height) * 0.5;
-    switch (placementBase) {
-      case "bottom":
-        y = yBottom;
-        if (placementSec == "center") {
-          x = xCenter;
-        }
-        break;
-      case "top":
-        y = yTop;
-        if (placementSec == "center") {
-          x = xCenter;
-        }
-        break;
-      case "left":
-        x = xLeft;
-        if (placementSec == "center") {
-          y = yCenter;
-        }
-        break;
-      case "right":
-        x = xRight;
-        if (placementSec == "center") {
-          y = yCenter;
-        }
-        break;
-    }
-
-    this.lastContentX += x - contentRect.x;
-    this.lastContentY += y - contentRect.y;
-    Object.assign(this.popContent.style, {
-      left: `${this.lastContentX}px`,
-      top: `${this.lastContentY}px`,
+    const { side, align } = parsePlacement(
+      normalizePopPlacement(placement),
+      "bottom",
+      "start",
+    );
+    const contentRect = this.popContent.getBoundingClientRect();
+
+    const { x, y } = computeFloatingPosition({
+      anchor: this.getBoundingClientRect(),
+      floating: contentRect,
+      side,
+      align,
+      bounds: getFloatingBounds(this.popContent, 5),
     });
 
-    contentRect = this.popContent?.getBoundingClientRect();
-    if (contentRect.x < minX && placementBase == "left") x = xRight;
-    if (contentRect.y < minY && placementBase == "top") y = yBottom;
-    if (contentRect.x + contentRect.width > maxX && placementBase == "right")
-      x = xLeft;
-    if (contentRect.y + contentRect.height > maxY && placementBase == "bottom")
-      y = yTop;
-
+    // Déplacement relatif à la position mesurée : reste juste quand un ancêtre transformé
+    // (ex. modale en translateZ) devient le bloc conteneur du position: fixed.
     this.lastContentX += x - contentRect.x;
     this.lastContentY += y - contentRect.y;
-
-    Object.assign(this.popContent.style, {
-      left: `${this.lastContentX}px`,
-      top: `${this.lastContentY}px`,
-    });
-
-    contentRect = this.popContent?.getBoundingClientRect();
-
-    if (contentRect.x < minX) {
-      this.lastContentX += minX - contentRect.x;
-    }
-    if (contentRect.y < minY) {
-      this.lastContentY += minY - contentRect.y;
-    }
-
-    Object.assign(this.popContent.style, {
-      left: `${this.lastContentX}px`,
-      top: `${this.lastContentY}px`,
-    });
-    contentRect = this.popContent?.getBoundingClientRect();
-    if (contentRect.x + contentRect.width > maxX) {
-      this.lastContentX += maxX - (contentRect.x + contentRect.width);
-    }
-    if (contentRect.y + contentRect.height > maxY) {
-      this.lastContentY += maxY - (contentRect.y + contentRect.height);
-    }
-
     Object.assign(this.popContent.style, {
       left: `${this.lastContentX}px`,
       top: `${this.lastContentY}px`,
     });
   }
 
-  private _handleKeyDown = (e: KeyboardEvent) => {
-    if (e.key === "Escape" && this.open) {
-      e.stopPropagation();
-      this.hide();
-    }
-  };
+  private static _handleKeyDown(e: KeyboardEvent) {
+    if (e.key !== "Escape") return;
+    const lastOpened = [...Pop.pops].reverse().find((pop) => pop.open);
+    if (!lastOpened) return;
+    e.stopPropagation();
+    lastOpened.hide();
+  }
 
   render() {
     return html`
@@ -349,6 +352,7 @@ export class Pop extends LitElement {
       ></slot>
       <slot
         name="content"
+        popover=${ifDefined(Pop.supportsPopover ? "manual" : undefined)}
         tabindex="-1"
         part="content"
         style="display: none;"

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

@@ -11,6 +11,7 @@ import "@supersoniks/concorde/core/components/ui/table/table-tbody";
 import "@supersoniks/concorde/core/components/ui/table/table-tfoot";
 import "@supersoniks/concorde/core/components/ui/table/table-caption";
 import { fontSize } from "@supersoniks/concorde/core/components/ui/_css/size";
+import { Size } from "@supersoniks/concorde/core/components/ui/_css/size";
 
 const tagName = "sonic-table";
 @customElement(tagName)
@@ -66,14 +67,7 @@ export class Table extends LitElement {
     `,
   ];
 
-  @property({ type: String, reflect: true }) size?:
-    | "2xs"
-    | "xs"
-    | "sm"
-    | "md"
-    | "lg"
-    | "xl"
-    | "2xl";
+  @property({ type: String, reflect: true }) size?: Size;
   @property({ type: Boolean, reflect: true }) bordered?: boolean;
   @property({ type: Boolean, reflect: true }) rounded?: boolean;
   @property({ type: Boolean, reflect: true }) noCustomScroll?: boolean;

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

@@ -38,7 +38,7 @@ export class Theme extends LitElement {
         border-radius: min(calc(var(--sc-btn-rounded) * 2), 0.4em);
       }
 
-      ::slotted(.sonic-pop-content).is-open:not(.is-empty) {
+      ::slotted(.sonic-pop-content).is-open {
         transform: translateY(0) scale(1);
         opacity: 1;
         pointer-events: auto;

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

@@ -0,0 +1,14 @@
+import {
+  isDismissed,
+  markDismissed,
+} from "@supersoniks/concorde/core/utils/dismissed";
+
+const storageKey = "sonic-toast-dismissed";
+
+export function isToastDismissed(id: string | number): boolean {
+  return isDismissed(storageKey, id);
+}
+
+export function markToastDismissed(id: string | number): void {
+  markDismissed(storageKey, id);
+}