@dxc-technology/halstack-react 0.0.0-d30020b → 0.0.0-d3554d7

package/radio-group/Radio.js

@@ -28,14 +28,16 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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,
+      onClick = _ref.onClick,
       error = _ref.error,
       disabled = _ref.disabled,
       focused = _ref.focused,
-      readonly = _ref.readonly;
+      readonly = _ref.readonly,
+      tabIndex = _ref.tabIndex;
 
   var _useState = (0, _react.useState)("radio-".concat((0, _uuid.v4)())),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
@@ -43,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),
@@ -51,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) {
@@ -59,7 +67,7 @@ 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
@@ -68,28 +76,21 @@ var DxcRadio = function DxcRadio(_ref) {
     disabled: disabled,
     readonly: readonly,
     onMouseDown: function onMouseDown(event) {
-      // Prevents div's onclick from stealing the radio button's focus
+      // Prevents div's onClick from stealing the radio input's focus
       event.preventDefault();
     },
-    onClick: function onClick() {
-      var _ref$current2;
-
-      ref === null || ref === void 0 ? void 0 : (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.focus();
-
-      _onClick();
-    }
+    onClick: handleOnClick
   }, /*#__PURE__*/_react["default"].createElement(RadioInputContainer, null, /*#__PURE__*/_react["default"].createElement(RadioInput, {
     error: error,
     disabled: disabled,
     readonly: readonly,
-    onFocus: onFocus,
     role: "radio",
-    "aria-checked": checked,
-    "aria-disabled": option.disabled,
+    "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 ? 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
@@ -101,18 +102,18 @@ var DxcRadio = function DxcRadio(_ref) {
 
 var RadioMainContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\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) {
+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    ");
+  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 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  box-shadow: 0 0 0 2px transparent;\n\n  ", "\n"])), function (props) {
+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 ? "&: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        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(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  height: 10px;\n  width: 10px;\n  border-radius: 50%;\n  background-color: ", ";\n"])), function (props) {

package/radio-group/RadioGroup.js

@@ -57,7 +57,9 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
       value = _ref.value,
       onChange = _ref.onChange,
       onBlur = _ref.onBlur,
-      error = _ref.error;
+      error = _ref.error,
+      _ref$tabIndex = _ref.tabIndex,
+      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
 
   var _useState = (0, _react.useState)("radio-group-".concat((0, _uuid.v4)())),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
@@ -102,42 +104,46 @@ 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);
-    var currentValue = value !== null && value !== void 0 ? value : innerValue;
-    !optional && !Boolean(currentValue) ? onBlur === null || onBlur === void 0 ? void 0 : onBlur({
-      value: currentValue,
-      error: "This field is required. Please, choose an option."
-    }) : onBlur === null || onBlur === void 0 ? void 0 : onBlur({
-      value: currentValue
-    });
+    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: "This field is required. Please, choose an option."
+      }) : 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) {
-        var index = 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;
-        }
+      while (innerOptions[index].disabled) {
+        index = index === 0 ? innerOptions.length - 1 : index - 1;
+      }
 
-        return index;
-      });
-    }
+      handleOnChange(innerOptions[index].value);
+      return index;
+    });
   };
 
   var setNextRadioChecked = function setNextRadioChecked() {
-    if (!disabled) {
-      setCurrentFocusIndex(function (currentFocusIndex) {
-        var index = 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;
-        }
+      while (innerOptions[index].disabled) {
+        index = index === innerOptions.length - 1 ? 0 : index + 1;
+      }
 
-        return index;
-      });
-    }
+      handleOnChange(innerOptions[index].value);
+      return index;
+    });
   };
 
   var handleOnKeyDown = function handleOnKeyDown(event) {
@@ -180,6 +186,7 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
     disabled: disabled
   }, helperText), /*#__PURE__*/_react["default"].createElement(RadioGroup, {
     onBlur: handleOnBlur,
+    onFocus: handleOnFocus,
     onKeyDown: handleOnKeyDown,
     stacking: stacking,
     role: "radiogroup",
@@ -187,7 +194,8 @@ var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, re
     "aria-labelledby": radioGroupLabelId,
     "aria-invalid": error ? "true" : "false",
     "aria-errormessage": error ? errorId : undefined,
-    "aria-required": !optional
+    "aria-required": !disabled && !readonly && !optional,
+    "aria-readonly": readonly
   }, /*#__PURE__*/_react["default"].createElement(ValueInput, {
     name: name,
     value: value !== null && value !== void 0 ? value : innerValue,
@@ -201,13 +209,11 @@ 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,
-      readonly: readonly
+      readonly: readonly,
+      tabIndex: tabIndex
     });
   })), !disabled && typeof error === "string" && /*#__PURE__*/_react["default"].createElement(Error, {
     id: errorId,

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,66 +16,81 @@ 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="Label only" theme="light" level={4} />
-      <DxcRadioGroup label="Example of a label only" options={options} />
+      <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="Column" theme="light" level={4} />
-      <DxcRadioGroup label="Example" helperText="Helper text" options={options} defaultValue="3" />
+      <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="Row" theme="light" level={4} />
-      <DxcRadioGroup label="Example" helperText="Helper text" options={options} stacking="row" />
+      <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="Disabled" theme="light" level={4} />
-      <DxcRadioGroup
-        label="Disabled"
-        error="Error message"
-        helperText="Helper text"
-        options={options}
-        disabled
-        optional
-        defaultValue="2"
-      />
+      <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="Single disabled" theme="light" level={4} />
-      <DxcRadioGroup label="Disabled" helperText="Helper text" options={single_disabled_options} defaultValue="3" />
+      <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"
-        optionalItemLabel="No selection"
-        optional
-        helperText="Helper text"
-        options={options}
-        stacking="row"
-      />
+      <DxcRadioGroup label="Example" optional helperText="Helper text" options={options} stacking="row" />
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="Error" theme="light" level={4} />
-      <DxcRadioGroup
-        label="Example"
-        error="Error message"
-        helperText="Helper text"
-        options={options}
-        defaultValue="2"
-      />
+      <Title title="Disabled" theme="light" level={4} />
+      <DxcRadioGroup label="Example" helperText="Helper text" options={options} disabled />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Readonly" theme="light" level={4} />
-      <DxcRadioGroup label="Example" readonly helperText="Helper text" options={options} defaultValue="2" />
+      <DxcRadioGroup label="Example" readonly 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} />
     </ExampleContainer>
   </>
 );