@dxc-technology/halstack-react 0.0.0-f4755a1 → 0.0.0-f53e801

package/radio-group/RadioGroup.js

@@ -11,6 +11,8 @@ exports["default"] = void 0;
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -21,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;
@@ -29,6 +33,13 @@ 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 getInitialFocusIndex = function getInitialFocusIndex(innerOptions, value) {
+  var initialSelectedOptionIndex = innerOptions.findIndex(function (option) {
+    return option.value === value;
+  });
+  return initialSelectedOptionIndex !== -1 ? initialSelectedOptionIndex : 0;
+};
+
 var DxcRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   var label = _ref.label,
       name = _ref.name,
@@ -38,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 ? "None" : _ref$optionalItemLabe,
+      optionalItemLabel = _ref.optionalItemLabel,
       _ref$readonly = _ref.readonly,
       readonly = _ref$readonly === void 0 ? false : _ref$readonly,
       _ref$stacking = _ref.stacking,
@@ -47,30 +57,123 @@ 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),
       innerValue = _useState4[0],
       setInnerValue = _useState4[1];
 
+  var _useState5 = (0, _react.useState)(true),
+      _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
+      firstTimeFocus = _useState6[0],
+      setFirstTimeFocus = _useState6[1];
+
   var colorsTheme = (0, _useTheme["default"])();
-  var handleOnChange = (0, _react.useCallback)(function (optionValue) {
-    var val = value !== null && value !== void 0 ? value : innerValue;
+  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]);
 
-    if (optionValue !== val) {
-      value !== null && value !== void 0 ? value : setInnerValue(optionValue);
-      onChange === null || onChange === void 0 ? void 0 : onChange({
-        value: optionValue
-      });
+  var _useState7 = (0, _react.useState)(getInitialFocusIndex(innerOptions, value !== null && value !== void 0 ? value : innerValue)),
+      _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
+      currentFocusIndex = _useState8[0],
+      setCurrentFocusIndex = _useState8[1];
+
+  var handleOnChange = (0, _react.useCallback)(function (newValue) {
+    var currentValue = value !== null && value !== void 0 ? value : innerValue;
+
+    if (newValue !== currentValue && !readonly) {
+      value !== null && value !== void 0 ? value : setInnerValue(newValue);
+      onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     }
   }, [value, innerValue, setInnerValue, onChange]);
+
+  var handleOnBlur = function handleOnBlur(e) {
+    // If the radio group loses the focus to an element not contained inside it...
+    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() {
+    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() {
+    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 = function handleOnKeyDown(event) {
+    switch (event.key) {
+      case "Left":
+      case "ArrowLeft":
+      case "Up":
+      case "ArrowUp":
+        event.preventDefault();
+        setPreviousRadioChecked();
+        break;
+
+      case "Right":
+      case "ArrowRight":
+      case "Down":
+      case "ArrowDown":
+        event.preventDefault();
+        setNextRadioChecked();
+        break;
+
+      case "Enter":
+      case "Space":
+        event.preventDefault();
+        handleOnChange(innerOptions[currentFocusIndex].value);
+        break;
+    }
+  };
+
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.radioGroup
   }, /*#__PURE__*/_react["default"].createElement(RadioGroupContainer, {
@@ -79,40 +182,48 @@ 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-labelledby": radioGroupLabelId
+    "aria-disabled": disabled,
+    "aria-labelledby": radioGroupLabelId,
+    "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"
-  }), options.map(function (option, index) {
+  }), innerOptions.map(function (option, index) {
     return /*#__PURE__*/_react["default"].createElement(_Radio["default"], {
       option: option,
       currentValue: value !== null && value !== void 0 ? value : innerValue,
-      onChange: handleOnChange,
-      disabledRadioGroup: disabled,
+      onClick: function onClick() {
+        handleOnChange(option.value);
+        setCurrentFocusIndex(index);
+      },
       error: error,
-      first: !value && !innerValue && index === 0
+      disabled: option.disabled || disabled,
+      focused: currentFocusIndex === index,
+      readonly: readonly,
+      tabIndex: tabIndex,
+      key: "radio-".concat(index)
     });
-  }), optional && /*#__PURE__*/_react["default"].createElement(_Radio["default"], {
-    option: {
-      label: optionalItemLabel,
-      value: "",
-      disabled: disabled
-    },
-    currentValue: value !== null && value !== void 0 ? value : innerValue,
-    onChange: handleOnChange,
-    disabledRadioGroup: disabled,
-    error: error
-  })), !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;
@@ -127,14 +238,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;
@@ -146,12 +257,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,50 +7,94 @@ export default {
   component: DxcRadioGroup,
 };
 
+const single_option = [{ label: "Option A", value: "A" }];
+
 const options = [
   { label: "Option 1", value: "1" },
   { label: "Option 2", value: "2" },
   { label: "Option 3", value: "3" },
+  { 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} />
+      <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} optional 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"
-        optionalOptionLabel="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>
   </>
 );