aptechka 0.32.5 → 0.33.1

package/lib/popover/PopoverButtonElement.d.ts

@@ -1,9 +1,11 @@
+import { CSSProperty } from '../css-property';
 import { PopoverElement } from './PopoverElement';
 
 export type PopoverButtonType = 'open' | 'close' | 'toggle';
 export declare class PopoverButtonElement extends HTMLElement {
     #private;
     constructor();
+    get type(): CSSProperty<PopoverButtonType>;
     get popoverElement(): PopoverElement | undefined;
     protected connectedCallback(): void;
     protected disconnectedCallback(): void;

package/lib/popover/PopoverElement.d.ts

@@ -1,4 +1,4 @@
-import { Attribute } from '../attribute';
+import { CSSProperty } from '../css-property';
 import { Store } from '../store/vanilla';
 
 export interface PopoverEvents {
@@ -14,9 +14,11 @@ export interface PopoverEvents {
 export declare class PopoverElement extends HTMLElement {
     #private;
     private static __opened;
-    get history(): Attribute<false>;
-    get restore(): Attribute<false>;
-    get dominance(): Attribute<number>;
+    get history(): CSSProperty<false>;
+    get restore(): CSSProperty<false>;
+    get dominance(): CSSProperty<0>;
+    get clickOutside(): CSSProperty<false>;
+    get escape(): CSSProperty<false>;
     get opened(): Store<boolean>;
     get lastTrigger(): any;
     open: (options?: {

package/lib/popover/index.cjs

@@ -1 +1 @@
-"use strict";var N=o=>{throw TypeError(o)};var H=(o,n,t)=>n.has(o)||N("Cannot "+t);var e=(o,n,t)=>(H(o,n,"read from private field"),t?t.call(o):n.get(o)),s=(o,n,t)=>n.has(o)?N("Cannot add the same private member more than once"):n instanceof WeakSet?n.add(o):n.set(o,t),i=(o,n,t,l)=>(H(o,n,"write to private field"),l?l.call(o,t):n.set(o,t),t),k=(o,n,t)=>(H(o,n,"access private method"),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const O=require("../attribute/index.cjs"),W=require("../Store-CDb6RMce.cjs"),M=require("../events-KVanG9sR.cjs"),F=require("../function-MthRj-GJ.cjs"),G=require("../style-At6aDoqG.cjs"),j=require("../window-resizer/vanilla/index.cjs"),J=require("../browser-CpzFX2xg.cjs");var y,a,_,d,u,v,g,m,p,D,E,z,b,$,f,T,S,w;const c=class c extends HTMLElement{constructor(){super(...arguments);s(this,p);s(this,y);s(this,a);s(this,_);s(this,d);s(this,u);s(this,v);s(this,g);s(this,m);s(this,E);s(this,b);s(this,f);s(this,T);s(this,S);s(this,w);i(this,y,-1),i(this,a,new W.Store(!1)),i(this,d,new O.Attribute(this,"history",!1)),i(this,u,new O.Attribute(this,"restore",!1)),i(this,v,new O.Attribute(this,"dominance",0)),i(this,g,!1),this.open=t=>{if(e(this,a).current)return;i(this,m,t==null?void 0:t.trigger),e(this,a).current=!0,e(this,v).current&&(c.__opened=c.__opened.filter(h=>this.dominance.current>=h.dominance.current?(h.close(),!1):!0)),c.__opened.push(this),i(this,y,c.__opened.length-1),e(this,d).current&&e(this,g)&&history.pushState("","",e(this,p,D)),clearTimeout(e(this,_)),this.classList.remove("closing"),this.classList.add("triggered"),this.style.display="block",M.dispatchEvent(this,"popoverTriggered",{custom:!0,detail:{trigger:e(this,m)}});const l=()=>{addEventListener("click",e(this,E)),addEventListener("keydown",e(this,b)),e(this,w).call(this),this.style.opacity="1",this.classList.add("opened"),M.dispatchEvent(this,"popoverOpened",{custom:!0,detail:{trigger:e(this,m)}})};t!=null&&t.skipTransition?l():setTimeout(l,10)},this.close=()=>{e(this,a).current&&(e(this,a).current=!1,c.__opened=c.__opened.filter(t=>t!==this),k(this,p,z).call(this),this.classList.remove("opened"),this.classList.add("closing"),this.style.opacity="0",M.dispatchEvent(this,"popoverClosing",{custom:!0}),removeEventListener("click",e(this,E)),removeEventListener("keydown",e(this,b)),setTimeout(()=>{this.classList.remove("triggered"),this.classList.remove("closing"),this.style.display="none",M.dispatchEvent(this,"popoverClosed",{custom:!0})},G.getElementTransitionDurationMS(this)+10))},i(this,E,t=>{k(this,p,$).call(this,()=>{var I;const l=t.composedPath();if(l.find(B=>B instanceof HTMLElement&&B.hasAttribute("data-popover-content")))return;const h=l[0],x=h instanceof HTMLElement&&(this.contains(h)||((I=this.shadowRoot)==null?void 0:I.contains(h))),L=h instanceof HTMLElement&&h.hasAttribute("data-outside");(!x||L)&&this.close()})}),i(this,b,t=>{k(this,p,$).call(this,()=>{t.code==="Escape"&&this.close()})}),i(this,f,()=>{i(this,g,!1),e(this,a).current&&e(this,d).current&&!location.search.includes(this.id)?this.close():!e(this,a).current&&e(this,d).current&&location.search.includes(this.id)&&this.open(),i(this,g,!0)}),i(this,T,()=>{this.style.removeProperty("--content-width"),this.style.removeProperty("--content-height"),e(this,S).call(this)}),i(this,S,F.debounce(()=>{e(this,w).call(this)},20)),i(this,w,()=>{this.style.setProperty("--content-width",this.scrollWidth+"px"),this.style.setProperty("--content-height",this.scrollHeight+"px")})}get history(){return e(this,d)}get restore(){return e(this,u)}get dominance(){return e(this,v)}get opened(){return e(this,a)}get lastTrigger(){return e(this,m)}connectedCallback(){e(this,d).observe(),e(this,u).observe(),e(this,v).observe(),this.style.opacity="0",this.style.display="none",this.setAttribute("popover-target",""),this.classList.remove("closing"),this.classList.remove("closed"),this.classList.remove("triggered"),this.classList.remove("opened"),addEventListener("popstate",e(this,f)),setTimeout(()=>{e(this,u).current?e(this,f).call(this):(k(this,p,z).call(this),i(this,g,!0))},0),j.windowResizer.subscribe(e(this,T))}disconnectedCallback(){j.windowResizer.unsubscribe(e(this,T)),e(this,d).unobserve(),e(this,u).unobserve(),e(this,v).unobserve(),this.style.opacity="",this.style.display="",this.removeAttribute("popover-target"),c.__opened=c.__opened.filter(t=>t!==this),clearTimeout(e(this,_)),removeEventListener("popstate",e(this,f)),this.style.removeProperty("--content-width"),this.style.removeProperty("--content-height")}};y=new WeakMap,a=new WeakMap,_=new WeakMap,d=new WeakMap,u=new WeakMap,v=new WeakMap,g=new WeakMap,m=new WeakMap,p=new WeakSet,D=function(){return`${location.pathname}${location.search?location.search+"&":"?"}${this.id}`},E=new WeakMap,z=function(){if(e(this,d).current){const t=new URL(location.href);t.searchParams.delete(this.id),history.replaceState(null,"",t.href)}},b=new WeakMap,$=function(t){(c.__opened[e(this,y)-1]||c.__opened.length===1)&&t()},f=new WeakMap,T=new WeakMap,S=new WeakMap,w=new WeakMap,c.__opened=[];let R=c;customElements.get("e-popover")||customElements.define("e-popover",R);var r,C,A,P,q;class U extends HTMLElement{constructor(){super();s(this,r);s(this,C,()=>{this.classList.add("triggered")});s(this,A,()=>{this.classList.add("opened")});s(this,P,()=>{this.classList.remove("opened")});s(this,q,()=>{this.classList.remove("triggered")});J.isBrowser&&(this.addEventListener("click",()=>{if(e(this,r)){const t=this.getAttribute("type")||"open";t==="open"||t==="toggle"&&!e(this,r).opened.current?e(this,r).open({trigger:this}):(t==="close"||t==="toggle"&&e(this,r).opened.current)&&e(this,r).close()}}),this.addEventListener("keydown",t=>{t.code==="Space"&&t.currentTarget.click()}))}get popoverElement(){return e(this,r)}connectedCallback(){var l;this.hasAttribute("tabindex")||(this.tabIndex=0);const t=this.getAttribute("target");if(t){let h=null;if(t==="parent"){const x=this.closest("[popover-target]");if(x)h=x;else{const L=this.getRootNode();L instanceof ShadowRoot?h=L.host.closest("[popover-target]"):L instanceof HTMLElement&&(h=L.closest("[popover-target]"))}}else t==="sibling"?h=(l=this.parentElement)==null?void 0:l.querySelector("[popover-target]"):h=document.querySelector(`#${t}`)||this.getRootNode().querySelector(`#${t}`);h instanceof HTMLElement?(i(this,r,h),e(this,r).addEventListener("popoverTriggered",e(this,C)),e(this,r).addEventListener("popoverOpened",e(this,A)),e(this,r).addEventListener("popoverClosing",e(this,P)),e(this,r).addEventListener("popoverClosed",e(this,q))):console.warn(this,`target ${t} not found`)}}disconnectedCallback(){e(this,r)&&(e(this,r).removeEventListener("popoverTriggered",e(this,C)),e(this,r).removeEventListener("popoverOpened",e(this,A)),e(this,r).removeEventListener("popoverClosing",e(this,P)),e(this,r).removeEventListener("popoverClosed",e(this,q)))}}r=new WeakMap,C=new WeakMap,A=new WeakMap,P=new WeakMap,q=new WeakMap;customElements.get("e-popover-button")||customElements.define("e-popover-button",U);exports.PopoverButtonElement=U;exports.PopoverElement=R;
+"use strict";var U=o=>{throw TypeError(o)};var I=(o,h,t)=>h.has(o)||U("Cannot "+t);var e=(o,h,t)=>(I(o,h,"read from private field"),t?t.call(o):h.get(o)),s=(o,h,t)=>h.has(o)?U("Cannot add the same private member more than once"):h instanceof WeakSet?h.add(o):h.set(o,t),r=(o,h,t,c)=>(I(o,h,"write to private field"),c?c.call(o,t):h.set(o,t),t),P=(o,h,t)=>(I(o,h,"access private method"),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const w=require("../css-property/index.cjs"),J=require("../Store-CDb6RMce.cjs"),z=require("../events-KVanG9sR.cjs"),K=require("../function-MthRj-GJ.cjs"),Q=require("../style-At6aDoqG.cjs"),W=require("../window-resizer/vanilla/index.cjs"),V=require("../browser-CpzFX2xg.cjs");var S,l,_,d,v,p,g,m,f,b,u,F,T,B,k,N,L,A,x,C;const a=class a extends HTMLElement{constructor(){super(...arguments);s(this,u);s(this,S);s(this,l);s(this,_);s(this,d);s(this,v);s(this,p);s(this,g);s(this,m);s(this,f);s(this,b);s(this,T);s(this,k);s(this,L);s(this,A);s(this,x);s(this,C);r(this,S,-1),r(this,l,new J.Store(!1)),r(this,d,new w.CSSProperty(this,"--history",!1)),r(this,v,new w.CSSProperty(this,"--restore",!1)),r(this,p,new w.CSSProperty(this,"--dominance",0)),r(this,g,new w.CSSProperty(this,"--click-outside",!1)),r(this,m,new w.CSSProperty(this,"--escape",!1)),r(this,f,!1),this.open=t=>{if(e(this,l).current)return;r(this,b,t==null?void 0:t.trigger),e(this,l).current=!0,e(this,p).current&&(a.__opened=a.__opened.filter(n=>this.dominance.current>=n.dominance.current?(n.close(),!1):!0)),a.__opened.push(this),r(this,S,a.__opened.length-1),e(this,d).current&&e(this,f)&&history.pushState("","",e(this,u,F)),clearTimeout(e(this,_)),this.classList.remove("closing"),this.classList.add("triggered"),this.style.display="block",z.dispatchEvent(this,"popoverTriggered",{custom:!0,detail:{trigger:e(this,b)}});const c=()=>{addEventListener("click",e(this,T)),addEventListener("keydown",e(this,k)),e(this,C).call(this),this.style.opacity="1",this.classList.add("opened"),z.dispatchEvent(this,"popoverOpened",{custom:!0,detail:{trigger:e(this,b)}})};t!=null&&t.skipTransition?c():setTimeout(c,10)},this.close=()=>{e(this,l).current&&(e(this,l).current=!1,a.__opened=a.__opened.filter(t=>t===this?!1:e(t,p).current<this.dominance.current?(t.close(),!1):!0),P(this,u,B).call(this),this.classList.remove("opened"),this.classList.add("closing"),this.style.opacity="0",z.dispatchEvent(this,"popoverClosing",{custom:!0}),removeEventListener("click",e(this,T)),removeEventListener("keydown",e(this,k)),setTimeout(()=>{this.classList.remove("triggered"),this.classList.remove("closing"),this.style.display="none",z.dispatchEvent(this,"popoverClosed",{custom:!0})},Q.getElementTransitionDurationMS(this)+10))},r(this,T,t=>{e(this,g).current&&P(this,u,N).call(this,()=>{var j;const c=t.composedPath();if(c.find(D=>D instanceof HTMLElement&&D.hasAttribute("data-popover-content")))return;const n=c[0],H=n instanceof HTMLElement&&(this.contains(n)||((j=this.shadowRoot)==null?void 0:j.contains(n))),E=n instanceof HTMLElement&&n.hasAttribute("data-outside");(!H||E)&&this.close()})}),r(this,k,t=>{e(this,m).current&&P(this,u,N).call(this,()=>{t.code==="Escape"&&this.close()})}),r(this,L,()=>{r(this,f,!1),e(this,l).current&&e(this,d).current&&!location.search.includes(this.id)?this.close():!e(this,l).current&&e(this,d).current&&location.search.includes(this.id)&&this.open(),r(this,f,!0)}),r(this,A,()=>{this.style.removeProperty("--content-width"),this.style.removeProperty("--content-height"),e(this,x).call(this)}),r(this,x,K.debounce(()=>{e(this,C).call(this)},20)),r(this,C,()=>{this.style.setProperty("--content-width",this.scrollWidth+"px"),this.style.setProperty("--content-height",this.scrollHeight+"px")})}get history(){return e(this,d)}get restore(){return e(this,v)}get dominance(){return e(this,p)}get clickOutside(){return e(this,g)}get escape(){return e(this,m)}get opened(){return e(this,l)}get lastTrigger(){return e(this,b)}connectedCallback(){e(this,d).observe(),e(this,v).observe(),e(this,p).observe(),e(this,g).observe(),e(this,m).observe(),this.style.opacity="0",this.style.display="none",this.setAttribute("popover-target",""),this.classList.remove("closing"),this.classList.remove("closed"),this.classList.remove("triggered"),this.classList.remove("opened"),addEventListener("popstate",e(this,L)),setTimeout(()=>{e(this,v).current?e(this,L).call(this):(P(this,u,B).call(this),r(this,f,!0))},0),W.windowResizer.subscribe(e(this,A))}disconnectedCallback(){W.windowResizer.unsubscribe(e(this,A)),e(this,d).unobserve(),e(this,v).unobserve(),e(this,p).unobserve(),e(this,g).unobserve(),e(this,m).unobserve(),this.style.opacity="",this.style.display="",this.removeAttribute("popover-target"),a.__opened=a.__opened.filter(t=>t!==this),clearTimeout(e(this,_)),removeEventListener("popstate",e(this,L)),this.style.removeProperty("--content-width"),this.style.removeProperty("--content-height")}};S=new WeakMap,l=new WeakMap,_=new WeakMap,d=new WeakMap,v=new WeakMap,p=new WeakMap,g=new WeakMap,m=new WeakMap,f=new WeakMap,b=new WeakMap,u=new WeakSet,F=function(){return`${location.pathname}${location.search?location.search+"&":"?"}${this.id}`},T=new WeakMap,B=function(){if(e(this,d).current){const t=new URL(location.href);t.searchParams.delete(this.id),history.replaceState(null,"",t.href)}},k=new WeakMap,N=function(t){(a.__opened[e(this,S)-1]||a.__opened.length===1||a.__opened.filter(c=>c!==this).every(c=>e(this,p).current>c.dominance.current))&&t()},L=new WeakMap,A=new WeakMap,x=new WeakMap,C=new WeakMap,a.__opened=[];let $=a;customElements.get("e-popover")||customElements.define("e-popover",$);var i,y,q,M,O,R;class G extends HTMLElement{constructor(){super();s(this,i);s(this,y,new w.CSSProperty(this,"--type","open"));s(this,q,()=>{this.classList.add("triggered")});s(this,M,()=>{this.classList.add("opened"),this.setAttribute("aria-expanded","true")});s(this,O,()=>{this.classList.remove("opened")});s(this,R,()=>{this.classList.remove("triggered"),this.setAttribute("aria-expanded","false")});V.isBrowser&&(this.addEventListener("click",()=>{if(e(this,i)){const t=e(this,y).current;t==="open"||t==="toggle"&&!e(this,i).opened.current?e(this,i).open({trigger:this}):(t==="close"||t==="toggle"&&e(this,i).opened.current)&&e(this,i).close()}}),this.addEventListener("keydown",t=>{t.code==="Space"&&t.currentTarget.click()}))}get type(){return e(this,y)}get popoverElement(){return e(this,i)}connectedCallback(){var c;e(this,y).subscribe(n=>{e(this,i)&&(n.current!=="close"?(this.setAttribute("aria-has-popup","true"),this.setAttribute("aria-expanded",e(this,i).opened.current?"true":"false"),this.setAttribute("aria-controls",e(this,i).id||"")):(this.removeAttribute("aria-has-popup"),this.removeAttribute("aria-expanded"),this.removeAttribute("aria-controls")))}),this.hasAttribute("tabindex")||(this.tabIndex=0);const t=this.getAttribute("target");if(t){let n=null;if(t==="parent"){const H=this.closest("[popover-target]");if(H)n=H;else{const E=this.getRootNode();E instanceof ShadowRoot?n=E.host.closest("[popover-target]"):E instanceof HTMLElement&&(n=E.closest("[popover-target]"))}}else t==="sibling"?n=(c=this.parentElement)==null?void 0:c.querySelector("[popover-target]"):n=document.querySelector(`#${t}`)||this.getRootNode().querySelector(`#${t}`);n instanceof HTMLElement?(r(this,i,n),e(this,i).addEventListener("popoverTriggered",e(this,q)),e(this,i).addEventListener("popoverOpened",e(this,M)),e(this,i).addEventListener("popoverClosing",e(this,O)),e(this,i).addEventListener("popoverClosed",e(this,R))):console.warn(this,`target ${t} not found`)}e(this,y).observe()}disconnectedCallback(){e(this,y).unobserve(),this.removeAttribute("aria-has-popup"),this.removeAttribute("aria-expanded"),this.removeAttribute("aria-controls"),e(this,i)&&(e(this,i).removeEventListener("popoverTriggered",e(this,q)),e(this,i).removeEventListener("popoverOpened",e(this,M)),e(this,i).removeEventListener("popoverClosing",e(this,O)),e(this,i).removeEventListener("popoverClosed",e(this,R)))}}i=new WeakMap,y=new WeakMap,q=new WeakMap,M=new WeakMap,O=new WeakMap,R=new WeakMap;customElements.get("e-popover-button")||customElements.define("e-popover-button",G);exports.PopoverButtonElement=G;exports.PopoverElement=$;

package/lib/popover/index.js

@@ -1,82 +1,84 @@
-var B = (o) => {
+var W = (o) => {
   throw TypeError(o);
 };
-var R = (o, n, t) => n.has(o) || B("Cannot " + t);
-var e = (o, n, t) => (R(o, n, "read from private field"), t ? t.call(o) : n.get(o)), s = (o, n, t) => n.has(o) ? B("Cannot add the same private member more than once") : n instanceof WeakSet ? n.add(o) : n.set(o, t), i = (o, n, t, l) => (R(o, n, "write to private field"), l ? l.call(o, t) : n.set(o, t), t), k = (o, n, t) => (R(o, n, "access private method"), t);
-import { Attribute as O } from "../attribute/index.js";
-import { S as W } from "../Store-OTdcl6SX.js";
-import { d as P } from "../events-CsVF98U6.js";
-import { d as j } from "../function-C10DGppn.js";
-import { g as F } from "../style-j2TwriJ_.js";
-import { windowResizer as D } from "../window-resizer/vanilla/index.js";
-import { i as G } from "../browser-0zX67oeU.js";
-var y, a, C, d, u, g, m, v, p, U, E, z, b, I, f, T, S, w;
+var I = (o, h, t) => h.has(o) || W("Cannot " + t);
+var e = (o, h, t) => (I(o, h, "read from private field"), t ? t.call(o) : h.get(o)), s = (o, h, t) => h.has(o) ? W("Cannot add the same private member more than once") : h instanceof WeakSet ? h.add(o) : h.set(o, t), r = (o, h, t, a) => (I(o, h, "write to private field"), a ? a.call(o, t) : h.set(o, t), t), C = (o, h, t) => (I(o, h, "access private method"), t);
+import { CSSProperty as T } from "../css-property/index.js";
+import { S as G } from "../Store-OTdcl6SX.js";
+import { d as z } from "../events-CsVF98U6.js";
+import { d as J } from "../function-C10DGppn.js";
+import { g as K } from "../style-j2TwriJ_.js";
+import { windowResizer as j } from "../window-resizer/vanilla/index.js";
+import { i as Q } from "../browser-0zX67oeU.js";
+var w, l, _, d, v, p, m, g, f, y, u, F, k, N, A, B, L, S, P, x;
 const c = class c extends HTMLElement {
   constructor() {
     super(...arguments);
-    s(this, p);
-    s(this, y);
-    s(this, a);
-    s(this, C);
-    s(this, d);
     s(this, u);
-    s(this, g);
-    s(this, m);
+    s(this, w);
+    s(this, l);
+    s(this, _);
+    s(this, d);
     s(this, v);
-    s(this, E);
-    s(this, b);
+    s(this, p);
+    s(this, m);
+    s(this, g);
     s(this, f);
-    s(this, T);
+    s(this, y);
+    s(this, k);
+    s(this, A);
+    s(this, L);
     s(this, S);
-    s(this, w);
-    i(this, y, -1), i(this, a, new W(!1)), i(this, d, new O(this, "history", !1)), i(this, u, new O(this, "restore", !1)), i(this, g, new O(this, "dominance", 0)), i(this, m, !1), this.open = (t) => {
-      if (e(this, a).current)
+    s(this, P);
+    s(this, x);
+    r(this, w, -1), r(this, l, new G(!1)), r(this, d, new T(this, "--history", !1)), r(this, v, new T(this, "--restore", !1)), r(this, p, new T(this, "--dominance", 0)), r(this, m, new T(this, "--click-outside", !1)), r(this, g, new T(this, "--escape", !1)), r(this, f, !1), this.open = (t) => {
+      if (e(this, l).current)
         return;
-      i(this, v, t == null ? void 0 : t.trigger), e(this, a).current = !0, e(this, g).current && (c.__opened = c.__opened.filter((h) => this.dominance.current >= h.dominance.current ? (h.close(), !1) : !0)), c.__opened.push(this), i(this, y, c.__opened.length - 1), e(this, d).current && e(this, m) && history.pushState("", "", e(this, p, U)), clearTimeout(e(this, C)), this.classList.remove("closing"), this.classList.add("triggered"), this.style.display = "block", P(this, "popoverTriggered", {
+      r(this, y, t == null ? void 0 : t.trigger), e(this, l).current = !0, e(this, p).current && (c.__opened = c.__opened.filter((n) => this.dominance.current >= n.dominance.current ? (n.close(), !1) : !0)), c.__opened.push(this), r(this, w, c.__opened.length - 1), e(this, d).current && e(this, f) && history.pushState("", "", e(this, u, F)), clearTimeout(e(this, _)), this.classList.remove("closing"), this.classList.add("triggered"), this.style.display = "block", z(this, "popoverTriggered", {
         custom: !0,
         detail: {
-          trigger: e(this, v)
+          trigger: e(this, y)
         }
       });
-      const l = () => {
-        addEventListener("click", e(this, E)), addEventListener("keydown", e(this, b)), e(this, w).call(this), this.style.opacity = "1", this.classList.add("opened"), P(this, "popoverOpened", {
+      const a = () => {
+        addEventListener("click", e(this, k)), addEventListener("keydown", e(this, A)), e(this, x).call(this), this.style.opacity = "1", this.classList.add("opened"), z(this, "popoverOpened", {
           custom: !0,
           detail: {
-            trigger: e(this, v)
+            trigger: e(this, y)
           }
         });
       };
-      t != null && t.skipTransition ? l() : setTimeout(l, 10);
+      t != null && t.skipTransition ? a() : setTimeout(a, 10);
     }, this.close = () => {
-      e(this, a).current && (e(this, a).current = !1, c.__opened = c.__opened.filter((t) => t !== this), k(this, p, z).call(this), this.classList.remove("opened"), this.classList.add("closing"), this.style.opacity = "0", P(this, "popoverClosing", {
+      e(this, l).current && (e(this, l).current = !1, c.__opened = c.__opened.filter((t) => t === this ? !1 : e(t, p).current < this.dominance.current ? (t.close(), !1) : !0), C(this, u, N).call(this), this.classList.remove("opened"), this.classList.add("closing"), this.style.opacity = "0", z(this, "popoverClosing", {
         custom: !0
-      }), removeEventListener("click", e(this, E)), removeEventListener("keydown", e(this, b)), setTimeout(() => {
-        this.classList.remove("triggered"), this.classList.remove("closing"), this.style.display = "none", P(this, "popoverClosed", {
+      }), removeEventListener("click", e(this, k)), removeEventListener("keydown", e(this, A)), setTimeout(() => {
+        this.classList.remove("triggered"), this.classList.remove("closing"), this.style.display = "none", z(this, "popoverClosed", {
           custom: !0
         });
-      }, F(this) + 10));
-    }, i(this, E, (t) => {
-      k(this, p, I).call(this, () => {
-        var q;
-        const l = t.composedPath();
-        if (l.find(
-          (N) => N instanceof HTMLElement && N.hasAttribute("data-popover-content")
+      }, K(this) + 10));
+    }, r(this, k, (t) => {
+      e(this, m).current && C(this, u, B).call(this, () => {
+        var D;
+        const a = t.composedPath();
+        if (a.find(
+          (U) => U instanceof HTMLElement && U.hasAttribute("data-popover-content")
         ))
           return;
-        const h = l[0], M = h instanceof HTMLElement && (this.contains(h) || ((q = this.shadowRoot) == null ? void 0 : q.contains(h))), L = h instanceof HTMLElement && h.hasAttribute("data-outside");
-        (!M || L) && this.close();
+        const n = a[0], $ = n instanceof HTMLElement && (this.contains(n) || ((D = this.shadowRoot) == null ? void 0 : D.contains(n))), E = n instanceof HTMLElement && n.hasAttribute("data-outside");
+        (!$ || E) && this.close();
       });
-    }), i(this, b, (t) => {
-      k(this, p, I).call(this, () => {
+    }), r(this, A, (t) => {
+      e(this, g).current && C(this, u, B).call(this, () => {
         t.code === "Escape" && this.close();
       });
-    }), i(this, f, () => {
-      i(this, m, !1), e(this, a).current && e(this, d).current && !location.search.includes(this.id) ? this.close() : !e(this, a).current && e(this, d).current && location.search.includes(this.id) && this.open(), i(this, m, !0);
-    }), i(this, T, () => {
-      this.style.removeProperty("--content-width"), this.style.removeProperty("--content-height"), e(this, S).call(this);
-    }), i(this, S, j(() => {
-      e(this, w).call(this);
-    }, 20)), i(this, w, () => {
+    }), r(this, L, () => {
+      r(this, f, !1), e(this, l).current && e(this, d).current && !location.search.includes(this.id) ? this.close() : !e(this, l).current && e(this, d).current && location.search.includes(this.id) && this.open(), r(this, f, !0);
+    }), r(this, S, () => {
+      this.style.removeProperty("--content-width"), this.style.removeProperty("--content-height"), e(this, P).call(this);
+    }), r(this, P, J(() => {
+      e(this, x).call(this);
+    }, 20)), r(this, x, () => {
       this.style.setProperty("--content-width", this.scrollWidth + "px"), this.style.setProperty("--content-height", this.scrollHeight + "px");
     });
   }
@@ -84,116 +86,132 @@ const c = class c extends HTMLElement {
     return e(this, d);
   }
   get restore() {
-    return e(this, u);
+    return e(this, v);
   }
   get dominance() {
+    return e(this, p);
+  }
+  get clickOutside() {
+    return e(this, m);
+  }
+  get escape() {
     return e(this, g);
   }
   get opened() {
-    return e(this, a);
+    return e(this, l);
   }
   get lastTrigger() {
-    return e(this, v);
+    return e(this, y);
   }
   connectedCallback() {
-    e(this, d).observe(), e(this, u).observe(), e(this, g).observe(), this.style.opacity = "0", this.style.display = "none", this.setAttribute("popover-target", ""), this.classList.remove("closing"), this.classList.remove("closed"), this.classList.remove("triggered"), this.classList.remove("opened"), addEventListener("popstate", e(this, f)), setTimeout(() => {
-      e(this, u).current ? e(this, f).call(this) : (k(this, p, z).call(this), i(this, m, !0));
-    }, 0), D.subscribe(e(this, T));
+    e(this, d).observe(), e(this, v).observe(), e(this, p).observe(), e(this, m).observe(), e(this, g).observe(), this.style.opacity = "0", this.style.display = "none", this.setAttribute("popover-target", ""), this.classList.remove("closing"), this.classList.remove("closed"), this.classList.remove("triggered"), this.classList.remove("opened"), addEventListener("popstate", e(this, L)), setTimeout(() => {
+      e(this, v).current ? e(this, L).call(this) : (C(this, u, N).call(this), r(this, f, !0));
+    }, 0), j.subscribe(e(this, S));
   }
   disconnectedCallback() {
-    D.unsubscribe(e(this, T)), e(this, d).unobserve(), e(this, u).unobserve(), e(this, g).unobserve(), this.style.opacity = "", this.style.display = "", this.removeAttribute("popover-target"), c.__opened = c.__opened.filter((t) => t !== this), clearTimeout(e(this, C)), removeEventListener("popstate", e(this, f)), this.style.removeProperty("--content-width"), this.style.removeProperty("--content-height");
+    j.unsubscribe(e(this, S)), e(this, d).unobserve(), e(this, v).unobserve(), e(this, p).unobserve(), e(this, m).unobserve(), e(this, g).unobserve(), this.style.opacity = "", this.style.display = "", this.removeAttribute("popover-target"), c.__opened = c.__opened.filter((t) => t !== this), clearTimeout(e(this, _)), removeEventListener("popstate", e(this, L)), this.style.removeProperty("--content-width"), this.style.removeProperty("--content-height");
   }
 };
-y = new WeakMap(), a = new WeakMap(), C = new WeakMap(), d = new WeakMap(), u = new WeakMap(), g = new WeakMap(), m = new WeakMap(), v = new WeakMap(), p = new WeakSet(), U = function() {
+w = new WeakMap(), l = new WeakMap(), _ = new WeakMap(), d = new WeakMap(), v = new WeakMap(), p = new WeakMap(), m = new WeakMap(), g = new WeakMap(), f = new WeakMap(), y = new WeakMap(), u = new WeakSet(), F = function() {
   return `${location.pathname}${location.search ? location.search + "&" : "?"}${this.id}`;
-}, E = new WeakMap(), z = function() {
+}, k = new WeakMap(), N = function() {
   if (e(this, d).current) {
     const t = new URL(location.href);
     t.searchParams.delete(this.id), history.replaceState(null, "", t.href);
   }
-}, b = new WeakMap(), I = function(t) {
-  (c.__opened[e(this, y) - 1] || c.__opened.length === 1) && t();
-}, f = new WeakMap(), T = new WeakMap(), S = new WeakMap(), w = new WeakMap(), c.__opened = [];
-let $ = c;
-customElements.get("e-popover") || customElements.define("e-popover", $);
-var r, _, A, x, H;
-class J extends HTMLElement {
+}, A = new WeakMap(), B = function(t) {
+  (c.__opened[e(this, w) - 1] || c.__opened.length === 1 || c.__opened.filter((a) => a !== this).every((a) => e(this, p).current > a.dominance.current)) && t();
+}, L = new WeakMap(), S = new WeakMap(), P = new WeakMap(), x = new WeakMap(), c.__opened = [];
+let q = c;
+customElements.get("e-popover") || customElements.define("e-popover", q);
+var i, b, H, M, O, R;
+class V extends HTMLElement {
   constructor() {
     super();
-    s(this, r);
-    s(this, _, () => {
+    s(this, i);
+    s(this, b, new T(this, "--type", "open"));
+    s(this, H, () => {
       this.classList.add("triggered");
     });
-    s(this, A, () => {
-      this.classList.add("opened");
+    s(this, M, () => {
+      this.classList.add("opened"), this.setAttribute("aria-expanded", "true");
     });
-    s(this, x, () => {
+    s(this, O, () => {
       this.classList.remove("opened");
     });
-    s(this, H, () => {
-      this.classList.remove("triggered");
+    s(this, R, () => {
+      this.classList.remove("triggered"), this.setAttribute("aria-expanded", "false");
     });
-    G && (this.addEventListener("click", () => {
-      if (e(this, r)) {
-        const t = this.getAttribute("type") || "open";
-        t === "open" || t === "toggle" && !e(this, r).opened.current ? e(this, r).open({ trigger: this }) : (t === "close" || t === "toggle" && e(this, r).opened.current) && e(this, r).close();
+    Q && (this.addEventListener("click", () => {
+      if (e(this, i)) {
+        const t = e(this, b).current;
+        t === "open" || t === "toggle" && !e(this, i).opened.current ? e(this, i).open({ trigger: this }) : (t === "close" || t === "toggle" && e(this, i).opened.current) && e(this, i).close();
       }
     }), this.addEventListener("keydown", (t) => {
       t.code === "Space" && t.currentTarget.click();
     }));
   }
+  get type() {
+    return e(this, b);
+  }
   get popoverElement() {
-    return e(this, r);
+    return e(this, i);
   }
   connectedCallback() {
-    var l;
-    this.hasAttribute("tabindex") || (this.tabIndex = 0);
+    var a;
+    e(this, b).subscribe((n) => {
+      e(this, i) && (n.current !== "close" ? (this.setAttribute("aria-has-popup", "true"), this.setAttribute(
+        "aria-expanded",
+        e(this, i).opened.current ? "true" : "false"
+      ), this.setAttribute("aria-controls", e(this, i).id || "")) : (this.removeAttribute("aria-has-popup"), this.removeAttribute("aria-expanded"), this.removeAttribute("aria-controls")));
+    }), this.hasAttribute("tabindex") || (this.tabIndex = 0);
     const t = this.getAttribute("target");
     if (t) {
-      let h = null;
+      let n = null;
       if (t === "parent") {
-        const M = this.closest("[popover-target]");
-        if (M)
-          h = M;
+        const $ = this.closest("[popover-target]");
+        if ($)
+          n = $;
         else {
-          const L = this.getRootNode();
-          L instanceof ShadowRoot ? h = L.host.closest("[popover-target]") : L instanceof HTMLElement && (h = L.closest("[popover-target]"));
+          const E = this.getRootNode();
+          E instanceof ShadowRoot ? n = E.host.closest("[popover-target]") : E instanceof HTMLElement && (n = E.closest("[popover-target]"));
         }
-      } else t === "sibling" ? h = (l = this.parentElement) == null ? void 0 : l.querySelector("[popover-target]") : h = document.querySelector(`#${t}`) || this.getRootNode().querySelector(`#${t}`);
-      h instanceof HTMLElement ? (i(this, r, h), e(this, r).addEventListener(
+      } else t === "sibling" ? n = (a = this.parentElement) == null ? void 0 : a.querySelector("[popover-target]") : n = document.querySelector(`#${t}`) || this.getRootNode().querySelector(`#${t}`);
+      n instanceof HTMLElement ? (r(this, i, n), e(this, i).addEventListener(
         "popoverTriggered",
-        e(this, _)
-      ), e(this, r).addEventListener(
+        e(this, H)
+      ), e(this, i).addEventListener(
         "popoverOpened",
-        e(this, A)
-      ), e(this, r).addEventListener(
+        e(this, M)
+      ), e(this, i).addEventListener(
         "popoverClosing",
-        e(this, x)
-      ), e(this, r).addEventListener(
+        e(this, O)
+      ), e(this, i).addEventListener(
         "popoverClosed",
-        e(this, H)
+        e(this, R)
       )) : console.warn(this, `target ${t} not found`);
     }
+    e(this, b).observe();
   }
   disconnectedCallback() {
-    e(this, r) && (e(this, r).removeEventListener(
+    e(this, b).unobserve(), this.removeAttribute("aria-has-popup"), this.removeAttribute("aria-expanded"), this.removeAttribute("aria-controls"), e(this, i) && (e(this, i).removeEventListener(
       "popoverTriggered",
-      e(this, _)
-    ), e(this, r).removeEventListener(
+      e(this, H)
+    ), e(this, i).removeEventListener(
       "popoverOpened",
-      e(this, A)
-    ), e(this, r).removeEventListener(
+      e(this, M)
+    ), e(this, i).removeEventListener(
       "popoverClosing",
-      e(this, x)
-    ), e(this, r).removeEventListener(
+      e(this, O)
+    ), e(this, i).removeEventListener(
       "popoverClosed",
-      e(this, H)
+      e(this, R)
     ));
   }
 }
-r = new WeakMap(), _ = new WeakMap(), A = new WeakMap(), x = new WeakMap(), H = new WeakMap();
-customElements.get("e-popover-button") || customElements.define("e-popover-button", J);
+i = new WeakMap(), b = new WeakMap(), H = new WeakMap(), M = new WeakMap(), O = new WeakMap(), R = new WeakMap();
+customElements.get("e-popover-button") || customElements.define("e-popover-button", V);
 export {
-  J as PopoverButtonElement,
-  $ as PopoverElement
+  V as PopoverButtonElement,
+  q as PopoverElement
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aptechka",
-  "version": "0.32.5",
+  "version": "0.33.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/denisavitski/aptechka.git"