@thecb/components 9.2.10-beta.1 → 9.2.10-beta.3

package/dist/index.cjs.js

@@ -45767,9 +45767,7 @@ var Modal$1 = function Modal(_ref) {
       _ref$dataQa = _ref.dataQa,
       dataQa = _ref$dataQa === void 0 ? null : _ref$dataQa,
       _ref$initialFocusSele = _ref.initialFocusSelector,
-      initialFocusSelector = _ref$initialFocusSele === void 0 ? "" : _ref$initialFocusSele,
-      _ref$modalName = _ref.modalName,
-      modalName = _ref$modalName === void 0 ? "" : _ref$modalName;
+      initialFocusSelector = _ref$initialFocusSele === void 0 ? "" : _ref$initialFocusSele;
 
   var _useContext = React.useContext(styled.ThemeContext),
       isMobile = _useContext.isMobile;
@@ -45798,8 +45796,9 @@ var Modal$1 = function Modal(_ref) {
     },
     underlayClickExits: underlayClickExits,
     "aria-modal": true,
-    "aria-name": !!modalName.length ? modalName : modalHeaderText,
-    initialFocus: initialFocusSelector
+    initialFocus: initialFocusSelector,
+    focusDialog: !initialFocusSelector // Focus the dialogue box itself if no selector for initial focus was provided
+
   }, /*#__PURE__*/React__default.createElement(Box, {
     padding: "0",
     borderRadius: "2px",
@@ -47729,7 +47728,8 @@ var AccountAndRoutingModal = function AccountAndRoutingModal(_ref) {
     continueAction: function continueAction() {
       toggleAccepted(true);
       toggleOpen(false);
-    }
+    },
+    initialFocusSelector: "[name='Close']"
   }, /*#__PURE__*/React__default.createElement(Text$1, {
     variant: "pS",
     onClick: function onClick() {
@@ -47989,9 +47989,7 @@ var TermsAndConditions = function TermsAndConditions(_ref) {
       rest = _objectWithoutProperties(_ref, _excluded$y);
 
   var TermsAndConditionsControl = version === "v1" ? TermsAndConditionsControlV1 : TermsAndConditionsControlV2;
-  return /*#__PURE__*/React__default.createElement(TermsAndConditionsControl, _extends({
-    initialFocusSelector: "[role='button']:not(.modal-trigger)"
-  }, rest));
+  return /*#__PURE__*/React__default.createElement(TermsAndConditionsControl, rest);
 };
 
 var PaymentFormACH = function PaymentFormACH(_ref) {
@@ -48173,7 +48171,8 @@ var PaymentFormACH = function PaymentFormACH(_ref) {
     version: "v2",
     showCheckbox: false,
     description: "View",
-    terms: termsContent
+    terms: termsContent,
+    initialFocusSelector: ".modal-close-button"
   })))));
 };
 
@@ -48369,7 +48368,8 @@ var PaymentFormCard = function PaymentFormCard(_ref) {
     version: "v2",
     showCheckbox: false,
     description: "View",
-    terms: termsContent
+    terms: termsContent,
+    initialFocusSelector: ".modal-close-button"
   })))));
 };