@dxc-technology/halstack-react 0.0.0-ec7b867 → 0.0.0-ecc45e2

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,
@@ -57,7 +58,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),
@@ -76,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
   };
@@ -90,7 +95,6 @@ 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;
 
@@ -102,66 +106,68 @@ 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: 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) {
-        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) {
-    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 "Enter":
+      case "Space":
         event.preventDefault();
         handleOnChange(innerOptions[currentFocusIndex].value);
         break;
@@ -176,10 +182,11 @@ 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",
@@ -187,7 +194,9 @@ 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,
+    "aria-orientation": stacking === "column" ? "vertical" : "horizontal"
   }, /*#__PURE__*/_react["default"].createElement(ValueInput, {
     name: name,
     value: value !== null && value !== void 0 ? value : innerValue,
@@ -201,13 +210,12 @@ 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,
+      key: "radio-".concat(index)
     });
   })), !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,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="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="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" 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} defaultValue="3" />
+      <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="Disabled" theme="light" level={4} />
-      <DxcRadioGroup
-        label="Disabled"
-        error="Error message"
-        helperText="Helper text"
-        options={options}
-        disabled
-        optional
-        defaultValue="2"
-      />
+      <Title title="Optional" theme="light" level={4} />
+      <DxcRadioGroup label="Example" optional helperText="Helper text" options={options} stacking="row" />
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="Single disabled" theme="light" level={4} />
-      <DxcRadioGroup label="Disabled" helperText="Helper text" options={single_disabled_options} defaultValue="3" />
+      <Title title="Disabled" theme="light" level={4} />
+      <DxcRadioGroup label="Example" helperText="Helper text" options={options} disabled />
     </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="Readonly" theme="light" level={4} />
+      <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}
-        defaultValue="2"
-      />
+      <Title title="Error space reserved" theme="light" level={4} />
+      <DxcRadioGroup label="Example" error="" helperText="Helper text" options={options} />
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="Readonly" theme="light" level={4} />
-      <DxcRadioGroup label="Example" readonly helperText="Helper text" options={options} defaultValue="2" />
+      <Title title="Error" theme="light" level={4} />
+      <DxcRadioGroup label="Example" error="Error message" helperText="Helper text" options={options} />
     </ExampleContainer>
   </>
 );