@dxc-technology/halstack-react 0.0.0-a0a27b4 → 0.0.0-a1db683

package/radio-group/Radio.js

@@ -21,20 +21,23 @@ var _uuid = require("uuid");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var DxcRadio = function DxcRadio(_ref) {
+  var _option$disabled;
+
   var option = _ref.option,
       currentValue = _ref.currentValue,
       onClick = _ref.onClick,
-      onFocus = _ref.onFocus,
       error = _ref.error,
       disabled = _ref.disabled,
-      focused = _ref.focused;
+      focused = _ref.focused,
+      readonly = _ref.readonly,
+      tabIndex = _ref.tabIndex;
 
   var _useState = (0, _react.useState)("radio-".concat((0, _uuid.v4)())),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
@@ -42,7 +45,13 @@ var DxcRadio = function DxcRadio(_ref) {
 
   var ref = (0, _react.useRef)(null);
   var colorsTheme = (0, _useTheme["default"])();
-  var checked = option.value === currentValue;
+
+  var handleOnClick = function handleOnClick() {
+    var _ref$current;
+
+    onClick();
+    focused && document.activeElement !== (ref === null || ref === void 0 ? void 0 : ref.current) && (ref === null || ref === void 0 ? void 0 : (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.focus());
+  };
 
   var _useState3 = (0, _react.useState)(true),
       _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
@@ -50,7 +59,7 @@ var DxcRadio = function DxcRadio(_ref) {
       setFirstUpdate = _useState4[1];
 
   (0, _react.useLayoutEffect)(function () {
-    var _ref$current;
+    var _ref$current2;
 
     // Don't apply in the first render
     if (firstUpdate) {
@@ -58,47 +67,62 @@ var DxcRadio = function DxcRadio(_ref) {
       return;
     }
 
-    focused && (ref === null || ref === void 0 ? void 0 : (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.focus());
+    focused && (ref === null || ref === void 0 ? void 0 : (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.focus());
   }, [focused]);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.radioGroup
-  }, /*#__PURE__*/_react["default"].createElement(RadioContainer, null, /*#__PURE__*/_react["default"].createElement(RadioInputContainer, null, /*#__PURE__*/_react["default"].createElement(RadioInput, {
+  }, /*#__PURE__*/_react["default"].createElement(RadioMainContainer, null, /*#__PURE__*/_react["default"].createElement(RadioContainer, {
+    error: error,
     disabled: disabled,
+    readonly: readonly,
+    onMouseDown: function onMouseDown(event) {
+      // Prevents div's onClick from stealing the radio input's focus
+      event.preventDefault();
+    },
+    onClick: handleOnClick
+  }, /*#__PURE__*/_react["default"].createElement(RadioInputContainer, null, /*#__PURE__*/_react["default"].createElement(RadioInput, {
     error: error,
-    onClick: onClick,
-    onFocus: onFocus,
+    disabled: disabled,
+    readonly: readonly,
     role: "radio",
-    "aria-checked": checked,
+    "aria-checked": option.value === currentValue,
+    "aria-disabled": (_option$disabled = option.disabled) !== null && _option$disabled !== void 0 ? _option$disabled : false,
     "aria-labelledby": radioLabelId,
-    tabIndex: disabled ? -1 : focused || checked ? 0 : -1,
+    tabIndex: disabled ? -1 : focused ? tabIndex : -1,
     ref: ref
-  }, checked && /*#__PURE__*/_react["default"].createElement(Dot, {
+  }, option.value === currentValue && /*#__PURE__*/_react["default"].createElement(Dot, {
+    disabled: disabled,
+    readonly: readonly,
     error: error
   }))), /*#__PURE__*/_react["default"].createElement(Label, {
     id: radioLabelId,
-    onMouseDown: function onMouseDown(event) {
-      event.preventDefault();
-    },
-    onClick: onClick,
     disabled: disabled
-  }, option.label)));
+  }, option.label))));
 };
 
-var RadioContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n"])));
+var RadioMainContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n"])));
 
-var RadioInputContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  height: 24px;\n  width: 24px;\n"])));
+var RadioContainer = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  cursor: ", ";\n\n  ", "\n"])), function (props) {
+  return props.disabled ? "not-allowed" : props.readonly ? "default" : "pointer";
+}, function (props) {
+  return !props.disabled ? "\n      &:hover {\n        & > div > div { \n          border-color: ".concat(props.error ? props.theme.hoverErrorRadioInputColor : props.readonly ? props.theme.hoverReadonlyRadioInputColor : props.theme.hoverRadioInputColor, ";\n          & > span {\n            background-color: ").concat(props.error ? props.theme.hoverErrorRadioInputColor : props.readonly ? props.theme.hoverReadonlyRadioInputColor : props.theme.hoverRadioInputColor, ";\n          }\n        };\n      }\n      &:active {\n        & > div > div {\n          border-color: ").concat(props.error ? props.theme.activeErrorRadioInputColor : props.readonly ? props.theme.activeReadonlyRadioInputColor : props.theme.activeRadioInputColor, ";\n          & > span {\n            background-color: ").concat(props.error ? props.theme.activeErrorRadioInputColor : props.readonly ? props.theme.activeReadonlyRadioInputColor : props.theme.activeRadioInputColor, ";\n          }\n        }\n      }\n    ") : "pointer-events: none;";
+});
 
-var RadioInput = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  box-sizing: border-box;\n  width: 18px;\n  height: 18px;\n  border: 2px solid\n    ", ";\n  border-radius: 50%;\n  box-shadow: 0 0 0 2px transparent;\n\n  ", "\n"])), function (props) {
-  return props.disabled ? props.theme.disabledRadioInputColor : props.error ? props.theme.errorRadioInputColor : props.theme.radioInputColor;
+var RadioInputContainer = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  height: 24px;\n  width: 24px;\n"])));
+
+var RadioInput = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  box-sizing: border-box;\n  width: 18px;\n  height: 18px;\n  border: 2px solid\n    ", ";\n  border-radius: 50%;\n\n  ", "\n"])), function (props) {
+  if (props.disabled) return props.theme.disabledRadioInputColor;else if (props.error) return props.theme.errorRadioInputColor;else if (props.readonly) return props.theme.readonlyRadioInputColor;else return props.theme.radioInputColor;
 }, function (props) {
-  return !props.disabled ? "\n        &:focus {\n          outline: 2px solid ".concat(props.theme.focusBorderColor, ";\n          outline-offset: 1px;\n        }\n        &:focus-visible {\n          outline: 2px solid ").concat(props.theme.focusBorderColor, ";\n          outline-offset: 1px;\n        }\n        &:hover {\n          cursor: pointer;\n          border-color: ").concat(props.error ? props.theme.hoverErrorRadioInputColor : props.theme.hoverInputColor, ";\n          & > span {\n            background-color: ").concat(props.error ? props.theme.hoverErrorRadioInputColor : props.theme.hoverInputColor, ";\n          }\n        }\n        &:active {\n          cursor: pointer;\n          border-color: ").concat(props.error ? props.theme.activeErrorInputColor : props.theme.activeInputColor, ";\n          & > span {\n            background-color: ").concat(props.error ? props.theme.activeErrorInputColor : props.theme.activeInputColor, ";\n          }\n        }\n      ") : "\n        & > span {\n          background-color: ".concat(props.theme.disabledRadioInputColor, ";\n        }\n        cursor: not-allowed;\n        pointer-events: none;\n        :focus-visible {\n          outline: none;\n        }\n      ");
+  return !props.disabled ? "&:focus {\n          outline: 2px solid ".concat(props.theme.focusBorderColor, ";\n          outline-offset: 1px;\n        }\n        &:focus-visible {\n          outline: 2px solid ").concat(props.theme.focusBorderColor, ";\n          outline-offset: 1px;\n        }\n      ") : "\n        :focus-visible {\n          outline: none;\n        }\n    ";
 });
 
-var Dot = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  height: 10px;\n  width: 10px;\n  background-color: ", ";\n  border-radius: 50%;\n"])), function (props) {
-  return props.error ? props.theme.errorRadioInputColor : props.theme.radioInputColor;
+var Dot = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  height: 10px;\n  width: 10px;\n  border-radius: 50%;\n  background-color: ", ";\n"])), function (props) {
+  if (props.disabled) return props.theme.disabledRadioInputColor;else if (props.error) return props.theme.errorRadioInputColor;else if (props.readonly) return props.theme.readonlyRadioInputColor;else return props.theme.radioInputColor;
 });
 
-var Label = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: 0.5rem;\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  ", "\n"])), function (props) {
+var Label = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  ", "\n"])), function (props) {
+  return props.theme.radioInputLabelMargin;
+}, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
   return props.theme.radioInputLabelFontSize;
@@ -109,7 +133,7 @@ var Label = _styledComponents["default"].span(_templateObject5 || (_templateObje
 }, function (props) {
   return props.theme.radioInputLabelLineHeight;
 }, function (props) {
-  return props.disabled ? "color: ".concat(props.theme.disabledRadioInputLabelFontColor, "; pointer-events: none;") : "cursor: pointer;";
+  return props.disabled ? "color: ".concat(props.theme.disabledRadioInputLabelFontColor, "; pointer-events: none;") : "color: ".concat(props.theme.radioInputLabelFontColor);
 });
 
 var _default = /*#__PURE__*/_react["default"].memo(DxcRadio);

package/radio-group/RadioGroup.js

@@ -23,6 +23,8 @@ var _uuid = require("uuid");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
+var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
+
 var _Radio = _interopRequireDefault(require("./Radio"));
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
@@ -47,8 +49,7 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
       disabled = _ref$disabled === void 0 ? false : _ref$disabled,
       _ref$optional = _ref.optional,
       optional = _ref$optional === void 0 ? false : _ref$optional,
-      _ref$optionalItemLabe = _ref.optionalItemLabel,
-      optionalItemLabel = _ref$optionalItemLabe === void 0 ? "N/A" : _ref$optionalItemLabe,
+      optionalItemLabel = _ref.optionalItemLabel,
       _ref$readonly = _ref.readonly,
       readonly = _ref$readonly === void 0 ? false : _ref$readonly,
       _ref$stacking = _ref.stacking,
@@ -56,13 +57,17 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
       defaultValue = _ref.defaultValue,
       value = _ref.value,
       onChange = _ref.onChange,
-      error = _ref.error;
+      onBlur = _ref.onBlur,
+      error = _ref.error,
+      _ref$tabIndex = _ref.tabIndex,
+      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
 
-  var _useState = (0, _react.useState)("select-".concat((0, _uuid.v4)())),
+  var _useState = (0, _react.useState)("radio-group-".concat((0, _uuid.v4)())),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
       radioGroupId = _useState2[0];
 
   var radioGroupLabelId = "label-".concat(radioGroupId);
+  var errorId = "error-".concat(radioGroupId);
 
   var _useState3 = (0, _react.useState)(defaultValue),
       _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
@@ -74,8 +79,10 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
       firstTimeFocus = _useState6[0],
       setFirstTimeFocus = _useState6[1];
 
+  var colorsTheme = (0, _useTheme["default"])();
+  var translatedLabels = (0, _useTranslatedLabels["default"])();
   var optionalItem = {
-    label: optionalItemLabel,
+    label: optionalItemLabel || translatedLabels.radioGroup.optionalItemLabelDefault,
     value: "",
     disabled: disabled
   };
@@ -88,11 +95,10 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
       currentFocusIndex = _useState8[0],
       setCurrentFocusIndex = _useState8[1];
 
-  var colorsTheme = (0, _useTheme["default"])();
   var handleOnChange = (0, _react.useCallback)(function (newValue) {
     var currentValue = value !== null && value !== void 0 ? value : innerValue;
 
-    if (newValue !== currentValue) {
+    if (newValue !== currentValue && !readonly) {
       value !== null && value !== void 0 ? value : setInnerValue(newValue);
       onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     }
@@ -100,26 +106,49 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
 
   var handleOnBlur = function handleOnBlur(e) {
     // If the radio group loses the focus to an element not contained inside it...
-    !e.currentTarget.contains(e.relatedTarget) && setFirstTimeFocus(true);
+    if (!e.currentTarget.contains(e.relatedTarget)) {
+      setFirstTimeFocus(true);
+      var currentValue = value !== null && value !== void 0 ? value : innerValue;
+      !optional && !Boolean(currentValue) ? onBlur === null || onBlur === void 0 ? void 0 : onBlur({
+        value: currentValue,
+        error: translatedLabels.formFields.requiredSelectionErrorMessage
+      }) : onBlur === null || onBlur === void 0 ? void 0 : onBlur({
+        value: currentValue
+      });
+    }
+  };
+
+  var handleOnFocus = function handleOnFocus() {
+    firstTimeFocus && setFirstTimeFocus(false);
   };
 
   var setPreviousRadioChecked = function setPreviousRadioChecked() {
-    if (!disabled) {
-      setCurrentFocusIndex(function (currentFocusIndex) {
-        return currentFocusIndex === 0 ? innerOptions.length - 1 : currentFocusIndex - 1;
-      });
-    }
+    setCurrentFocusIndex(function (currentFocusIndex) {
+      var index = currentFocusIndex === 0 ? innerOptions.length - 1 : currentFocusIndex - 1;
+
+      while (innerOptions[index].disabled) {
+        index = index === 0 ? innerOptions.length - 1 : index - 1;
+      }
+
+      handleOnChange(innerOptions[index].value);
+      return index;
+    });
   };
 
   var setNextRadioChecked = function setNextRadioChecked() {
-    if (!disabled) {
-      setCurrentFocusIndex(function (currentFocusIndex) {
-        return currentFocusIndex === innerOptions.length - 1 ? 0 : currentFocusIndex + 1;
-      });
-    }
+    setCurrentFocusIndex(function (currentFocusIndex) {
+      var index = currentFocusIndex === innerOptions.length - 1 ? 0 : currentFocusIndex + 1;
+
+      while (innerOptions[index].disabled) {
+        index = index === innerOptions.length - 1 ? 0 : index + 1;
+      }
+
+      handleOnChange(innerOptions[index].value);
+      return index;
+    });
   };
 
-  var handleOnKeyDown = (0, _react.useCallback)(function (event) {
+  var handleOnKeyDown = function handleOnKeyDown(event) {
     switch (event.keyCode) {
       case 37: // arrow left
 
@@ -136,8 +165,17 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
         event.preventDefault();
         setNextRadioChecked();
         break;
+
+      case 13: // enter
+
+      case 32:
+        // space
+        event.preventDefault();
+        handleOnChange(innerOptions[currentFocusIndex].value);
+        break;
     }
-  }, [disabled, options, setCurrentFocusIndex]);
+  };
+
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.radioGroup
   }, /*#__PURE__*/_react["default"].createElement(RadioGroupContainer, {
@@ -146,14 +184,21 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
     id: radioGroupLabelId,
     helperText: helperText,
     disabled: disabled
-  }, label, " ", optional && /*#__PURE__*/_react["default"].createElement(OptionalLabel, null, "(Optional)")), helperText && /*#__PURE__*/_react["default"].createElement(HelperText, {
+  }, label, " ", optional && /*#__PURE__*/_react["default"].createElement(OptionalLabel, null, translatedLabels.formFields.optionalLabel)), helperText && /*#__PURE__*/_react["default"].createElement(HelperText, {
     disabled: disabled
   }, helperText), /*#__PURE__*/_react["default"].createElement(RadioGroup, {
+    onBlur: handleOnBlur,
+    onFocus: handleOnFocus,
+    onKeyDown: handleOnKeyDown,
     stacking: stacking,
     role: "radiogroup",
+    "aria-disabled": disabled,
     "aria-labelledby": radioGroupLabelId,
-    onBlur: handleOnBlur,
-    onKeyDown: handleOnKeyDown
+    "aria-invalid": error ? "true" : "false",
+    "aria-errormessage": error ? errorId : undefined,
+    "aria-required": !disabled && !readonly && !optional,
+    "aria-readonly": readonly,
+    "aria-orientation": stacking === "column" ? "vertical" : "horizontal"
   }, /*#__PURE__*/_react["default"].createElement(ValueInput, {
     name: name,
     value: value !== null && value !== void 0 ? value : innerValue,
@@ -167,17 +212,19 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
         handleOnChange(option.value);
         setCurrentFocusIndex(index);
       },
-      onFocus: function onFocus() {
-        !firstTimeFocus ? handleOnChange(option.value) : setFirstTimeFocus(false);
-      },
       error: error,
       disabled: option.disabled || disabled,
-      focused: currentFocusIndex === index
+      focused: currentFocusIndex === index,
+      readonly: readonly,
+      tabIndex: tabIndex
     });
-  })), !disabled && typeof error === "string" && /*#__PURE__*/_react["default"].createElement(Error, null, error)));
+  })), !disabled && typeof error === "string" && /*#__PURE__*/_react["default"].createElement(Error, {
+    id: errorId,
+    "aria-live": error ? "assertive" : "off"
+  }, error)));
 });
 
-var RadioGroupContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  box-sizing: border-box;\n"])));
+var RadioGroupContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  flex-direction: column;\n  box-sizing: border-box;\n"])));
 
 var Label = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  ", "\n"])), function (props) {
   return props.disabled ? props.theme.disabledLabelFontColor : props.theme.labelFontColor;
@@ -192,14 +239,14 @@ var Label = _styledComponents["default"].span(_templateObject2 || (_templateObje
 }, function (props) {
   return props.theme.labelLineHeight;
 }, function (props) {
-  return !props.helperText && "margin-bottom: 0.25rem;";
+  return !props.helperText && "margin-bottom: ".concat(props.theme.groupLabelMargin);
 });
 
 var OptionalLabel = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  font-weight: ", ";\n"])), function (props) {
   return props.theme.optionalLabelFontWeight;
 });
 
-var HelperText = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  margin-bottom: 0.5rem;\n"])), function (props) {
+var HelperText = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  margin-bottom: ", ";\n"])), function (props) {
   return props.disabled ? props.theme.disabledHelperTextFontColor : props.theme.helperTextFontColor;
 }, function (props) {
   return props.theme.fontFamily;
@@ -211,12 +258,16 @@ var HelperText = _styledComponents["default"].span(_templateObject4 || (_templat
   return props.theme.helperTextFontWeight;
 }, function (props) {
   return props.theme.helperTextLineHeight;
+}, function (props) {
+  return props.theme.groupLabelMargin;
 });
 
-var RadioGroup = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  flex-direction: ", ";\n\n  div + div {\n    ", ";\n  }\n"])), function (props) {
+var RadioGroup = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  flex-direction: ", ";\n\n  row-gap: ", ";\n  column-gap: ", ";\n"])), function (props) {
   return props.stacking;
 }, function (props) {
-  return props.stacking === "column" ? "margin-top: 0.25rem;" : "margin-left: 2rem;";
+  return props.theme.groupVerticalGutter;
+}, function (props) {
+  return props.theme.groupHorizontalGutter;
 });
 
 var ValueInput = _styledComponents["default"].input(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: none;\n"])));

package/radio-group/RadioGroup.stories.tsx

@@ -7,6 +7,8 @@ export default {
   component: DxcRadioGroup,
 };
 
+const single_option = [{ label: "Option A", value: "A" }];
+
 const options = [
   { label: "Option 1", value: "1" },
   { label: "Option 2", value: "2" },
@@ -14,44 +16,85 @@ const options = [
   { label: "Option 4", value: "4" },
 ];
 
-const single_disabled_options = [
-  { label: "Option 1", value: "1" },
-  { label: "Option 2", value: "2", disabled: true },
-  { label: "Option 3", value: "3" },
-];
+const single_disabled_options = [{ label: "Option A", value: "A", disabled: true }];
 
 export const Chromatic = () => (
   <>
+    <Title title="Radio input states" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Enabled" theme="light" level={4} />
+      <DxcRadioGroup label="Example" defaultValue="A" options={single_option} />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <DxcRadioGroup label="Example" defaultValue="A" options={single_option} />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Active" theme="light" level={4} />
+      <DxcRadioGroup label="Example" defaultValue="A" options={single_option} />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused" theme="light" level={4} />
+      <DxcRadioGroup label="Example" defaultValue="A" options={single_option} />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <DxcRadioGroup label="Example" options={single_disabled_options} defaultValue="A" />
+    </ExampleContainer>
+    <Title title="Readonly radio input sub-states" theme="light" level={3} />
     <ExampleContainer>
-      <Title title="Default (column)" theme="light" level={4} />
-      <DxcRadioGroup label="Example" helperText="Helper text" options={options} defaultValue="3" />
+      <Title title="Enabled" theme="light" level={4} />
+      <DxcRadioGroup label="Example" options={single_option} defaultValue="A" readonly />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <DxcRadioGroup label="Example" options={single_option} defaultValue="A" readonly />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Active" theme="light" level={4} />
+      <DxcRadioGroup label="Example" options={single_option} defaultValue="A" readonly />
+    </ExampleContainer>
+    <Title title="Error radio input sub-states" theme="light" level={3} />
+    <ExampleContainer>
+      <Title title="Enabled" theme="light" level={4} />
+      <DxcRadioGroup label="Example" options={single_option} defaultValue="A" error="Error message" />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <DxcRadioGroup label="Example" options={single_option} defaultValue="A" readonly error="Error message" />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Active" theme="light" level={4} />
+      <DxcRadioGroup label="Example" options={single_option} defaultValue="A" readonly error="Error message" />
+    </ExampleContainer>
+    <Title title="Variants" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Column" theme="light" level={4} />
+      <DxcRadioGroup label="Example" helperText="Helper text" options={options} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Row" theme="light" level={4} />
       <DxcRadioGroup label="Example" helperText="Helper text" options={options} stacking="row" />
     </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Optional" theme="light" level={4} />
+      <DxcRadioGroup label="Example" optional helperText="Helper text" options={options} stacking="row" />
+    </ExampleContainer>
     <ExampleContainer>
       <Title title="Disabled" theme="light" level={4} />
-      <DxcRadioGroup label="Disabled" error="Error message" helperText="Helper text" options={options} disabled optional defaultValue="2" />
+      <DxcRadioGroup label="Example" helperText="Helper text" options={options} disabled />
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="Single disabled" theme="light" level={4} />
-      <DxcRadioGroup label="Disabled" helperText="Helper text" options={single_disabled_options} defaultValue="3" />
+      <Title title="Readonly" theme="light" level={4} />
+      <DxcRadioGroup label="Example" readonly helperText="Helper text" options={options} />
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="Optional" theme="light" level={4} />
-      <DxcRadioGroup
-        label="Example"
-        optionalItemLabel="No selection"
-        optional
-        helperText="Helper text"
-        options={options}
-        stacking="row"
-      />
+      <Title title="Error space reserved" theme="light" level={4} />
+      <DxcRadioGroup label="Example" error="" helperText="Helper text" options={options} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Error" theme="light" level={4} />
-      <DxcRadioGroup label="Example" error="Error message" helperText="Helper text" options={options} defaultValue="2" />
+      <DxcRadioGroup label="Example" error="Error message" helperText="Helper text" options={options} />
     </ExampleContainer>
   </>
 );