@ember-eui/core 5.13.0 → 5.14.1

package/addon/components/eui-popover/index.hbs

@@ -1,7 +1,7 @@
 {{#let
   (unique-id)
   (class-names
-    (if this.isOpening 'euiPopover-isOpen')
+    (if this.isOpening "euiPopover-isOpen")
     position=this.anchorPosition
     display=this.display
     componentName="EuiPopover"
@@ -19,14 +19,14 @@
   <div
     class={{classes}}
     ...attributes
-    {{on-key "_all" this.onKeyDown}}
+    {{on-key "_all" this.onKeyDown priority=1}}
     {{did-insert this.didInsertPopover}}
     {{did-update this.didUpdateIsOpen @isOpen}}
     {{did-update this.didUpdateRepositionOnScroll @repositionOnScroll}}
     {{did-insert (optional @popoverRef)}}
   >
 
-    {{!-- button --}}
+    {{! button }}
     <div
       class="euiPopover__anchor {{@anchorClassName}}"
       {{did-insert this.registerButton}}
@@ -34,11 +34,10 @@
       {{yield to="button"}}
     </div>
 
-    {{!-- content --}}
+    {{! content }}
     {{#if
       (and
-        (not this.suppressingPopover)
-        (or this.isCurrentlyOpen this.isClosing)
+        (not this.suppressingPopover) (or this.isCurrentlyOpen this.isClosing)
       )
     }}
       <EuiPortal @insert={{@insert}}>
@@ -57,15 +56,13 @@
             @paddingSize={{this.panelPaddingSize}}
             {{simple-style this._popoverStyles}}
             {{did-insert this.registerPanel}}
-            {{outside-click-detector onOutsideClick=this.onClickOutside}}
+            {{outside-click-detector
+              onOutsideClick=(arg-or-default this.onClickOutside)
+            }}
             {{on-key "Escape" this.onEscapeKey}}
             {{focus-trap
               isActive=(not
-                (or
-                  (not this.ownFocus)
-                  (not this.isOpenStable)
-                  this.isClosing
-                )
+                (or (not this.ownFocus) (not this.isOpenStable) this.isClosing)
               )
               focusTrapOptions=(merge
                 (hash
@@ -75,7 +72,7 @@
                   onDeactivate=(optional @onTrapDeactivation)
                   preventScroll=true
                   clickOutsideDeactivates=true
-                  fallbackFocus=(concat '#' panelId)
+                  fallbackFocus=(concat "#" panelId)
                 )
                 @focusTrapOptions
               )

package/addon/components/eui-popover/index.ts

@@ -149,6 +149,10 @@ export type EuiPopoverArgs = {
   'aria-labelledby'?: string;
 
   tabindex?: string | number;
+
+  focusTrapOptions?: {
+    onClickOutside?: (e: Event) => void;
+  };
 };
 
 type AnchorPosition = 'up' | 'right' | 'down' | 'left';
@@ -279,8 +283,10 @@ export default class EuiPopoverComponent extends Component<EuiPopoverArgs> {
   }
 
   @action
-  onEscapeKey(event: Event): void {
+  onEscapeKey(event: Event, ekEvent?: Event): void {
     if (this.isOpen) {
+      ekEvent?.stopPropagation();
+      ekEvent?.stopImmediatePropagation();
       event.preventDefault();
       event.stopPropagation();
       this.closePopover();
@@ -288,18 +294,22 @@ export default class EuiPopoverComponent extends Component<EuiPopoverArgs> {
   }
 
   @action
-  onKeyDown(event: KeyboardEvent): void {
+  onKeyDown(event: KeyboardEvent, ekEvent: KeyboardEvent): void {
     if (event.key === cascadingMenuKeys.ESCAPE) {
-      this.onEscapeKey(event as unknown as Event);
+      this.onEscapeKey(event as unknown as Event, ekEvent as unknown as Event);
     }
   }
 
   @action
   onClickOutside(event: Event): void {
-    // only close the popover if the event source isn't the anchor button
-    // otherwise, it is up to the anchor to toggle the popover's open status
-    if (this.button && this.button.contains(event.target as Node) === false) {
-      this.closePopover();
+    if (this.args.focusTrapOptions?.onClickOutside) {
+      this.args.focusTrapOptions.onClickOutside(event);
+    } else {
+      // only close the popover if the event source isn't the anchor button
+      // otherwise, it is up to the anchor to toggle the popover's open status
+      if (this.button && this.button.contains(event.target as Node) === false) {
+        this.closePopover();
+      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-eui/core",
-  "version": "5.13.0",
+  "version": "5.14.1",
   "description": "Ember Components for Elastic UI",
   "keywords": [
     "ember-addon",
@@ -186,5 +186,5 @@
   "volta": {
     "extends": "../../package.json"
   },
-  "gitHead": "535a6dcd1cb7b182fb93d8c5897f8c3e69c53814"
+  "gitHead": "fc26397439fe0c49280a839d84e3e9e48040d56f"
 }