@thecb/components 7.0.0-beta.3 → 7.0.0-beta.6

package/dist/index.esm.js

@@ -43289,6 +43289,8 @@ var getApplicationNode = function getApplicationNode() {
 };
 
 var Modal$1 = function Modal(_ref) {
+  var _ref2, _ref3;
+
   var hideModal = _ref.hideModal,
       _ref$onExit = _ref.onExit,
       onExit = _ref$onExit === void 0 ? hideModal : _ref$onExit,
@@ -43329,12 +43331,14 @@ var Modal$1 = function Modal(_ref) {
   var _useContext = useContext(ThemeContext),
       isMobile = _useContext.isMobile;
 
+  var closeBtnRef = useRef(null);
   var bodyTextContainerRef = useRef(null);
+  debugger;
   return /*#__PURE__*/React.createElement(Fragment$1, null, modalOpen && /*#__PURE__*/React.createElement(reactAriaModal, {
-    initialFocus: bodyTextContainerRef,
+    initialFocus: (_ref2 = closeBtnRef !== null && closeBtnRef !== void 0 ? closeBtnRef : bodyTextContainerRef) !== null && _ref2 !== void 0 ? _ref2 : '#root',
     focusTrapOptions: {
-      delayInitialFocus: true,
-      fallbackFocus: bodyTextContainerRef
+      delayInitialFocus: false,
+      fallbackFocus: (_ref3 = closeBtnRef !== null && closeBtnRef !== void 0 ? closeBtnRef : bodyTextContainerRef) !== null && _ref3 !== void 0 ? _ref3 : '#root'
     } // fallback to resolve unit test errors https://github.com/focus-trap/focus-trap-react/issues/91
     ,
     onExit: onExit,
@@ -43433,6 +43437,7 @@ var Modal$1 = function Modal(_ref) {
   }))) : /*#__PURE__*/React.createElement(Box, {
     padding: "0.5rem"
   }, /*#__PURE__*/React.createElement(ButtonWithAction, {
+    ref: closeBtnRef,
     action: hideModal,
     variant: "primary",
     text: closeButtonText,