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

package/dist/index.esm.js

@@ -27099,9 +27099,25 @@ 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 exists, selection comes from the redux-freeform state
+      return field.rawValue === value;
+    } // fallback to first option as default selection
+
+
+    return idx === 0;
+  };
+
   return /*#__PURE__*/React.createElement(InputAndLabelContainer, {
     align: "center",
     childGap: "0.5rem",
@@ -27119,7 +27135,7 @@ var RadioButtonWithLabel = function RadioButtonWithLabel(_ref5) {
       setValue(e.target.value);
       handleChange(e);
     },
-    defaultChecked: defaultChecked || index === 0
+    defaultChecked: getDefaultChecked(value, index)
   }), /*#__PURE__*/React.createElement(Text$1, {
     as: "label",
     htmlFor: id,
@@ -49375,8 +49391,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
     }));
   })));
 };