@thecb/components 8.4.10-beta.0 → 8.4.10-beta.1

package/dist/index.cjs.js

@@ -27107,9 +27107,30 @@ var RadioButtonWithLabel = function RadioButtonWithLabel(_ref5) {
       ariaInvalid = _ref5.ariaInvalid,
       themeValues = _ref5.themeValues,
       index = _ref5.index,
-      defaultChecked = _ref5.defaultChecked,
       _ref5$handleChange = _ref5.handleChange,
-      handleChange = _ref5$handleChange === void 0 ? noop : _ref5$handleChange;
+      handleChange = _ref5$handleChange === void 0 ? noop : _ref5$handleChange,
+      field = _ref5.field,
+      config = _ref5.config;
+
+  var getDefaultChecked = function getDefaultChecked(value, idx) {
+    var selectionExistsInConfig = config.map(function (c) {
+      return c.value;
+    }).includes(field.rawValue);
+
+    if (selectionExistsInConfig) {
+      if (field.rawValue === value) {
+        return true;
+      }
+    } else {
+      if (idx === 0) {
+        // fallback to first option as default selection
+        return true;
+      }
+    }
+
+    return false;
+  };
+
   return /*#__PURE__*/React__default.createElement(InputAndLabelContainer, {
     align: "center",
     childGap: "0.5rem",
@@ -27127,7 +27148,7 @@ var RadioButtonWithLabel = function RadioButtonWithLabel(_ref5) {
       setValue(e.target.value);
       handleChange(e);
     },
-    defaultChecked: defaultChecked || index === 0
+    defaultChecked: getDefaultChecked(value, index)
   }), /*#__PURE__*/React__default.createElement(Text$1, {
     as: "label",
     htmlFor: id,
@@ -49383,8 +49404,9 @@ var RadioGroup = function RadioGroup(_ref) {
       groupName: groupName,
       setValue: setValue,
       handleChange: handleChange,
-      "aria-invalid": field.dirty && field.hasErrors,
-      defaultChecked: field.rawValue
+      field: field,
+      config: config,
+      "aria-invalid": field.dirty && field.hasErrors
     }));
   })));
 };