carbon-react 115.0.0 → 115.0.1

package/esm/components/action-popover/action-popover-item/action-popover-item.component.js

@@ -129,11 +129,7 @@ const ActionPopoverItem = ({
     }
   }, [disabled, focusButton, onClickProp, setOpenPopover]);
   const onKeyDown = useCallback(e => {
-    if (Events.isEscKey(e)) {
-      e.stopPropagation();
-      setOpenPopover(false);
-      focusButton();
-    } else if (Events.isSpaceKey(e)) {
+    if (Events.isSpaceKey(e)) {
       e.preventDefault();
       e.stopPropagation();
     } else if (!disabled) {
@@ -182,7 +178,7 @@ const ActionPopoverItem = ({
     } else if (Events.isEnterKey(e)) {
       e.stopPropagation();
     }
-  }, [disabled, download, focusButton, isHref, isLeftAligned, onClick, setOpenPopover, submenu]);
+  }, [disabled, download, isHref, isLeftAligned, onClick, submenu]);
   const itemSubmenuProps = { ...(!disabled && {
       onMouseEnter: e => {
         if (mouseEnterTimer.current) clearTimeout(mouseEnterTimer.current);

package/esm/components/action-popover/action-popover.component.js

@@ -12,6 +12,7 @@ import ActionPopoverMenu from "./action-popover-menu/action-popover-menu.compone
 import ActionPopoverItem from "./action-popover-item/action-popover-item.component";
 import ActionPopoverDivider from "./action-popover-divider/action-popover-divider.component";
 import ActionPopoverContext from "./action-popover-context";
+import useModalManager from "../../hooks/__internal__/useModalManager";
 
 const onOpenDefault = () => {};
 
@@ -107,6 +108,14 @@ const ActionPopover = ({
       setOpen(true);
     }
   }, [itemCount, setOpen]);
+  const handleEscapeKey = useCallback(e => {
+    /* istanbul ignore else */
+    if (Events.isEscKey(e)) {
+      setOpen(false);
+      focusButton();
+    }
+  }, [setOpen, focusButton]);
+  useModalManager(isOpen, handleEscapeKey, buttonRef);
   useEffect(() => {
     const handler = ({
       target

package/lib/components/action-popover/action-popover-item/action-popover-item.component.js

@@ -151,11 +151,7 @@ const ActionPopoverItem = ({
     }
   }, [disabled, focusButton, onClickProp, setOpenPopover]);
   const onKeyDown = (0, _react.useCallback)(e => {
-    if (_events.default.isEscKey(e)) {
-      e.stopPropagation();
-      setOpenPopover(false);
-      focusButton();
-    } else if (_events.default.isSpaceKey(e)) {
+    if (_events.default.isSpaceKey(e)) {
       e.preventDefault();
       e.stopPropagation();
     } else if (!disabled) {
@@ -204,7 +200,7 @@ const ActionPopoverItem = ({
     } else if (_events.default.isEnterKey(e)) {
       e.stopPropagation();
     }
-  }, [disabled, download, focusButton, isHref, isLeftAligned, onClick, setOpenPopover, submenu]);
+  }, [disabled, download, isHref, isLeftAligned, onClick, submenu]);
   const itemSubmenuProps = { ...(!disabled && {
       onMouseEnter: e => {
         if (mouseEnterTimer.current) clearTimeout(mouseEnterTimer.current);

package/lib/components/action-popover/action-popover.component.js

@@ -29,6 +29,8 @@ var _actionPopoverDivider = _interopRequireDefault(require("./action-popover-div
 
 var _actionPopoverContext = _interopRequireDefault(require("./action-popover-context"));
 
+var _useModalManager = _interopRequireDefault(require("../../hooks/__internal__/useModalManager"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
@@ -132,6 +134,14 @@ const ActionPopover = ({
       setOpen(true);
     }
   }, [itemCount, setOpen]);
+  const handleEscapeKey = (0, _react.useCallback)(e => {
+    /* istanbul ignore else */
+    if (_events.default.isEscKey(e)) {
+      setOpen(false);
+      focusButton();
+    }
+  }, [setOpen, focusButton]);
+  (0, _useModalManager.default)(isOpen, handleEscapeKey, buttonRef);
   (0, _react.useEffect)(() => {
     const handler = ({
       target

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "115.0.0",
+  "version": "115.0.1",
   "description": "A library of reusable React components for easily building user interfaces.",
   "files": [
     "lib",