@salesforcedevs/dx-components 1.40.4-style-fix-alpha2 → 1.40.4-style-fix-alpha3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforcedevs/dx-components",
-  "version": "1.40.4-style-fix-alpha2",
+  "version": "1.40.4-style-fix-alpha3",
   "description": "DX Lightning web components",
   "license": "MIT",
   "engines": {

package/src/modules/dx/popover/popover.ts

@@ -89,7 +89,15 @@ export default class Popover extends LightningElement {
 
             this.dispatchEvent(new CustomEvent("open"));
 
-            setTimeout(() => {
+            this.clearOpenListenersTimer();
+            // Defer so the opening click is not treated as an outside click.
+            // Drop the callback if the popover closes before it runs, or the
+            // document listeners attach with nothing left to remove them.
+            this.openListenersTimer = setTimeout(() => {
+                this.openListenersTimer = undefined;
+                if (!this._open) {
+                    return;
+                }
                 this.setPosition();
                 this.attachListenersTopopover();
             });
@@ -98,6 +106,7 @@ export default class Popover extends LightningElement {
 
     @api
     closePopover(focusControl: boolean = false) {
+        this.clearOpenListenersTimer();
         if (!this._open) {
             return;
         }
@@ -134,6 +143,7 @@ export default class Popover extends LightningElement {
 
     private controlled: boolean = false;
     private pointerOpened: boolean = false;
+    private openListenersTimer?: ReturnType<typeof setTimeout>;
     private _open: boolean = false;
     private _rendered: boolean = isPrerender();
     private _role: string | null = null;
@@ -146,6 +156,7 @@ export default class Popover extends LightningElement {
     // LIFECYCLE METHODS
 
     disconnectedCallback() {
+        this.clearOpenListenersTimer();
         document.removeEventListener(
             "click",
             this.interactOutsideListener,
@@ -262,13 +273,42 @@ export default class Popover extends LightningElement {
 
     // Capture on document: click-open leaves focus on the trigger, and slotted
     // menu options live outside this shadow tree, so the panel's onkeydown
-    // never sees Escape.
+    // never sees Escape. Only the innermost popover in the event path handles
+    // it, so Escape in another control does not close this menu or cancel that
+    // control's own Escape behavior.
     private onDocumentKeydown = (e: KeyboardEvent) => {
-        if (e.key === "Escape" || e.key === "Esc") {
-            this.closeOnEscape(e);
+        if ((e.key !== "Escape" && e.key !== "Esc") || !this.handlesEscape(e)) {
+            return;
         }
+        this.closeOnEscape(e);
     };
 
+    private handlesEscape(e: KeyboardEvent): boolean {
+        if (!this._open || e.defaultPrevented) {
+            return false;
+        }
+        const host = this.template.host;
+        const path = e.composedPath();
+        for (const node of path) {
+            if (node instanceof Element && node.localName === "dx-popover") {
+                return node === host;
+            }
+        }
+        // A non-composed event fired in this shadow or on the trigger does
+        // not list the host. The panel and control listeners still apply.
+        return (
+            (this.popover !== null && path.includes(this.popover)) ||
+            (this.control !== null && path.includes(this.control))
+        );
+    }
+
+    private clearOpenListenersTimer() {
+        if (this.openListenersTimer !== undefined) {
+            clearTimeout(this.openListenersTimer);
+            this.openListenersTimer = undefined;
+        }
+    }
+
     private closeOnEscape(e: KeyboardEvent) {
         if (!this.open) {
             return;
@@ -300,7 +340,7 @@ export default class Popover extends LightningElement {
         }
     }
 
-    private onControlClick = () => {
+    private onControlClick = (e: MouseEvent) => {
         if (this.controlled && this.open) {
             this.dispatchRequestCloseEvent("click-control");
             return;
@@ -321,7 +361,10 @@ export default class Popover extends LightningElement {
             return;
         }
 
-        this.pointerOpened = true;
+        // Enter/Space on a button synthesizes a click with detail 0. Only a
+        // pointer click should blur the trigger on Escape; keyboard activation
+        // must leave focus on the control.
+        this.pointerOpened = e.detail > 0;
         this.openPopover();
     };