carbon-react 123.11.0 → 123.11.2

package/esm/components/menu/menu-full-screen/menu-full-screen.component.js

@@ -45,7 +45,13 @@ export const MenuFullscreen = ({
       }
     }
   };
-  const filteredChildren = React.Children.toArray(children).filter(c => /*#__PURE__*/React.isValidElement(c));
+  const flattenedChildren = React.Children.toArray(children);
+  const childArray = React.Children.toArray(flattenedChildren.map((child, index) => {
+    if (index < flattenedChildren.length - 1) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, child, /*#__PURE__*/React.createElement(MenuDivider, null));
+    }
+    return child;
+  }));
   return /*#__PURE__*/React.createElement("li", {
     "aria-label": "menu-fullscreen"
   }, /*#__PURE__*/React.createElement(Portal, null, /*#__PURE__*/React.createElement(FocusTrap, {
@@ -89,6 +95,6 @@ export const MenuFullscreen = ({
       openSubmenuId: null,
       setOpenSubmenuId: /* istanbul ignore next */() => {}
     }
-  }, filteredChildren.map((child, index) => /*#__PURE__*/React.createElement(React.Fragment, null, child, index < filteredChildren.length - 1 ? /*#__PURE__*/React.createElement(MenuDivider, null) : null)))))))));
+  }, childArray)))))));
 };
 export default MenuFullscreen;

package/esm/hooks/__internal__/useModalAria/useModalAria.js

@@ -14,6 +14,12 @@ export default function useModalAria(containerRef) {
           "aria-hidden": rootElement.getAttribute("aria-hidden"),
           inert: rootElement.getAttribute("inert")
         });
+        // need to manually call the blur event on any currently-focused element that might be inside the element
+        // we're making inert, since Firefox fails to do this, which can result in the focus styles remaining on
+        // an input that is no longer focused
+        if (rootElement.contains(document.activeElement)) {
+          document.activeElement?.blur();
+        }
         rootElement.setAttribute("aria-hidden", "true");
         rootElement.setAttribute("inert", "");
       } else if (rootElement !== topModal) {

package/lib/components/menu/menu-full-screen/menu-full-screen.component.js

@@ -54,7 +54,13 @@ const MenuFullscreen = ({
       }
     }
   };
-  const filteredChildren = _react.default.Children.toArray(children).filter(c => /*#__PURE__*/_react.default.isValidElement(c));
+  const flattenedChildren = _react.default.Children.toArray(children);
+  const childArray = _react.default.Children.toArray(flattenedChildren.map((child, index) => {
+    if (index < flattenedChildren.length - 1) {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, child, /*#__PURE__*/_react.default.createElement(_menuDivider.default, null));
+    }
+    return child;
+  }));
   return /*#__PURE__*/_react.default.createElement("li", {
     "aria-label": "menu-fullscreen"
   }, /*#__PURE__*/_react.default.createElement(_portal.default, null, /*#__PURE__*/_react.default.createElement(_focusTrap.default, {
@@ -98,7 +104,7 @@ const MenuFullscreen = ({
       openSubmenuId: null,
       setOpenSubmenuId: /* istanbul ignore next */() => {}
     }
-  }, filteredChildren.map((child, index) => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, child, index < filteredChildren.length - 1 ? /*#__PURE__*/_react.default.createElement(_menuDivider.default, null) : null)))))))));
+  }, childArray)))))));
 };
 exports.MenuFullscreen = MenuFullscreen;
 var _default = MenuFullscreen;

package/lib/hooks/__internal__/useModalAria/useModalAria.js

@@ -21,6 +21,12 @@ function useModalAria(containerRef) {
           "aria-hidden": rootElement.getAttribute("aria-hidden"),
           inert: rootElement.getAttribute("inert")
         });
+        // need to manually call the blur event on any currently-focused element that might be inside the element
+        // we're making inert, since Firefox fails to do this, which can result in the focus styles remaining on
+        // an input that is no longer focused
+        if (rootElement.contains(document.activeElement)) {
+          document.activeElement?.blur();
+        }
         rootElement.setAttribute("aria-hidden", "true");
         rootElement.setAttribute("inert", "");
       } else if (rootElement !== topModal) {

package/package.json

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