@quicdata/analytics 0.0.6 → 0.0.7

package/filters/widget-toolbar.d.ts

@@ -11,10 +11,13 @@ export declare class AnalyticsWidgetToolbar extends LitElement {
     activeCount: number;
     private _dialogOpen;
     private _portalRoot;
+    private _inFilterChange;
+    private _onEscapeKey;
     updated(changed: Map<string, unknown>): void;
     disconnectedCallback(): void;
     private _renderOverlayPortal;
     private _onFilterIconClick;
+    private _onOverlayClick;
     private _onDialogClose;
     private _onFilterChange;
     private _onFilterBarClose;

package/filters/widget-toolbar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"widget-toolbar.d.ts","sourceRoot":"","sources":["../../../../libs/analytics/src/filters/widget-toolbar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAa,MAAM,KAAK,CAAC;AAG5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAiEzD;;;GAGG;AACH,qBACa,sBAAuB,SAAQ,UAAU;IACpD,OAAgB,MAAM,0BA8DpB;IAEyB,OAAO,EAAE,gBAAgB,EAAE,CAAM;IAChC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAM;IACvD,WAAW,SAAK;IAEnC,OAAO,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,WAAW,CAA4B;IAEtC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAc5C,oBAAoB,IAAI,IAAI;IAQrC,OAAO,CAAC,oBAAoB;IA+B5B,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,iBAAiB;IAIhB,MAAM;CAsBhB;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,qBAAqB;QAC7B,0BAA0B,EAAE,sBAAsB,CAAC;KACpD;CACF"}
+{"version":3,"file":"widget-toolbar.d.ts","sourceRoot":"","sources":["../../../../libs/analytics/src/filters/widget-toolbar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAa,MAAM,KAAK,CAAC;AAG5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAiEzD;;;GAGG;AACH,qBACa,sBAAuB,SAAQ,UAAU;IACpD,OAAgB,MAAM,0BA8DpB;IAEyB,OAAO,EAAE,gBAAgB,EAAE,CAAM;IAChC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAM;IACvD,WAAW,SAAK;IAEnC,OAAO,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAMlB;IAEO,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAgB5C,oBAAoB,IAAI,IAAI;IASrC,OAAO,CAAC,oBAAoB;IA+B5B,OAAO,CAAC,kBAAkB,CAExB;IAEF,OAAO,CAAC,eAAe,CAGrB;IAEF,OAAO,CAAC,cAAc,CAKpB;IAEF,OAAO,CAAC,eAAe,CAgBrB;IAEF,OAAO,CAAC,iBAAiB,CAEvB;IAEO,MAAM;CAsBhB;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,qBAAqB;QAC7B,0BAA0B,EAAE,sBAAsB,CAAC;KACpD;CACF"}

package/filters/widget-toolbar.js

@@ -76,6 +76,48 @@ let AnalyticsWidgetToolbar = class AnalyticsWidgetToolbar extends LitElement {
         this.activeCount = 0;
         this._dialogOpen = false;
         this._portalRoot = null;
+        this._inFilterChange = false;
+        this._onEscapeKey = (e) => {
+            if (!this._dialogOpen)
+                return;
+            if (e.key === 'Escape') {
+                e.preventDefault();
+                this._onDialogClose();
+            }
+        };
+        this._onFilterIconClick = () => {
+            this._dialogOpen = true;
+        };
+        this._onOverlayClick = (e) => {
+            if (e.target !== e.currentTarget)
+                return; // only close when clicking mask, not dialog
+            this._onDialogClose();
+        };
+        this._onDialogClose = () => {
+            this._dialogOpen = false;
+            this.dispatchEvent(new CustomEvent(EVENT_FILTER_CLOSE, { bubbles: true, composed: true }));
+        };
+        this._onFilterChange = (e) => {
+            if (this._inFilterChange)
+                return;
+            if (e.target === this)
+                return;
+            e.stopPropagation();
+            this._inFilterChange = true;
+            try {
+                this.dispatchEvent(new CustomEvent(EVENT_FILTER_CHANGE, {
+                    bubbles: true,
+                    composed: true,
+                    detail: e.detail,
+                }));
+            }
+            finally {
+                this._inFilterChange = false;
+            }
+        };
+        this._onFilterBarClose = () => {
+            this._dialogOpen = false;
+        };
     }
     static { this.styles = css `
     :host {
@@ -148,10 +190,12 @@ let AnalyticsWidgetToolbar = class AnalyticsWidgetToolbar extends LitElement {
                 document.body.appendChild(this._portalRoot);
             }
             render(this._renderOverlayPortal(), this._portalRoot);
+            window.addEventListener('keydown', this._onEscapeKey);
         }
         else if (this._portalRoot) {
             this._portalRoot.remove();
             this._portalRoot = null;
+            window.removeEventListener('keydown', this._onEscapeKey);
         }
     }
     disconnectedCallback() {
@@ -159,6 +203,7 @@ let AnalyticsWidgetToolbar = class AnalyticsWidgetToolbar extends LitElement {
             this._portalRoot.remove();
             this._portalRoot = null;
         }
+        window.removeEventListener('keydown', this._onEscapeKey);
         super.disconnectedCallback();
     }
     _renderOverlayPortal() {
@@ -169,7 +214,7 @@ let AnalyticsWidgetToolbar = class AnalyticsWidgetToolbar extends LitElement {
         role="dialog"
         aria-modal="true"
         aria-label="Filters"
-        @click=${this._onDialogClose}
+        @click=${this._onOverlayClick}
       >
         <div class="dialog" @click=${(e) => e.stopPropagation()}>
           <button type="button" class="dialog-close" aria-label="Close" @click=${this._onDialogClose}>
@@ -191,24 +236,6 @@ let AnalyticsWidgetToolbar = class AnalyticsWidgetToolbar extends LitElement {
       </div>
     `;
     }
-    _onFilterIconClick() {
-        this._dialogOpen = true;
-    }
-    _onDialogClose() {
-        this._dialogOpen = false;
-        this.dispatchEvent(new CustomEvent(EVENT_FILTER_CLOSE, { bubbles: true, composed: true }));
-    }
-    _onFilterChange(e) {
-        e.stopPropagation();
-        this.dispatchEvent(new CustomEvent(EVENT_FILTER_CHANGE, {
-            bubbles: true,
-            composed: true,
-            detail: e.detail,
-        }));
-    }
-    _onFilterBarClose() {
-        this._dialogOpen = false;
-    }
     render() {
         const hasFilters = this.filters.length > 0;
         if (!hasFilters)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quicdata/analytics",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "type": "module",
   "main": "index.js",
   "module": "index.js",