@skf-design-system/ui-components 1.0.2-beta.12 → 1.0.2-beta.13

package/dist/components/popover/popover.component.d.ts

@@ -31,9 +31,5 @@ export declare class SkfPopover extends SkfPopoverBase {
     /** @internal */
     hideArrowChanged(): void;
     /** @internal */
-    openExtended(): void;
-    /** @internal */
     addEventListeners($element: HTMLElement | Element): void;
-    /** @internal */
-    _checkClickOutside: (e: Event) => void;
 }

package/dist/components/popover/popover.component.js

@@ -1,43 +1,35 @@
 import { SkfPopoverBase as h } from "../../internal/base-classes/popover/popover.base.js";
-import { watch as l } from "../../internal/helpers/watch.js";
-import { property as c } from "lit/decorators.js";
+import { watch as d } from "../../internal/helpers/watch.js";
+import { property as f } from "lit/decorators.js";
 import { styles as w } from "./popover.styles.js";
-var f = Object.defineProperty, v = Object.getOwnPropertyDescriptor, n = (d, t, i, s) => {
-  for (var e = s > 1 ? void 0 : s ? v(t, i) : t, o = d.length - 1, p; o >= 0; o--)
-    (p = d[o]) && (e = (s ? p(t, i, e) : p(e)) || e);
-  return s && e && f(t, i, e), e;
+var c = Object.defineProperty, m = Object.getOwnPropertyDescriptor, a = (l, r, o, s) => {
+  for (var t = s > 1 ? void 0 : s ? m(r, o) : r, i = l.length - 1, p; i >= 0; i--)
+    (p = l[i]) && (t = (s ? p(r, o, t) : p(t)) || t);
+  return s && t && c(r, o, t), t;
 };
-const a = class a extends h {
+const n = class n extends h {
   constructor() {
-    super(), this.offset = 8, this.hideArrow = !1, this._checkClickOutside = (t) => {
-      this.isOpen && !this.contains(t.target) && this.close();
-    }, this.arrow = !this.hideArrow, this.placement = "bottom-start", this.triggerEvent = "click", this.variant = "popup", h.classMap = { popover: !0 };
+    super(), this.offset = 8, this.hideArrow = !1, this.arrow = !this.hideArrow, this.placement = "bottom-start", this.triggerEvent = "click", this.variant = "popup", h.classMap = { popover: !0 };
   }
   hideArrowChanged() {
     this.arrow = !this.hideArrow;
   }
   /** @internal */
-  openExtended() {
-    window.top && window.self !== window.top && window.top.addEventListener("click", this._checkClickOutside, {
-      signal: this.signal
-    });
-  }
-  /** @internal */
-  addEventListeners(t) {
-    t.addEventListener(this.triggerEvent, this.open, { signal: this.signal });
+  addEventListeners(r) {
+    r.addEventListener(this.triggerEvent, this.open, { signal: this.signal });
   }
 };
-a.styles = [h.styles, w];
-let r = a;
-n([
-  c({ type: Number })
-], r.prototype, "offset", 2);
-n([
-  c({ type: Boolean })
-], r.prototype, "hideArrow", 2);
-n([
-  l("hideArrow")
-], r.prototype, "hideArrowChanged", 1);
+n.styles = [h.styles, w];
+let e = n;
+a([
+  f({ type: Number })
+], e.prototype, "offset", 2);
+a([
+  f({ type: Boolean })
+], e.prototype, "hideArrow", 2);
+a([
+  d("hideArrow")
+], e.prototype, "hideArrowChanged", 1);
 export {
-  r as SkfPopover
+  e as SkfPopover
 };

package/dist/components/tooltip/tooltip.component.d.ts

@@ -23,9 +23,5 @@ export declare class SkfTooltip extends SkfPopoverBase {
     constructor();
     connectedCallback(): void;
     /** @internal */
-    openExtended(): void;
-    /** @internal */
-    closeExtended(): void;
-    /** @internal */
     addEventListeners($element: HTMLElement | Element): void;
 }

package/dist/components/tooltip/tooltip.component.js

@@ -8,16 +8,20 @@ const e = class e extends t {
     super.connectedCallback(), this.role = "tooltip";
   }
   /** @internal */
-  openExtended() {
-    this.$anchor?.setAttribute("aria-describedby", this.id);
-  }
-  /** @internal */
-  closeExtended() {
-    this.$anchor?.removeAttribute("aria-describedby");
-  }
-  /** @internal */
   addEventListeners(s) {
-    s.addEventListener("blur", this.close, { signal: this.signal }), s.addEventListener("focus", this.open, { signal: this.signal }), s.addEventListener("mouseenter", this.open, { signal: this.signal }), s.addEventListener("mouseleave", this.close, { signal: this.signal });
+    s.addEventListener(
+      "blur",
+      () => {
+        this.close("blur");
+      },
+      { signal: this.signal }
+    ), s.addEventListener("focus", this.open, { signal: this.signal }), s.addEventListener("mouseenter", this.open, { signal: this.signal }), s.addEventListener(
+      "mouseleave",
+      () => {
+        this.close("mouseleave");
+      },
+      { signal: this.signal }
+    );
   }
 };
 e.styles = [t.styles, a];

package/dist/internal/base-classes/popover/popover.base.d.ts

@@ -15,6 +15,7 @@ import { type CSSResultGroup } from 'lit';
 export declare class SkfPopoverBase extends SkfElement {
     static styles: CSSResultGroup;
     static classMap: {};
+    _skipClosingThisTick: boolean;
     /** @internal - The popover element, aka `this` */
     $popover: this;
     /** Where the popover is positioned relative to the anchor element if it fits */
@@ -35,6 +36,10 @@ export declare class SkfPopoverBase extends SkfElement {
     triggerEvent: 'mouseenter' | 'click';
     /** @internal - Reference to the arrow element */
     $arrow: HTMLElement;
+    /**
+     * Used to store the outside click listener reference for cleanup and to avoid duplicates
+     */
+    _skfPopoverOutsideClickListener?: (e: MouseEvent) => void;
     protected abortEventsController: AbortController;
     protected signal: AbortSignal;
     protected popoverController: PopoverController;
@@ -48,11 +53,7 @@ export declare class SkfPopoverBase extends SkfElement {
     reposition: () => Promise<void>;
     handleEscapeKey: (e: KeyboardEvent) => void;
     open: (e: Event) => void;
-    /** @internal add additional open tasks here in UI component */
-    openExtended(): void;
-    close: () => void;
-    /** @internal add additional close tasks here in UI component */
-    closeExtended(): void;
+    close: (reason?: string) => void;
     /** @internal eventlisteners here should implement abort signal */
     addEventListeners($element: HTMLElement | Element): void;
     /** @internal */

package/dist/internal/base-classes/popover/popover.base.js

@@ -1,25 +1,25 @@
-import { flip as w, offset as $, arrow as E, computePosition as O } from "@floating-ui/dom";
+import { flip as y, offset as $, arrow as E, computePosition as O } from "@floating-ui/dom";
 import { SkfElement as C } from "../../components/skf-element.js";
-import { PopoverController as x } from "../../controllers/popover.controller.js";
-import { uuid as A } from "../../helpers/uuid.js";
+import { PopoverController as T } from "../../controllers/popover.controller.js";
+import { uuid as k } from "../../helpers/uuid.js";
 import { watch as f } from "../../helpers/watch.js";
-import { componentStyles as S } from "../../../styles/component.styles.js";
-import { nothing as P, html as g } from "lit";
-import { property as u, state as c, query as _ } from "lit/decorators.js";
-import { classMap as L } from "lit/directives/class-map.js";
-import { styles as F } from "./popover.styles.js";
-var k = Object.defineProperty, T = Object.getOwnPropertyDescriptor, r = (m, t, o, i) => {
-  for (var e = i > 1 ? void 0 : i ? T(t, o) : t, n = m.length - 1, a; n >= 0; n--)
-    (a = m[n]) && (e = (i ? a(t, o, e) : a(e)) || e);
-  return i && e && k(t, o, e), e;
-}, p;
-const s = (p = class extends C {
+import { componentStyles as P } from "../../../styles/component.styles.js";
+import { nothing as _, html as m } from "lit";
+import { property as u, state as c, query as A } from "lit/decorators.js";
+import { classMap as S } from "lit/directives/class-map.js";
+import { styles as L } from "./popover.styles.js";
+var x = Object.defineProperty, F = Object.getOwnPropertyDescriptor, r = (g, t, s, o) => {
+  for (var e = o > 1 ? void 0 : o ? F(t, s) : t, n = g.length - 1, a; n >= 0; n--)
+    (a = g[n]) && (e = (o ? a(t, s, e) : a(e)) || e);
+  return o && e && x(t, s, e), e;
+}, h;
+const i = (h = class extends C {
   constructor() {
-    super(...arguments), this.$popover = this, this.placement = "top", this.variant = "popup", this.isOpen = !1, this.offset = 0, this.arrow = !1, this.triggerEvent = "mouseenter", this.abortEventsController = new AbortController(), this.signal = this.abortEventsController.signal, this.popoverController = new x(this), this._toggleOpen = (t) => {
+    super(...arguments), this._skipClosingThisTick = !1, this.$popover = this, this.placement = "top", this.variant = "popup", this.isOpen = !1, this.offset = 0, this.arrow = !1, this.triggerEvent = "mouseenter", this.abortEventsController = new AbortController(), this.signal = this.abortEventsController.signal, this.popoverController = new T(this), this._toggleOpen = (t) => {
       this.isOpen = t ?? !this.isOpen;
     }, this._handleToggle = (t) => {
-      const o = t.newState === "open";
-      this.isOpen = o, this.emit(o ? "skf-opened" : "skf-closed");
+      const s = t.newState === "open";
+      this.isOpen = s, this.emit(s ? "skf-opened" : "skf-closed");
     }, this.handleToggleOpen = async () => {
       this.$anchor && (this.isOpen ? (this.$popover.togglePopover(!0), this.$popover.animate([{ opacity: 0 }, { opacity: 1 }], { duration: 250, fill: "forwards" })) : (await this.$popover.animate([{ opacity: 0 }], { duration: 150, fill: "forwards" }).finished, this.$popover && this.$popover.togglePopover(this.isOpen)));
     }, this.handleAnchorChange = async () => {
@@ -29,18 +29,18 @@ const s = (p = class extends C {
       this.$anchor = t.getElementById(this.anchor), this.$anchor && (this.addEventListeners(this.$anchor), this.popoverController.start());
     }, this.reposition = async () => {
       if (!this.$anchor) return;
-      const t = [w(), $(this.offset)];
+      const t = [y(), $(this.offset)];
       this.arrow && t.push(E({ element: this.$arrow }));
-      const { x: o, y: i, middlewareData: e } = await O(this.$anchor, this.$popover, {
+      const { x: s, y: o, middlewareData: e } = await O(this.$anchor, this.$popover, {
         placement: this.placement,
         middleware: t,
         strategy: "fixed"
       });
       if (Object.assign(this.$popover.style, {
-        left: `${String(o)}px`,
-        top: `${String(i)}px`
+        left: `${String(s)}px`,
+        top: `${String(o)}px`
       }), this.arrow) {
-        const n = this.placement.split("-")[0], a = { top: "bottom", right: "left", bottom: "top", left: "right" }[n] ?? "", h = e.flip?.index, d = e.arrow?.x, l = e.arrow?.y, v = typeof d == "number" ? `${String(d)}px` : "", b = typeof l == "number" ? `${String(l)}px` : "", y = {
+        const n = this.placement.split("-")[0], a = { top: "bottom", right: "left", bottom: "top", left: "right" }[n] ?? "", p = e.flip?.index, d = e.arrow?.x, l = e.arrow?.y, v = typeof d == "number" ? `${String(d)}px` : "", b = typeof l == "number" ? `${String(l)}px` : "", w = {
           bottom: 45,
           right: 135,
           top: 225,
@@ -49,16 +49,18 @@ const s = (p = class extends C {
         Object.assign(this.$arrow.style, {
           top: b,
           [this.placement.includes("left") ? "right" : "left"]: v,
-          [h ? n : a]: "calc(var(--_skf-popover-arrow-size) * -1)",
-          rotate: `${(y[a] + (h ? 180 : 0)).toString()}deg`
+          [p ? n : a]: "calc(var(--_skf-popover-arrow-size) * -1)",
+          rotate: `${(w[a] + (p ? 180 : 0)).toString()}deg`
         });
       }
     }, this.handleEscapeKey = (t) => {
       t.key === "Escape" && this.close();
     }, this.open = (t) => {
-      t.stopPropagation(), this._toggleOpen(!0), this.abortEventsController = new AbortController(), this.signal = this.abortEventsController.signal, document.addEventListener("keydown", this.handleEscapeKey, { signal: this.signal }), this.openExtended();
-    }, this.close = () => {
-      this.closeExtended(), this._toggleOpen(!1), this.abortEventsController.abort();
+      t.stopPropagation();
+      const o = this.tagName === "SKF-MENU" ? void 0 : !0;
+      this._toggleOpen(o), this.abortEventsController = new AbortController(), this.signal = this.abortEventsController.signal, document.addEventListener("keydown", this.handleEscapeKey, { signal: this.signal }), this.tagName === "SKF-TOOLTIP" && this.$anchor?.setAttribute("aria-describedby", this.id);
+    }, this.close = (t = "") => {
+      console.log("Popover closing", t), this._toggleOpen(!1), this.abortEventsController.abort(), this.tagName === "SKF-TOOLTIP" && this.$anchor?.removeAttribute("aria-describedby");
     };
   }
   connectedCallback() {
@@ -75,24 +77,28 @@ const s = (p = class extends C {
     this.$anchor.addEventListener(
       "focusout",
       (o) => {
-        const i = this.contains(o.relatedTarget);
-        t && i || this.close();
+        const e = this.contains(o.relatedTarget);
+        t && e || this._skipClosingThisTick || this.close("anchor focus out");
       },
       { signal: this.signal }
     ), this.addEventListener(
       "focusout",
       (o) => {
-        const i = this.contains(o.relatedTarget);
-        t && i || this.close();
+        const e = this.contains(o.relatedTarget);
+        t && e || this.close("popover focusout");
       },
       { signal: this.signal }
-    ), this.$popover.id = await A(this.$anchor.id), ["popup", "menu"].includes(this.variant) && (this.$anchor.setAttribute("aria-haspopup", "true"), this.setAttribute("aria-labelledby", this.$anchor.id)), ["menu"].includes(this.variant) && this.$anchor.setAttribute("aria-controls", this.$popover.id), ["popup"].includes(this.variant) && t && (this.role = "dialog"), ["tooltip"].includes(this.variant) && this.$anchor.addEventListener("focusin", this.open, { signal: this.signal });
-  }
-  /** @internal add additional open tasks here in UI component */
-  openExtended() {
-  }
-  /** @internal add additional close tasks here in UI component */
-  closeExtended() {
+    ), this._skfPopoverOutsideClickListener ??= (o) => {
+      this.isOpen && this.$anchor && !this.contains(o.target) && !this.$anchor.contains(o.target) ? this.close("outside click") : (this._skipClosingThisTick = !0, setTimeout(() => {
+        this._skipClosingThisTick = !1;
+      }, 0));
+    }, document.addEventListener("mousedown", this._skfPopoverOutsideClickListener, {
+      signal: this.signal
+    });
+    const s = window.top && window.self !== window.top;
+    console.log("contains frames", s), s && window.top && !this._skipClosingThisTick && window.top.addEventListener("mousedown", this._skfPopoverOutsideClickListener, {
+      signal: this.signal
+    }), this.$popover.id = await k(this.$anchor.id), ["popup", "menu"].includes(this.variant) && (this.$anchor.setAttribute("aria-haspopup", "true"), this.setAttribute("aria-labelledby", this.$anchor.id)), ["menu"].includes(this.variant) && this.$anchor.setAttribute("aria-controls", this.$popover.id), ["popup"].includes(this.variant) && t && (this.role = "dialog"), ["tooltip"].includes(this.variant) && this.$anchor.addEventListener("focusin", this.open, { signal: this.signal });
   }
   /** @internal eventlisteners here should implement abort signal */
   addEventListeners(t) {
@@ -103,10 +109,10 @@ const s = (p = class extends C {
     this.abortEventsController.abort();
   }
   render() {
-    return ["popup", "menu"].includes(this.variant) && this.$anchor?.setAttribute("aria-expanded", this.isOpen ? "true" : "false"), g`
-			<div class=${L({ popover: !0, ...p.classMap })} id="root">
+    return ["popup", "menu"].includes(this.variant) && this.$anchor?.setAttribute("aria-expanded", this.isOpen ? "true" : "false"), m`
+			<div class=${S({ popover: !0, ...h.classMap })} id="root">
 				<slot></slot>
-				${this.arrow ? g`<div id="arrow"></div>` : P}
+				${this.arrow ? m`<div id="arrow"></div>` : _}
 			</div>
 		`;
   }
@@ -121,54 +127,54 @@ const s = (p = class extends C {
       '[tabindex]:not([tabindex="-1"])'
     ]).length > 0;
     function e(n, a) {
-      const h = Array.from(
+      const p = Array.from(
         n.querySelectorAll(a.join(", "))
       ), d = Array.from(n.querySelectorAll("*")).map((l) => l.shadowRoot).filter((l) => l !== null);
       for (const l of d)
-        h.push(
+        p.push(
           ...e(l, a)
         );
-      return h;
+      return p;
     }
   }
-}, p.styles = [S, F], p.classMap = {}, p);
+}, h.styles = [P, L], h.classMap = {}, h);
 r([
   u()
-], s.prototype, "placement", 2);
+], i.prototype, "placement", 2);
 r([
   u()
-], s.prototype, "variant", 2);
+], i.prototype, "variant", 2);
 r([
   u()
-], s.prototype, "anchor", 2);
+], i.prototype, "anchor", 2);
 r([
   c()
-], s.prototype, "isOpen", 2);
+], i.prototype, "isOpen", 2);
 r([
   c()
-], s.prototype, "offset", 2);
+], i.prototype, "offset", 2);
 r([
   c()
-], s.prototype, "$anchor", 2);
+], i.prototype, "$anchor", 2);
 r([
   c()
-], s.prototype, "arrow", 2);
+], i.prototype, "arrow", 2);
 r([
   c()
-], s.prototype, "triggerEvent", 2);
+], i.prototype, "triggerEvent", 2);
 r([
-  _("#arrow")
-], s.prototype, "$arrow", 2);
+  A("#arrow")
+], i.prototype, "$arrow", 2);
 r([
   f("isOpen", { afterUpdate: !0 })
-], s.prototype, "handleToggleOpen", 2);
+], i.prototype, "handleToggleOpen", 2);
 r([
   f("$anchor")
-], s.prototype, "handleAnchorEl", 1);
+], i.prototype, "handleAnchorEl", 1);
 r([
   f("anchor")
-], s.prototype, "handleAnchorChange", 2);
-let U = s;
+], i.prototype, "handleAnchorChange", 2);
+let z = i;
 export {
-  U as SkfPopoverBase
+  z as SkfPopoverBase
 };

package/package.json

@@ -35,7 +35,7 @@
   "sideEffects": true,
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "1.0.2-beta.12",
+  "version": "1.0.2-beta.13",
   "dependencies": {
     "@floating-ui/dom": "^1.7.1",
     "@js-temporal/polyfill": "^0.5.1",