carbon-react 119.9.2 → 119.10.0

package/lib/hooks/__internal__/useMenuKeyboardNavigation/useMenuKeyboardNavigation.js

@@ -9,8 +9,7 @@ var _events = _interopRequireDefault(require("../../../__internal__/utils/helper
 var _focusTrapUtils = require("../../../__internal__/focus-trap/focus-trap-utils");
 var _useModalManager = _interopRequireDefault(require("../useModalManager"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-var _default = (mainControlRef, childrenRefs, hide, isOpen) => {
-  const childrenLength = (0, _react.useMemo)(() => childrenRefs.length, [childrenRefs]);
+var _default = (mainControlRef, getButtonChildren, hide, isOpen) => {
   const refocusMainControl = (0, _react.useCallback)(() => {
     hide();
     mainControlRef.current?.focus();
@@ -33,8 +32,10 @@ var _default = (mainControlRef, childrenRefs, hide, isOpen) => {
     if (!(_events.default.isEnterKey(ev) || _events.default.isSpaceKey(ev))) {
       ev.preventDefault();
     }
-    const currentIndex = childrenRefs?.findIndex(node => node.current === document.activeElement);
+    const buttonChildren = getButtonChildren();
+    const childrenLength = buttonChildren?.length;
     let nextIndex = -1;
+    const currentIndex = Array.from(buttonChildren).indexOf(document.activeElement);
     const arrowModifierPressed = ev.ctrlKey || ev.metaKey;
     if (_events.default.isEndKey(ev) || arrowModifierPressed && _events.default.isDownKey(ev)) {
       nextIndex = childrenLength - 1;
@@ -61,16 +62,16 @@ var _default = (mainControlRef, childrenRefs, hide, isOpen) => {
         const elements = Array.from(document.querySelectorAll(_focusTrapUtils.defaultFocusableSelectors)).filter(el => Number(el.tabIndex) !== -1);
         const indexOf = elements.indexOf(mainControlRef.current);
         elements[indexOf + 1]?.focus();
-        // // timeout enforces that the "hide" method will be run after browser focuses on the next element
+        // timeout enforces that the "hide" method will be run after browser focuses on the next element
         setTimeout(hide, 0);
       } else {
         nextIndex = currentIndex + 1;
       }
     }
     if (nextIndex > -1) {
-      childrenRefs[nextIndex].current?.focus();
+      buttonChildren?.[nextIndex]?.focus();
     }
-  }, [childrenLength, hide, refocusMainControl, childrenRefs, mainControlRef]);
+  }, [hide, refocusMainControl, mainControlRef, getButtonChildren]);
   return handleKeyDown;
 };
 exports.default = _default;

package/package.json

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