@dxc-technology/halstack-react 0.0.0-ba36a4a → 0.0.0-beebecd

package/dist/text-input/index.d.ts

@@ -0,0 +1,135 @@
+type Size = "small" | "medium" | "large" | "fillParent";
+type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+type Margin = {
+  top?: Space;
+  bottom?: Space;
+  left?: Space;
+  right?: Space;
+};
+type SVG = string | (HTMLElement & SVGElement);
+type Action = {
+  onClick: (event: React.MouseEvent<HTMLButtonElement>) => void;
+  icon: SVG;
+};
+
+type Props = {
+  /**
+   * Text to be placed above the input. This label will be used as the aria-label attribute of the list of suggestions.
+   */
+  label?: string;
+  /**
+   * Name attribute of the input element.
+   */
+  name?: string;
+  /**
+   * Value of the input. If undefined, the component will be uncontrolled and the value will be managed internally by the component.
+   */
+  value?: string;
+  /**
+   * Helper text to be placed above the input.
+   */
+  helperText?: string;
+  /**
+   * Text to be put as placeholder of the input.
+   */
+  placeholder?: string;
+  /**
+   * Action to be shown in the input. This is an object composed of an onClick function and an icon,
+   * being the latter either an inline svg or a URL to the image.
+   */
+  action?: Action;
+  /**
+   * If true, the input will have an action to clear the entered value.
+   */
+  clearable?: boolean;
+  /**
+   * If true, the component will be disabled.
+   */
+  disabled?: boolean;
+  /**
+   * If true, the input will be optional, showing '(Optional)'
+   * next to the label. Otherwise, the field will be considered required and an error will be
+   * passed as a parameter to the OnBlur and onChange functions when it has
+   * not been filled.
+   */
+  optional?: boolean;
+  /**
+   * Prefix to be placed before the input value.
+   */
+  prefix?: string;
+  /**
+   * Suffix to be placed after the input value.
+   */
+  suffix?: string;
+  /**
+   * This function will be called when the user types within the input
+   * element of the component. An object including the current value and
+   * the error (if the value entered is not valid) will be passed to this
+   * function. If there is no error, error will be null.
+   */
+  onChange?: (val: { value: string; error: string }) => void;
+  /**
+   * This function will be called when the input element loses the focus.
+   * An object including the input value and the error (if the value
+   * entered is not valid) will be passed to this function. If there is no error, 
+   * error will be null.
+   */
+  onBlur?: (obj: { value: string; error: string }) => void;
+  /**
+   * If it is defined, the component will change its appearance, showing
+   * the error below the input component. If it is not defined, the error
+   * messages will be managed internally, but never displayed on its own.
+   */
+  error?: string;
+  /**
+   * These are the options to be displayed as suggestions. It can be either an array or a function:
+   *    - Array:    Array of options that will be filtered by the component.
+   *    - Function: This function will be called when the user changes the value, we will send as a parameter the new value;
+   *                apart from that this function should return one promise on which we should make 'then' to get the suggestions filtered.
+   */
+  suggestions?: string[] | (() => void);
+  /**
+    * Regular expression that defines the valid format allowed by the input.
+    * This will be checked both when the input element loses the focus and
+    * while typing within it. If the string entered does not match the
+    * pattern, the onBlur and onChange functions will be called with the
+    * current value and an internal error informing that this value does not
+    * match the pattern. If the pattern is met, the error parameter of both
+    * events will be null.
+   */
+  pattern?: string;
+  /**
+    * Specifies the minimun and maximum length allowed by the input. 
+    * This will be checked both when the input element loses the
+    * focus and while typing within it. If the string entered does not
+    * comply the length, the onBlur and onChange functions will be called
+    * with the current value and an internal error informing that the value
+    * length does not comply the specified range. If a valid length is
+    * reached, the error parameter of both events will be null.
+   */
+  length?: { min?: number; max?: number };
+  /**
+   * HTML autocomplete attribute. Lets the user specify if any permission the user agent has to provide automated assistance in filling out the input value.
+   * Its value must be one of all the possible values of the HTML autocomplete attribute: 'on', 'off', 'email', 'username', 'new-password', ...
+   */
+  autocomplete?: string;
+  /**
+   * Size of the margin to be applied to the component ('xxsmall' | 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge' | 'xxlarge').
+   * You can pass an object with 'top', 'bottom', 'left' and 'right' properties in order to specify different margin sizes.
+   */
+  margin?: Space | Margin;
+  /**
+   * Size of the component ('small' | 'medium' | 'large' | 'fillParent').
+   */
+  size?: Size;
+  /**
+   * Value of the tabindex attribute.
+   */
+  tabIndex?: number;
+  /**
+   * Reference to the component.
+   */
+  ref?: React.RefObject<HTMLDivElement>;
+};
+
+export default function DxcTextInput(props: Props): JSX.Element;

package/dist/toggle-group/ToggleGroup.js

@@ -21,14 +21,56 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
+var _uuid = require("uuid");
+
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _variables = require("../common/variables.js");
 
 var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 
+function _templateObject9() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin-right: ", ";\n  height: 24px;\n  width: 24px;\n  overflow: hidden;\n  display: flex;\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"]);
+
+  _templateObject9 = function _templateObject9() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject8() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  height: 24px;\n  width: 24px;\n  margin-right: ", ";\n"]);
+
+  _templateObject8 = function _templateObject8() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject7() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n"]);
+
+  _templateObject7 = function _templateObject7() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject6() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n"]);
+
+  _templateObject6 = function _templateObject6() {
+    return data;
+  };
+
+  return data;
+}
+
 function _templateObject5() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  height: ", ";\n  width: ", ";\n  overflow: hidden;\n  display: flex;\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  margin-right: ", ";\n\n  ", "\n"]);
 
   _templateObject5 = function _templateObject5() {
     return data;
@@ -38,7 +80,7 @@ function _templateObject5() {
 }
 
 function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  height: ", ";\n  width: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n  opacity: 1;\n  height: calc(48px - 4px - 4px);\n  border-width: ", ";\n  border-style: ", ";\n  border-radius: ", ";\n  border-color: ", ";\n  background-color: ", ";\n  padding: 4px;\n  margin-top: ", ";\n"]);
 
   _templateObject4 = function _templateObject4() {
     return data;
@@ -48,7 +90,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  flex-direction: column;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -58,7 +100,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n\n  ", "\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -68,7 +110,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  display: flex;\n  flex-direction: row;\n  opacity: 1;\n  min-height: 40px;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -78,7 +120,9 @@ function _templateObject() {
 }
 
 var DxcToggleGroup = function DxcToggleGroup(_ref) {
-  var value = _ref.value,
+  var label = _ref.label,
+      helperText = _ref.helperText,
+      value = _ref.value,
       onChange = _ref.onChange,
       _ref$disabled = _ref.disabled,
       disabled = _ref$disabled === void 0 ? false : _ref$disabled,
@@ -96,6 +140,10 @@ var DxcToggleGroup = function DxcToggleGroup(_ref) {
       selectedValue = _useState2[0],
       setSelectedValue = _useState2[1];
 
+  var _useState3 = (0, _react.useState)("toggle-group-".concat((0, _uuid.v4)())),
+      _useState4 = (0, _slicedToArray2["default"])(_useState3, 1),
+      toggleGroupId = _useState4[0];
+
   var handleToggleChange = function handleToggleChange(selectedOption) {
     var newSelectedOptions;
 
@@ -139,9 +187,19 @@ var DxcToggleGroup = function DxcToggleGroup(_ref) {
   }, _react["default"].createElement(ToggleGroup, {
     margin: margin,
     disabled: disabled
+  }, _react["default"].createElement(Label, {
+    htmlFor: toggleGroupId,
+    disabled: disabled
+  }, label), _react["default"].createElement(HelperText, {
+    disabled: disabled
+  }, helperText), _react["default"].createElement(OptionsContainer, {
+    id: toggleGroupId,
+    role: multiple ? "group" : "radiogroup"
   }, options.map(function (option, i) {
     return _react["default"].createElement(ToggleContainer, {
       selected: multiple ? value ? value.includes(option.value) : selectedValue.includes(option.value) : value ? option.value === value : option.value === selectedValue,
+      role: multiple ? "switch" : "radio",
+      "aria-checked": multiple ? value ? value.includes(option.value) : selectedValue.includes(option.value) : value ? option.value === value : option.value === selectedValue,
       tabIndex: !disabled ? tabIndex : -1,
       onClick: function onClick() {
         return !disabled && handleToggleChange(option.value);
@@ -149,20 +207,50 @@ var DxcToggleGroup = function DxcToggleGroup(_ref) {
       isFirst: i === 0,
       isLast: i === options.length - 1,
       isIcon: option.iconSrc || option.icon,
+      optionLabel: option.label,
       disabled: disabled,
       onKeyPress: function onKeyPress(event) {
         handleKeyPress(event, option.value);
       },
       key: "toggle-".concat(i, "-").concat(option.label)
-    }, option.icon ? _react["default"].createElement(IconContainer, null, (0, _typeof2["default"])(option.icon) === "object" ? option.icon : _react["default"].createElement(option.icon)) : option.iconSrc ? _react["default"].createElement(Icon, {
-      src: option.iconSrc
-    }) : _react["default"].createElement(LabelContainer, {
-      disabled: disabled
-    }, option.label));
-  })));
+    }, _react["default"].createElement(OptionContent, null, option.icon && _react["default"].createElement(IconContainer, {
+      optionLabel: option.label
+    }, (0, _typeof2["default"])(option.icon) === "object" ? option.icon : _react["default"].createElement(option.icon)), option.iconSrc && _react["default"].createElement(Icon, {
+      src: option.iconSrc,
+      optionLabel: option.label
+    }), option.label && _react["default"].createElement(LabelContainer, null, option.label)));
+  }))));
 };
 
-var ToggleGroup = _styledComponents["default"].div(_templateObject(), function (props) {
+var Label = _styledComponents["default"].label(_templateObject(), function (props) {
+  return props.disabled ? props.theme.disabledLabelFontColor : props.theme.labelFontColor;
+}, function (props) {
+  return props.theme.labelFontFamily;
+}, function (props) {
+  return props.theme.labelFontSize;
+}, function (props) {
+  return props.theme.labelFontStyle;
+}, function (props) {
+  return props.theme.labelFontWeight;
+}, function (props) {
+  return props.theme.labelLineHeight;
+});
+
+var HelperText = _styledComponents["default"].span(_templateObject2(), function (props) {
+  return props.disabled ? props.theme.disabledHelperTextFontcolor : props.theme.helperTextFontColor;
+}, function (props) {
+  return props.theme.helperTextFontFamily;
+}, function (props) {
+  return props.theme.helperTextFontSize;
+}, function (props) {
+  return props.theme.helperTextFontStyle;
+}, function (props) {
+  return props.theme.helperTextFontWeight;
+}, function (props) {
+  return props.theme.helperTextLineHeight;
+});
+
+var ToggleGroup = _styledComponents["default"].div(_templateObject3(), function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.top ? _variables.spaces[props.margin.top] : "";
@@ -174,33 +262,49 @@ var ToggleGroup = _styledComponents["default"].div(_templateObject(), function (
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 });
 
-var ToggleContainer = _styledComponents["default"].div(_templateObject2(), function (props) {
-  return "\n    background-color: ".concat(props.selected ? props.disabled ? props.theme.selectedDisabledBackgroundColor : props.theme.selectedBackgroundColor : props.disabled ? props.theme.unselectedDisabledBackgroundColor : props.theme.unselectedBackgroundColor, ";\n    border-radius: ").concat(props.isFirst ? "4px 0 0 4px" : props.isLast ? "0 4px 4px 0" : "0", ";\n    color: ").concat(props.selected ? props.theme.selectedFontColor : props.theme.unselectedFontColor, ";\n    padding: ").concat(props.isIcon ? "".concat(props.theme.iconPaddingTop, " ").concat(props.theme.iconPaddingRight, " ").concat(props.theme.iconPaddingBottom, " ").concat(props.theme.iconPaddingLeft) : "".concat(props.theme.labelPaddingTop, " ").concat(props.theme.labelPaddingRight, " ").concat(props.theme.labelPaddingBottom, " ").concat(props.theme.labelPaddingLeft), ";\n    \n    ").concat(!props.disabled ? ":hover {\n          background-color: ".concat(props.selected ? props.theme.selectedHoverBackgroundColor : props.theme.unselectedHoverBackgroundColor, ";\n        }\n        :active {\n          background-color: ").concat(props.selected ? props.theme.selectedActiveBackgroundColor : props.theme.unselectedActiveBackgroundColor, ";\n          color: #ffffff;\n        }        \n        :focus {\n          outline: ").concat(props.theme.focusColor, " solid 2px;\n          outline-offset: -2px;\n        }\n        cursor: pointer;") : "color: ".concat(props.selected ? props.theme.selectedDisabledFontColor : props.theme.unselectedDisabledFontColor, " !important;\n        cursor: not-allowed;"), "\n  ");
-});
-
-var LabelContainer = _styledComponents["default"].span(_templateObject3(), function (props) {
-  return props.theme.fontFamily;
+var OptionsContainer = _styledComponents["default"].div(_templateObject4(), function (props) {
+  return props.theme.containerBorderThickness;
+}, function (props) {
+  return props.theme.containerBorderStyle;
+}, function (props) {
+  return props.theme.containerBorderRadius;
 }, function (props) {
-  return props.theme.fontSize;
+  return props.theme.containerBorderColor;
 }, function (props) {
-  return props.theme.fontStyle;
+  return props.theme.containerBackgroundColor;
 }, function (props) {
-  return props.theme.fontWeight;
+  return props.theme.containerMarginTop;
 });
 
-var Icon = _styledComponents["default"].img(_templateObject4(), function (props) {
-  return props.theme.iconSize;
+var ToggleContainer = _styledComponents["default"].div(_templateObject5(), function (props) {
+  return !props.isLast && "4px";
 }, function (props) {
-  return props.theme.iconSize;
+  return "\n    background-color: ".concat(props.selected ? props.disabled ? props.theme.selectedDisabledBackgroundColor : props.theme.selectedBackgroundColor : props.disabled ? props.theme.unselectedDisabledBackgroundColor : props.theme.unselectedBackgroundColor, ";\n    border-width: ").concat(props.theme.optionBorderThickness, ";\n    border-style: ").concat(props.theme.optionBorderStyle, ";\n    border-radius: ").concat(props.theme.optionBorderRadius, ";\n    padding-left: ").concat(props.optionLabel && props.isIcon || props.optionLabel && !props.isIcon ? props.theme.labelPaddingLeft : props.theme.iconPaddingLeft, ";\n    padding-right: ").concat(props.optionLabel && props.isIcon || props.optionLabel && !props.isIcon ? props.theme.labelPaddingRight : props.theme.iconPaddingRight, ";\n    ").concat(!props.disabled ? ":hover {\n          background-color: ".concat(props.selected ? props.theme.selectedHoverBackgroundColor : props.theme.unselectedHoverBackgroundColor, ";\n        }\n        :active {\n          background-color: ").concat(props.selected ? props.theme.selectedActiveBackgroundColor : props.theme.unselectedActiveBackgroundColor, ";\n          color: #ffffff;\n        }        \n        :focus {\n          border-color: transparent;\n          box-shadow: 0 0 0 ").concat(props.theme.optionFocusBorderThickness, " ").concat(props.backgroundType === "dark" ? props.theme.focusColorOnDark : props.theme.focusColor, ";\n        }\n        &:focus-visible {\n          outline: none;\n        }\n        cursor: pointer;\n        color: ").concat(props.selected ? props.theme.selectedFontColor : props.theme.unselectedFontColor, ";\n") : "color: ".concat(props.selected ? props.theme.selectedDisabledFontColor : props.theme.unselectedDisabledFontColor, ";\n        cursor: not-allowed;"), "\n  ");
 });
 
-var IconContainer = _styledComponents["default"].div(_templateObject5(), function (props) {
-  return props.theme.iconSize;
+var LabelContainer = _styledComponents["default"].span(_templateObject6(), function (props) {
+  return props.theme.optionLabelFontFamily;
 }, function (props) {
-  return props.theme.iconSize;
+  return props.theme.optionLabelFontSize;
+}, function (props) {
+  return props.theme.optionLabelFontStyle;
+}, function (props) {
+  return props.theme.optionLabelFontWeight;
+});
+
+var OptionContent = _styledComponents["default"].div(_templateObject7());
+
+var Icon = _styledComponents["default"].img(_templateObject8(), function (props) {
+  return props.optionLabel && props.theme.iconMarginRight;
+});
+
+var IconContainer = _styledComponents["default"].div(_templateObject9(), function (props) {
+  return props.optionLabel && props.theme.iconMarginRight;
 });
 
 DxcToggleGroup.propTypes = {
+  label: _propTypes["default"].string,
+  helperText: _propTypes["default"].string,
   value: _propTypes["default"].any,
   onChange: _propTypes["default"].func,
   disabled: _propTypes["default"].bool,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxc-technology/halstack-react",
-  "version": "0.0.0-ba36a4a",
+  "version": "0.0.0-beebecd",
   "description": "DXC Halstack React components library",
   "repository": "dxc-technology/halstack-react",
   "homepage": "http://developer.dxc.com/tools/react",
@@ -11,6 +11,7 @@
     "url": "https://dxc.com"
   },
   "main": "./dist/main.js",
+  "types": "./dist/main.d.ts",
   "peerDependencies": {
     "react": "^16.8.6",
     "react-dom": "^16.8.6",

package/test/{NewDate.test.js → DateInput.test.js}

@@ -2,41 +2,55 @@ import React from "react";
 import { render, fireEvent } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 
-import DxcNewDate from "../src/new-date/NewDate";
+import DxcDateInput from "../src/date-input/DateInput";
 
-describe("NewDate component tests", () => {
+describe("DateInput component tests", () => {
   test("Renders with correct label, helper text, optional, placeholder and clearable action", () => {
     const { getByText, getByRole, getAllByRole } = render(
-      <DxcNewDate label="Example label" helperText="Example of helper text" placeholder optional clearable />
+      <DxcDateInput label="Example label" helperText="Example of helper text" placeholder optional clearable />
     );
     const input = getByRole("textbox");
     expect(getByText("Example label")).toBeTruthy();
     expect(getByText("Example of helper text")).toBeTruthy();
     expect(getByText("(Optional)")).toBeTruthy();
     expect(input.getAttribute("placeholder")).toBe("DD-MM-YYYY");
-    userEvent.type(input, "10/90/2010");
+    userEvent.type(input, "10/10/2010");
     const closeAction = getAllByRole("button")[0];
     userEvent.click(closeAction);
     expect(input.value).toBe("");
   });
 
   test("Renders with personalized error", () => {
-    const { getByText } = render(<DxcNewDate error="Personalized error." />);
-
+    const { getByText } = render(<DxcDateInput error="Personalized error." />);
     expect(getByText("Personalized error.")).toBeTruthy();
   });
 
-  test("Renders with correct format: user typed date but it's invalid", () => {
-    const { getByText, getByRole } = render(<DxcNewDate label="With format MM/dd/yyyy" format="MM/dd/yyyy" />);
+  test("Renders with correct format: user typed date but it's invalid, onBlur error", () => {
+    const onBlur = jest.fn(({ value, error }) => {
+      expect(value).toBe("10/90/2010");
+      expect(error).toBe("Invalid date.");
+    });
+    const { getByRole } = render(<DxcDateInput label="With format MM/dd/yyyy" format="MM/dd/yyyy" onBlur={onBlur} />);
     const input = getByRole("textbox");
 
     userEvent.type(input, "10/90/2010");
     fireEvent.blur(input);
-    expect(getByText("Invalid date.")).toBeTruthy();
+  });
+
+  test("Renders with correct format: user typed date but it's invalid, onChange error", () => {
+    const onChange = jest.fn();
+    const { getByRole } = render(
+      <DxcDateInput label="With format MM/dd/yyyy" format="MM/dd/yyyy" onChange={onChange} />
+    );
+    const input = getByRole("textbox");
+
+    userEvent.type(input, "10/90/2010");
+    expect(onChange).toHaveBeenCalledTimes(10);
+    expect(onChange).toHaveBeenCalledWith({ value: "10/90/2010", error: "Invalid date.", date: null });
   });
 
   test("Calendar renders with correct date: today's date", () => {
-    const { getByText, getByRole } = render(<DxcNewDate />);
+    const { getByText, getByRole } = render(<DxcDateInput />);
     const calendarAction = getByRole("button");
     const d = new Date();
     const options = { weekday: "short", month: "short", day: "numeric" };
@@ -46,7 +60,7 @@ describe("NewDate component tests", () => {
   });
 
   test("Calendar renders with correct date: value prop", () => {
-    const { getByText, getByRole } = render(<DxcNewDate value="20-10-2019" />);
+    const { getByText, getByRole } = render(<DxcDateInput value="20-10-2019" />);
     const calendarAction = getByRole("button");
     const d = new Date(2019, 9, 20);
     const options = { weekday: "short", month: "short", day: "numeric" };
@@ -56,7 +70,7 @@ describe("NewDate component tests", () => {
   });
 
   test("Calendar renders with correct date: user typed value", () => {
-    const { getByText, getByRole } = render(<DxcNewDate />);
+    const { getByText, getByRole } = render(<DxcDateInput />);
     const calendarAction = getByRole("button");
     const d = new Date(2010, 0, 1);
     const options = { weekday: "short", month: "short", day: "numeric" };
@@ -68,7 +82,8 @@ describe("NewDate component tests", () => {
   });
 
   test("Calendar renders with correct date: invalid date, renders with today's date", () => {
-    const { getByText, getByRole } = render(<DxcNewDate />);
+    const onBlur = jest.fn();
+    const { getByText, getByRole } = render(<DxcDateInput onBlur={onBlur} />);
     const calendarAction = getByRole("button");
     const d = new Date();
     const options = { weekday: "short", month: "short", day: "numeric" };
@@ -76,17 +91,18 @@ describe("NewDate component tests", () => {
 
     userEvent.type(input, "01-01-xxxx");
     fireEvent.blur(input);
-    expect(getByText("Invalid date.")).toBeTruthy();
+    expect(onBlur).toHaveBeenCalled();
+    expect(onBlur).toHaveBeenCalledWith({ value: "01-01-xxxx", error: "Invalid date.", date: null });
     userEvent.click(calendarAction);
     expect(getByText(d.toLocaleString("en-US", options))).toBeTruthy();
   });
 
   test("Selecting a date from the calendar with an specific format", () => {
-    const { getByText, getByRole } = render(<DxcNewDate label="With format M-dd-yyyy" format="M-dd-yyyy" />);
+    const { getByText, getByRole } = render(<DxcDateInput label="With format M-dd-yyyy" format="M-dd-yyyy" />);
     const input = getByRole("textbox");
     const calendarAction = getByRole("button");
     userEvent.click(calendarAction);
-    const dayButton = getByRole("button", { name: "10" });
+    const dayButton = getByText("10").closest("button");
     fireEvent.click(dayButton);
     const d = new Date();
     d.setDate(10);
@@ -97,7 +113,7 @@ describe("NewDate component tests", () => {
   });
 
   test("Selecting a date from the calendar (using keyboard presses)", () => {
-    const { getByRole } = render(<DxcNewDate />);
+    const { getByRole } = render(<DxcDateInput />);
     const calendarAction = getByRole("button");
     const input = getByRole("textbox");
 
@@ -114,14 +130,14 @@ describe("NewDate component tests", () => {
   test("onChange & onBlur functions are called correctly", () => {
     const onBlur = jest.fn();
     const onChange = jest.fn();
-    const { getByRole } = render(<DxcNewDate onChange={onChange} onBlur={onBlur} />);
+    const { getByRole } = render(<DxcDateInput onChange={onChange} onBlur={onBlur} />);
     const input = getByRole("textbox");
     const d = new Date(2011, 9, 10);
 
     userEvent.type(input, "10-10-2011");
     expect(input.value).toBe("10-10-2011");
     expect(onChange).toHaveBeenCalledTimes(10);
-    expect(onChange).toHaveBeenCalledWith({ value: "10-10-2011", date: d });
+    expect(onChange).toHaveBeenCalledWith({ value: "10-10-2011", error: null, date: d });
     fireEvent.blur(input);
     expect(onBlur).toHaveBeenCalled();
     expect(onBlur).toHaveBeenCalledWith({ value: "10-10-2011", error: null, date: d });
@@ -130,14 +146,13 @@ describe("NewDate component tests", () => {
   test("onChange & onBlur functions are called correctly, also with errors", () => {
     const onBlur = jest.fn();
     const onChange = jest.fn();
-    const { getByRole } = render(<DxcNewDate onChange={onChange} onBlur={onBlur} />);
+    const { getByRole } = render(<DxcDateInput onChange={onChange} onBlur={onBlur} />);
     const input = getByRole("textbox");
-    const d = new Date(2011, 9, 10);
 
     userEvent.type(input, "10-10-");
     expect(input.value).toBe("10-10-");
     expect(onChange).toHaveBeenCalledTimes(6);
-    expect(onChange).toHaveBeenCalledWith({ value: "10-10-", date: null });
+    expect(onChange).toHaveBeenCalledWith({ value: "10-10-", error: "Invalid date.", date: null });
     fireEvent.blur(input);
     expect(onBlur).toHaveBeenCalled();
     expect(onBlur).toHaveBeenCalledWith({ value: "10-10-", error: "Invalid date.", date: null });
@@ -145,7 +160,7 @@ describe("NewDate component tests", () => {
 
   test("onBlur function removes the error when it is fixed", () => {
     const onBlur = jest.fn();
-    const { getByRole } = render(<DxcNewDate onBlur={onBlur} />);
+    const { getByRole } = render(<DxcDateInput onBlur={onBlur} />);
     const input = getByRole("textbox");
     const d = new Date(2002, 1, 20);
 
@@ -164,7 +179,7 @@ describe("NewDate component tests", () => {
 
   test("onBlur function removes the error when the input is empty", () => {
     const onBlur = jest.fn();
-    const { getByRole } = render(<DxcNewDate onBlur={onBlur} />);
+    const { getByRole } = render(<DxcDateInput onBlur={onBlur} optional />);
     const input = getByRole("textbox");
 
     userEvent.type(input, "test");
@@ -178,8 +193,32 @@ describe("NewDate component tests", () => {
     expect(onBlur).toHaveBeenCalledWith({ value: "", error: null, date: null });
   });
 
-  test("Disabled date (calendar action must be shown but not clickable)", () => {
-    const { getByRole, queryByText } = render(<DxcNewDate disabled />);
+  test("onBlur & onChange functions error: required field (not optional)", () => {
+    const onBlur = jest.fn();
+    const onChange = jest.fn();
+    const { getByRole } = render(<DxcDateInput onBlur={onBlur} onChange={onChange} />);
+    const date = getByRole("textbox");
+
+    userEvent.type(date, "t");
+    expect(date.value).toBe("t");
+    userEvent.clear(date);
+    fireEvent.blur(date);
+    expect(onBlur).toHaveBeenCalled();
+    expect(onBlur).toHaveBeenCalledWith({
+      value: "",
+      error: "This field is required. Please, enter a value.",
+      date: null,
+    });
+    expect(onChange).toHaveBeenCalled();
+    expect(onChange).toHaveBeenCalledWith({
+      value: "",
+      error: "This field is required. Please, enter a value.",
+      date: null,
+    });
+  });
+
+  test("Disabled date input (calendar action must be shown but not clickable)", () => {
+    const { getByRole, queryByText } = render(<DxcDateInput disabled />);
     const calendarAction = getByRole("button");
     const d = new Date();
     const options = { weekday: "short", month: "short", day: "numeric" };
@@ -190,7 +229,7 @@ describe("NewDate component tests", () => {
   });
 
   test("Input has correct accesibility attributes", () => {
-    const { getByRole } = render(<DxcNewDate label="Date label" />);
+    const { getByRole } = render(<DxcDateInput label="Date input label" />);
     const input = getByRole("textbox");
     expect(input.getAttribute("aria-autocomplete")).toBeNull();
     expect(input.getAttribute("aria-controls")).toBeNull();