carbon-react 119.6.0 → 119.6.1

package/esm/__internal__/focus-trap/focus-trap.component.js

@@ -97,8 +97,8 @@ const FocusTrap = _ref => {
   }, [trapWrappers]);
   useEffect(() => {
     const trapFn = ev => {
-      // block focus trap from working if it's not the topmost trap
-      if (!isTopModal) {
+      // block focus trap from working if it's not the topmost trap, or is currently closed
+      if (!isTopModal || !isOpen) {
         return;
       }
       const focusableElements = getFocusableElements(defaultFocusableSelectors);
@@ -108,7 +108,7 @@ const FocusTrap = _ref => {
     return function cleanup() {
       document.removeEventListener("keydown", trapFn, true);
     };
-  }, [bespokeTrap, wrapperRef, focusableSelectors, getFocusableElements, isTopModal]);
+  }, [bespokeTrap, wrapperRef, focusableSelectors, getFocusableElements, isTopModal, isOpen]);
   const updateCurrentFocusedElement = useCallback(() => {
     const focusableElements = getFocusableElements(focusableSelectors || defaultFocusableSelectors);
     const element = focusableElements?.find(el => el === document.activeElement);
@@ -163,13 +163,13 @@ const FocusTrap = _ref => {
   });
   return /*#__PURE__*/React.createElement("div", {
     ref: trapRef
-  }, /*#__PURE__*/React.createElement("div", {
+  }, isOpen && /*#__PURE__*/React.createElement("div", {
     "data-element": TAB_GUARD_TOP
     // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
     ,
     tabIndex: 0,
     onFocus: onTabGuardTopFocus(wrapperRef)
-  }), clonedChildren, /*#__PURE__*/React.createElement("div", {
+  }), clonedChildren, isOpen && /*#__PURE__*/React.createElement("div", {
     "data-element": TAB_GUARD_BOTTOM
     // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
     ,

package/lib/__internal__/focus-trap/focus-trap.component.js

@@ -107,8 +107,8 @@ const FocusTrap = _ref => {
   }, [trapWrappers]);
   (0, _react.useEffect)(() => {
     const trapFn = ev => {
-      // block focus trap from working if it's not the topmost trap
-      if (!isTopModal) {
+      // block focus trap from working if it's not the topmost trap, or is currently closed
+      if (!isTopModal || !isOpen) {
         return;
       }
       const focusableElements = getFocusableElements(_focusTrapUtils.defaultFocusableSelectors);
@@ -118,7 +118,7 @@ const FocusTrap = _ref => {
     return function cleanup() {
       document.removeEventListener("keydown", trapFn, true);
     };
-  }, [bespokeTrap, wrapperRef, focusableSelectors, getFocusableElements, isTopModal]);
+  }, [bespokeTrap, wrapperRef, focusableSelectors, getFocusableElements, isTopModal, isOpen]);
   const updateCurrentFocusedElement = (0, _react.useCallback)(() => {
     const focusableElements = getFocusableElements(focusableSelectors || _focusTrapUtils.defaultFocusableSelectors);
     const element = focusableElements?.find(el => el === document.activeElement);
@@ -173,13 +173,13 @@ const FocusTrap = _ref => {
   });
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: trapRef
-  }, /*#__PURE__*/_react.default.createElement("div", {
+  }, isOpen && /*#__PURE__*/_react.default.createElement("div", {
     "data-element": TAB_GUARD_TOP
     // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
     ,
     tabIndex: 0,
     onFocus: onTabGuardTopFocus(wrapperRef)
-  }), clonedChildren, /*#__PURE__*/_react.default.createElement("div", {
+  }), clonedChildren, isOpen && /*#__PURE__*/_react.default.createElement("div", {
     "data-element": TAB_GUARD_BOTTOM
     // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
     ,

package/package.json

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