@dxc-technology/halstack-react 0.0.0-c1253f5 → 0.0.0-c1a6e05

package/quick-nav/QuickNav.stories.tsx

@@ -5,39 +5,74 @@ import DxcHeading from "../heading/Heading";
 import DxcParagraph from "../paragraph/Paragraph";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "QuickNav",
   component: DxcQuickNav,
 };
 
+const opinionatedTheme = {
+  quickNav: {
+    fontColor: "#666666",
+    accentColor: "#9a6bb2",
+  },
+};
+
+const defaultLinks = [
+  {
+    label: "Overview",
+  },
+  {
+    label: "Principles",
+    links: [{ label: "Color" }, { label: "Spacing" }, { label: "Typography" }],
+  },
+  {
+    label: "Components",
+    links: [
+      {
+        label: "Accordion",
+      },
+      {
+        label: "Button",
+      },
+    ],
+  },
+];
+
 const links = [
   {
     label: "Overview",
-    id: "overview",
     links: [
       {
         label: "Introduction",
-        id: "introduction",
+      },
+    ],
+  },
+  {
+    label: "Components",
+    links: [
+      {
+        label: "Introduction",
+      },
+      {
+        label: "Accordion",
       },
     ],
   },
   {
     label: "Principles very very very very very very very very long",
-    id: "principles",
     links: [
-      { label: "Color very very very very very very very very long", id: "color" },
-      { label: "Spacingveryveryveryveryveryveryveryverylong", id: "spacing" },
-      { label: "Typography", id: "typography" },
+      { label: "Color very very very very very very very very long" },
+      { label: "Spacingveryveryveryveryveryveryveryverylong" },
+      { label: "Typography" },
     ],
   },
   {
     label: "Componentsveryveryveryveryveryveryveryverylong",
-    id: "components",
     links: [
       {
         label: "Accordion",
-        id: "accordion",
       },
     ],
   },
@@ -48,19 +83,25 @@ export const Chromatic = () => (
     <ExampleContainer>
       <Title title="Default" level={4} />
       <QuickNavContainer>
-        <DxcQuickNav links={links}></DxcQuickNav>
+        <DxcQuickNav links={defaultLinks} />
+      </QuickNavContainer>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Text overflow" level={4} />
+      <QuickNavContainer>
+        <DxcQuickNav links={links} />
       </QuickNavContainer>
     </ExampleContainer>
     <ExampleContainer pseudoState="pseudo-hover">
       <Title title="Link hovered" level={4} />
       <QuickNavContainer>
-        <DxcQuickNav links={links}></DxcQuickNav>
+        <DxcQuickNav links={links} />
       </QuickNavContainer>
     </ExampleContainer>
     <ExampleContainer pseudoState="pseudo-focus">
       <Title title="Link focus" level={4} />
       <QuickNavContainer>
-        <DxcQuickNav links={links}></DxcQuickNav>
+        <DxcQuickNav links={links} />
       </QuickNavContainer>
     </ExampleContainer>
     <ExampleContainer>
@@ -87,7 +128,7 @@ export const Chromatic = () => (
               open source design system for insurance products and digital experiences. Our system provides all the
               tools and resources needed to create superior, beautiful but above all, functional user experiences.
             </DxcParagraph>
-            <Content id="introduction">
+            <Content id="overview-introduction">
               <DxcHeading level={2} text="Introduction" margin={{ top: "xsmall", bottom: "xsmall" }} />
               <DxcParagraph>
                 Design principles Halstack design principles are the fundamental part of DXC Technology's approach to
@@ -122,9 +163,54 @@ export const Chromatic = () => (
               </DxcParagraph>
             </Content>
           </Content>
-          <Content id="principles">
+          <Content id="components">
+            <DxcHeading level={1} text="Components" margin={{ top: "small", bottom: "xsmall" }} />
+            <Content id="components-introduction">
+              <DxcHeading level={2} text="Introduction" margin={{ top: "xsmall", bottom: "xsmall" }} />
+              <DxcParagraph>
+                Design principles Halstack design principles are the fundamental part of DXC Technology's approach to
+                provide guidance for development teams in order to deliver delightful and consistent user experiences to
+                our customers: Balance Consistency Visual hierarchy All our components, design tokens, accessibility
+                guidelines, responsive design techniques, and layout proposals have been carefully curated by DXC design
+                and engineering teams with the objective of creating a unique visual language and ecosystem for our
+                applications. This is the DXC way of creating User Experiences. Open Source Halstack is an open source
+                design system, this means that we work towards DXC Technology bussines needs, but it is open for anyone
+                to use and contribute back to. We are charmed to receive external contributions to help us find bugs,
+                design new features, or help us improve the project documentation. If you're interested, definitely
+                check out our contribution guidelines.Design principles Halstack design principles are the fundamental
+                part of DXC Technology's approach to provide guidance for development teams in order to deliver
+                delightful and consistent user experiences to our customers: Balance Consistency Visual hierarchy All
+                our components, design tokens, accessibility guidelines, responsive design techniques, and layout
+                proposals have been carefully curated by DXC design and engineering teams with the objective of creating
+                a unique visual language and ecosystem for our applications. This is the DXC way of creating User
+                Experiences. Open Source Halstack is an open source design system, this means that we work towards DXC
+                Technology bussines needs, but it is open for anyone to use and contribute back to. We are charmed to
+                receive external contributions to help us find bugs, design new features, or help us improve the project
+                documentation. If you're interested, definitely check out our contribution guidelines.Design principles
+                Halstack design principles are the fundamental part of DXC Technology's approach to provide guidance for
+                development teams in order to deliver delightful and consistent user experiences to our customers:
+                Balance Consistency Visual hierarchy All our components, design tokens, accessibility guidelines,
+                responsive design techniques, and layout proposals have been carefully curated by DXC design and
+                engineering teams with the objective of creating a unique visual language and ecosystem for our
+                applications. This is the DXC way of creating User Experiences. Open Source Halstack is an open source
+                design system, this means that we work towards DXC Technology bussines needs, but it is open for anyone
+                to use and contribute back to. We are charmed to receive external contributions to help us find bugs,
+                design new features, or help us improve the project documentation. If you're interested, definitely
+                check out our contribution guidelines.
+              </DxcParagraph>
+            </Content>
+            <Content id="components-accordion">
+              <DxcHeading level={2} text="Accordion" margin={{ top: "xsmall", bottom: "xsmall" }} />
+              <DxcParagraph>
+                Accordions are used to group similar content and hide or show it depending on user needs or preferences.
+                Accordions give users more granular control over the interface and help digest content in stages, rather
+                than all at once.
+              </DxcParagraph>
+            </Content>
+          </Content>
+          <Content id="principles-very-very-very-very-very-very-very-very-long">
             <DxcHeading level={1} text="Principles" margin={{ top: "small", bottom: "xsmall" }} />
-            <Content id="color">
+            <Content id="principles-very-very-very-very-very-very-very-very-long-color-very-very-very-very-very-very-very-very-long">
               <DxcHeading level={2} text="Color" margin={{ top: "xsmall", bottom: "xsmall" }} />
               <DxcParagraph>
                 The color palette is an essential asset as a communication resource of our design system. Halstack color
@@ -161,7 +247,7 @@ export const Chromatic = () => (
                 role-based color palettes and must not be used outside this context.
               </DxcParagraph>
             </Content>
-            <Content id="spacing">
+            <Content id="principles-very-very-very-very-very-very-very-very-long-spacingveryveryveryveryveryveryveryverylong">
               <DxcHeading level={2} text="Spacing" margin={{ top: "xsmall", bottom: "xsmall" }} />
               <DxcParagraph>
                 In the search of consistent alignment between the elements we provide a spacing scale based on a root
@@ -183,7 +269,7 @@ export const Chromatic = () => (
                 easily multiplied, they provide flexible and consistent, yet distinct enough, steps between them.
               </DxcParagraph>
             </Content>
-            <Content id="typography">
+            <Content id="principles-very-very-very-very-very-very-very-very-long-typography">
               <DxcHeading level={2} text="Typography" margin={{ top: "xsmall", bottom: "xsmall" }} />
               <DxcParagraph>
                 Our selected typography helps in structuring our user's experience based on the visual impact that it
@@ -220,9 +306,9 @@ export const Chromatic = () => (
               </DxcParagraph>
             </Content>
           </Content>
-          <Content id="components">
+          <Content id="componentsveryveryveryveryveryveryveryverylong">
             <DxcHeading level={1} text="Components" margin={{ top: "small", bottom: "xsmall" }} />
-            <Content id="accordion">
+            <Content id="componentsveryveryveryveryveryveryveryverylong-accordion">
               <DxcHeading level={2} text="Accordion" margin={{ top: "xsmall", bottom: "xsmall" }} />
               <DxcParagraph>
                 Accordions are used to group similar content and hide or show it depending on user needs or preferences.
@@ -233,10 +319,16 @@ export const Chromatic = () => (
           </Content>
         </ContentContainer>
         <QuickNavContainer>
-          <DxcQuickNav title="Sections" links={links}></DxcQuickNav>
+          <DxcQuickNav title="Sections" links={links} />
         </QuickNavContainer>
       </Container>
     </ExampleContainer>
+    <Title title="Opinionated theme" level={2} />
+    <ExampleContainer>
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcQuickNav links={defaultLinks} />
+      </HalstackProvider>
+    </ExampleContainer>
   </>
 );
 

package/radio-group/Radio.d.ts

@@ -1,4 +1,4 @@
 import React from "react";
 import { RadioProps } from "./types";
-declare const _default: React.MemoExoticComponent<({ option, currentValue, onClick, error, disabled, focused, readonly, tabIndex, }: RadioProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ label, checked, onClick, error, disabled, focused, readonly, tabIndex, }: RadioProps) => JSX.Element>;
 export default _default;

package/radio-group/Radio.js

@@ -21,17 +21,17 @@ var _uuid = require("uuid");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
+var _Flex = _interopRequireDefault(require("../flex/Flex"));
+
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
 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,
+  var label = _ref.label,
+      checked = _ref.checked,
       onClick = _ref.onClick,
       error = _ref.error,
       disabled = _ref.disabled,
@@ -50,7 +50,7 @@ var DxcRadio = function DxcRadio(_ref) {
     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());
+    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),
@@ -58,7 +58,7 @@ var DxcRadio = function DxcRadio(_ref) {
       firstUpdate = _useState4[0],
       setFirstUpdate = _useState4[1];
 
-  (0, _react.useLayoutEffect)(function () {
+  (0, _react.useEffect)(function () {
     var _ref$current2;
 
     // Don't apply in the first render
@@ -71,56 +71,59 @@ var DxcRadio = function DxcRadio(_ref) {
   }, [focused]);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.radioGroup
-  }, /*#__PURE__*/_react["default"].createElement(RadioMainContainer, null, /*#__PURE__*/_react["default"].createElement(RadioContainer, {
+  }, /*#__PURE__*/_react["default"].createElement(_Flex["default"], 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
+    onClick: disabled ? undefined : handleOnClick
   }, /*#__PURE__*/_react["default"].createElement(RadioInputContainer, null, /*#__PURE__*/_react["default"].createElement(RadioInput, {
     error: error,
     disabled: disabled,
     readonly: readonly,
     role: "radio",
-    "aria-checked": option.value === currentValue,
-    "aria-disabled": (_option$disabled = option.disabled) !== null && _option$disabled !== void 0 ? _option$disabled : false,
+    "aria-checked": checked,
+    "aria-disabled": disabled,
     "aria-labelledby": radioLabelId,
     tabIndex: disabled ? -1 : focused ? tabIndex : -1,
     ref: ref
-  }, option.value === currentValue && /*#__PURE__*/_react["default"].createElement(Dot, {
+  }, checked && /*#__PURE__*/_react["default"].createElement(Dot, {
     disabled: disabled,
     readonly: readonly,
     error: error
   }))), /*#__PURE__*/_react["default"].createElement(Label, {
     id: radioLabelId,
     disabled: disabled
-  }, option.label))));
+  }, label))));
 };
 
-var RadioMainContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n"])));
+var getRadioInputStateColor = function getRadioInputStateColor(props, state) {
+  switch (state) {
+    case "enabled":
+      return props.disabled ? props.theme.disabledRadioInputColor : props.error ? props.theme.errorRadioInputColor : props.readonly ? props.theme.readonlyRadioInputColor : props.theme.radioInputColor;
 
-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;";
-});
+    case "hover":
+      return props.error ? props.theme.hoverErrorRadioInputColor : props.readonly ? props.theme.hoverReadonlyRadioInputColor : props.theme.hoverRadioInputColor;
 
-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"])));
+    case "active":
+      return props.error ? props.theme.activeErrorRadioInputColor : props.readonly ? props.theme.activeReadonlyRadioInputColor : props.theme.activeRadioInputColor;
+  }
+};
 
-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;
+var RadioInputContainer = _styledComponents["default"].span(_templateObject || (_templateObject = (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"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  width: 18px;\n  height: 18px;\n  border: 2px solid ", ";\n  border-radius: 50%;\n\n  &:focus {\n    outline: 2px solid ", ";\n    outline-offset: 1px;\n  }\n  ", "\n"])), function (props) {
+  return getRadioInputStateColor(props, "enabled");
+}, function (props) {
+  return props.theme.focusBorderColor;
 }, function (props) {
-  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    ";
+  return props.disabled && "pointer-events: none;";
 });
 
-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 Dot = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  height: 10px;\n  width: 10px;\n  border-radius: 50%;\n  background-color: ", ";\n"])), function (props) {
+  return getRadioInputStateColor(props, "enabled");
 });
 
-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) {
+var Label = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (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;
@@ -133,7 +136,19 @@ var Label = _styledComponents["default"].span(_templateObject6 || (_templateObje
 }, function (props) {
   return props.theme.radioInputLabelLineHeight;
 }, function (props) {
-  return props.disabled ? "color: ".concat(props.theme.disabledRadioInputLabelFontColor, "; pointer-events: none;") : "color: ".concat(props.theme.radioInputLabelFontColor);
+  return props.disabled ? "color: ".concat(props.theme.disabledRadioInputLabelFontColor, ";") : "color: ".concat(props.theme.radioInputLabelFontColor);
+});
+
+var RadioContainer = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  cursor: ", ";\n\n  &:hover {\n    ", " {\n      border-color: ", ";\n    }\n    ", " {\n      background-color: ", ";\n    }\n  }\n  &:active {\n    ", " {\n      border-color: ", ";\n    }\n    ", " {\n      background-color: ", ";\n    }\n  }\n"])), function (props) {
+  return props.disabled ? "not-allowed" : props.readonly ? "default" : "pointer";
+}, RadioInput, function (props) {
+  return !props.disabled && getRadioInputStateColor(props, "hover");
+}, Dot, function (props) {
+  return !props.disabled && getRadioInputStateColor(props, "hover");
+}, RadioInput, function (props) {
+  return !props.disabled && getRadioInputStateColor(props, "active");
+}, Dot, function (props) {
+  return !props.disabled && getRadioInputStateColor(props, "active");
 });
 
 var _default = /*#__PURE__*/_react["default"].memo(DxcRadio);

package/radio-group/RadioGroup.js

@@ -41,6 +41,8 @@ var getInitialFocusIndex = function getInitialFocusIndex(innerOptions, value) {
 };
 
 var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
+  var _ref2;
+
   var label = _ref.label,
       name = _ref.name,
       helperText = _ref.helperText,
@@ -81,14 +83,13 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
 
   var colorsTheme = (0, _useTheme["default"])();
   var translatedLabels = (0, _useTranslatedLabels["default"])();
-  var optionalItem = {
-    label: optionalItemLabel || translatedLabels.radioGroup.optionalItemLabelDefault,
-    value: "",
-    disabled: disabled
-  };
   var innerOptions = (0, _react.useMemo)(function () {
-    return optional ? [].concat((0, _toConsumableArray2["default"])(options), [optionalItem]) : options;
-  }, [optional, options]);
+    return optional ? [].concat((0, _toConsumableArray2["default"])(options), [{
+      label: optionalItemLabel !== null && optionalItemLabel !== void 0 ? optionalItemLabel : translatedLabels.radioGroup.optionalItemLabelDefault,
+      value: "",
+      disabled: disabled
+    }]) : options;
+  }, [optional, options, optionalItemLabel, translatedLabels]);
 
   var _useState7 = (0, _react.useState)(getInitialFocusIndex(innerOptions, value !== null && value !== void 0 ? value : innerValue)),
       _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
@@ -102,11 +103,11 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
       value !== null && value !== void 0 ? value : setInnerValue(newValue);
       onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     }
-  }, [value, innerValue, setInnerValue, onChange]);
+  }, [value, innerValue, onChange]);
 
-  var handleOnBlur = function handleOnBlur(e) {
+  var handleOnBlur = function handleOnBlur(event) {
     // If the radio group loses the focus to an element not contained inside it...
-    if (!e.currentTarget.contains(e.relatedTarget)) {
+    if (!event.currentTarget.contains(event.relatedTarget)) {
       setFirstTimeFocus(true);
       var currentValue = value !== null && value !== void 0 ? value : innerValue;
       !optional && !Boolean(currentValue) ? onBlur === null || onBlur === void 0 ? void 0 : onBlur({
@@ -149,27 +150,24 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
   };
 
   var handleOnKeyDown = function handleOnKeyDown(event) {
-    switch (event.keyCode) {
-      case 37: // arrow left
-
-      case 38:
-        // arrow up
+    switch (event.key) {
+      case "Left":
+      case "ArrowLeft":
+      case "Up":
+      case "ArrowUp":
         event.preventDefault();
         setPreviousRadioChecked();
         break;
 
-      case 39: // arrow right
-
-      case 40:
-        // arrow down
+      case "Right":
+      case "ArrowRight":
+      case "Down":
+      case "ArrowDown":
         event.preventDefault();
         setNextRadioChecked();
         break;
 
-      case 13: // enter
-
-      case 32:
-        // space
+      case " ":
         event.preventDefault();
         handleOnChange(innerOptions[currentFocusIndex].value);
         break;
@@ -184,7 +182,7 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
     id: radioGroupLabelId,
     helperText: helperText,
     disabled: disabled
-  }, label, " ", optional && /*#__PURE__*/_react["default"].createElement(OptionalLabel, null, translatedLabels.formFields.optionalLabel)), helperText && /*#__PURE__*/_react["default"].createElement(HelperText, {
+  }, label, optional && /*#__PURE__*/_react["default"].createElement(OptionalLabel, null, " ".concat(translatedLabels.formFields.optionalLabel))), helperText && /*#__PURE__*/_react["default"].createElement(HelperText, {
     disabled: disabled
   }, helperText), /*#__PURE__*/_react["default"].createElement(RadioGroup, {
     onBlur: handleOnBlur,
@@ -194,20 +192,21 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
     role: "radiogroup",
     "aria-disabled": disabled,
     "aria-labelledby": radioGroupLabelId,
-    "aria-invalid": error ? "true" : "false",
+    "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,
-    readOnly: true,
-    "aria-hidden": "true"
+    disabled: disabled,
+    value: (_ref2 = value !== null && value !== void 0 ? value : innerValue) !== null && _ref2 !== void 0 ? _ref2 : "",
+    readOnly: true
   }), innerOptions.map(function (option, index) {
     return /*#__PURE__*/_react["default"].createElement(_Radio["default"], {
-      option: option,
-      currentValue: value !== null && value !== void 0 ? value : innerValue,
+      key: "radio-".concat(index),
+      label: option.label,
+      checked: (value !== null && value !== void 0 ? value : innerValue) === option.value,
       onClick: function onClick() {
         handleOnChange(option.value);
         setCurrentFocusIndex(index);
@@ -216,8 +215,7 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
       disabled: option.disabled || disabled,
       focused: currentFocusIndex === index,
       readonly: readonly,
-      tabIndex: tabIndex,
-      key: "radio-".concat(index)
+      tabIndex: tabIndex
     });
   })), !disabled && typeof error === "string" && /*#__PURE__*/_react["default"].createElement(Error, {
     id: errorId,
@@ -225,7 +223,7 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
   }, error)));
 });
 
-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 RadioGroupContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: inline-flex;\n  flex-direction: column;\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;
@@ -263,7 +261,7 @@ var HelperText = _styledComponents["default"].span(_templateObject4 || (_templat
   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  row-gap: ", ";\n  column-gap: ", ";\n"])), function (props) {
+var RadioGroup = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  flex-direction: ", ";\n  row-gap: ", ";\n  column-gap: ", ";\n"])), function (props) {
   return props.stacking;
 }, function (props) {
   return props.theme.groupVerticalGutter;