@justeattakeaway/pie-modal 1.25.13 → 1.26.1

package/dist/index.js

@@ -14,7 +14,7 @@ const x = class x extends T {
     this.getAttribute("v") || this.setAttribute("v", x.v);
   }
 };
-x.v = "1.25.13";
+x.v = "1.26.1";
 let B = x;
 function V(o) {
   if (Array.isArray(o)) {
@@ -26,12 +26,12 @@ function V(o) {
 }
 var A = !1;
 if (typeof window < "u") {
-  var M = {
+  var O = {
     get passive() {
       A = !0;
     }
   };
-  window.addEventListener("testPassive", null, M), window.removeEventListener("testPassive", null, M);
+  window.addEventListener("testPassive", null, O), window.removeEventListener("testPassive", null, O);
 }
 var $ = typeof window < "u" && window.navigator && window.navigator.platform && (/iP(ad|hone|od)/.test(window.navigator.platform) || window.navigator.platform === "MacIntel" && window.navigator.maxTouchPoints > 1), p = [], w = !1, D = -1, v = void 0, y = void 0, E = function(t) {
   return p.some(function(a) {
@@ -95,7 +95,7 @@ const J = '*,*:after,*:before{box-sizing:inherit}dialog{position:absolute;left:0
   "brand-06-subtle",
   "brand-08",
   "brand-08-subtle"
-], O = "pie-modal-close", C = "pie-modal-open", L = "pie-modal-back", eo = "pie-modal-leading-action-click", io = "pie-modal-supporting-action-click", r = {
+], M = "pie-modal-close", C = "pie-modal-open", L = "pie-modal-back", eo = "pie-modal-leading-action-click", io = "pie-modal-supporting-action-click", r = {
   hasBackButton: !1,
   hasStackedActions: !1,
   headingLevel: "h2",
@@ -141,7 +141,7 @@ let n = class extends B {
   connectedCallback() {
     super.connectedCallback(), this._abortController = new AbortController();
     const { signal: o } = this._abortController;
-    this.addEventListener("click", (t) => this._handleDialogLightDismiss(t)), this._setupEscKeyListener(), document.addEventListener(C, (t) => this._handleModalOpened(t), { signal: o }), document.addEventListener(O, (t) => this._handleModalClosed(t), { signal: o }), document.addEventListener(L, (t) => this._handleModalClosed(t), { signal: o });
+    this.addEventListener("click", (t) => this._handleDialogLightDismiss(t)), document.addEventListener(C, (t) => this._handleModalOpened(t), { signal: o }), document.addEventListener(M, (t) => this._handleModalClosed(t), { signal: o }), document.addEventListener(L, (t) => this._handleModalClosed(t), { signal: o });
   }
   disconnectedCallback() {
     super.disconnectedCallback(), this._abortController.abort(), this._enableBodyScroll(), this._removeEscKeyEventListener();
@@ -158,7 +158,7 @@ let n = class extends B {
   }
   _handleIsDismissibleChanged(o) {
     const t = o.get("isDismissible"), a = this.isDismissible;
-    !t && a && this._removeEscKeyEventListener(), t && !a && this._setupEscKeyListener();
+    !t && a && this._removeEscKeyEventListener(), t && !a && this.isOpen && this._setupEscKeyListener();
   }
   /**
    * Opens the dialog element and disables page scrolling
@@ -204,7 +204,7 @@ let n = class extends B {
   // Handles changes to the modal isOpen property by dispatching any appropriate events
   _handleModalOpenStateChanged(o) {
     const t = o.get("isOpen");
-    t !== void 0 && (t ? this._backButtonClicked ? (this._backButtonClicked = !1, b(this, L, { targetModal: this })) : b(this, O, { targetModal: this }) : b(this, C, { targetModal: this }));
+    t !== void 0 && (t ? this._backButtonClicked ? (this._backButtonClicked = !1, b(this, L, { targetModal: this })) : b(this, M, { targetModal: this }) : b(this, C, { targetModal: this }));
   }
   _handleActionClick(o) {
     o === "leading" ? (this._dialog.close("leading"), b(this, eo, { targetModal: this })) : o === "supporting" && (this._dialog.close("supporting"), b(this, io, { targetModal: this }));
@@ -530,7 +530,7 @@ n = l([
 ], n);
 export {
   L as ON_MODAL_BACK_EVENT,
-  O as ON_MODAL_CLOSE_EVENT,
+  M as ON_MODAL_CLOSE_EVENT,
   eo as ON_MODAL_LEADING_ACTION_CLICK,
   C as ON_MODAL_OPEN_EVENT,
   io as ON_MODAL_SUPPORTING_ACTION_CLICK,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@justeattakeaway/pie-modal",
-  "version": "1.25.13",
+  "version": "1.26.1",
   "description": "PIE design system modal built using web components",
   "repository": {
     "type": "git",
@@ -50,9 +50,9 @@
     "@justeat/pie-design-tokens": "7.11.1",
     "@justeattakeaway/pie-button": "1.13.4",
     "@justeattakeaway/pie-components-config": "0.21.0",
-    "@justeattakeaway/pie-css": "1.1.0",
+    "@justeattakeaway/pie-css": "1.1.1",
     "@justeattakeaway/pie-monorepo-utils": "0.9.0",
-    "@justeattakeaway/pie-text-input": "0.29.27",
+    "@justeattakeaway/pie-text-input": "0.29.29",
     "@justeattakeaway/pie-wrapper-react": "0.14.4",
     "@types/body-scroll-lock": "3.1.2",
     "cem-plugin-module-file-extensions": "0.0.5"
@@ -62,8 +62,8 @@
   },
   "dependencies": {
     "@justeattakeaway/pie-button": "1.13.4",
-    "@justeattakeaway/pie-icon-button": "2.7.7",
-    "@justeattakeaway/pie-icons-webc": "1.21.4",
+    "@justeattakeaway/pie-icon-button": "2.7.9",
+    "@justeattakeaway/pie-icons-webc": "1.22.0",
     "@justeattakeaway/pie-spinner": "1.4.13",
     "@justeattakeaway/pie-webc-core": "14.0.1",
     "body-scroll-lock": "3.1.5",

package/src/index.ts

@@ -154,8 +154,6 @@ export class PieModal extends PieElement implements ModalProps {
 
         this.addEventListener('click', (event) => this._handleDialogLightDismiss(event));
 
-        this._setupEscKeyListener();
-
         document.addEventListener(ON_MODAL_OPEN_EVENT, (event) => this._handleModalOpened(<CustomEvent>event), { signal });
         document.addEventListener(ON_MODAL_CLOSE_EVENT, (event) => this._handleModalClosed(<CustomEvent>event), { signal });
         document.addEventListener(ON_MODAL_BACK_EVENT, (event) => this._handleModalClosed(<CustomEvent>event), { signal });
@@ -195,8 +193,8 @@ export class PieModal extends PieElement implements ModalProps {
             this._removeEscKeyEventListener();
         }
 
-        // if the modal is being set to NOT dismissible, add the esc key listener
-        if (oldValue && !newValue) {
+        // if the modal is being set to NOT dismissible, add the esc key listener (only if open)
+        if (oldValue && !newValue && this.isOpen) {
             this._setupEscKeyListener();
         }
     }