@dxc-technology/halstack-react 0.0.0-13e0035 → 0.0.0-1418b62

package/dist/toggle-group/ToggleGroup.js

@@ -27,18 +27,8 @@ var _variables = require("../common/variables.js");
 
 var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 
-function _templateObject6() {
-  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"]);
-
-  _templateObject6 = function _templateObject6() {
-    return data;
-  };
-
-  return data;
-}
-
 function _templateObject5() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  height: ", ";\n  width: ", ";\n"]);
+  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"]);
 
   _templateObject5 = function _templateObject5() {
     return data;
@@ -48,7 +38,7 @@ function _templateObject5() {
 }
 
 function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  text-transform: ", ";\n  letter-spacing: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  height: ", ";\n  width: ", ";\n"]);
 
   _templateObject4 = function _templateObject4() {
     return data;
@@ -58,7 +48,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  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  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -68,7 +58,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n\n  ", "\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -78,7 +68,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: column;\n  opacity: 1;\n"]);
+  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"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -123,27 +113,25 @@ var DxcToggleGroup = function DxcToggleGroup(_ref) {
         }
 
         setSelectedValue(newSelectedOptions);
-      } else {
-        setSelectedValue(selectedOption === selectedValue ? null : selectedOption);
-      }
+      } else setSelectedValue(selectedOption === selectedValue ? null : selectedOption);
     } else if (multiple) {
       newSelectedOptions = value.map(function (v) {
         return v;
       });
-      newSelectedOptions.push(selectedOption);
-    }
 
-    if (typeof onChange === "function") {
-      onChange(multiple ? newSelectedOptions : selectedOption);
+      if (newSelectedOptions.includes(selectedOption)) {
+        var _index = newSelectedOptions.indexOf(selectedOption);
+
+        newSelectedOptions.splice(_index, 1);
+      } else newSelectedOptions.push(selectedOption);
     }
+
+    typeof onChange === "function" && onChange(multiple ? newSelectedOptions : selectedOption);
   };
 
   var handleKeyPress = function handleKeyPress(event, optionValue) {
     event.preventDefault();
-
-    if (!disabled && (event.nativeEvent.code === "Enter" || event.nativeEvent.code === "Space")) {
-      handleToggleChange(optionValue);
-    }
+    if (!disabled && (event.nativeEvent.code === "Enter" || event.nativeEvent.code === "Space")) handleToggleChange(optionValue);
   };
 
   return _react["default"].createElement(_styledComponents.ThemeProvider, {
@@ -151,7 +139,7 @@ var DxcToggleGroup = function DxcToggleGroup(_ref) {
   }, _react["default"].createElement(ToggleGroup, {
     margin: margin,
     disabled: disabled
-  }, _react["default"].createElement(ToggleGroupContainer, null, options.map(function (option, i) {
+  }, 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,
       tabIndex: !disabled ? tabIndex : -1,
@@ -171,7 +159,7 @@ var DxcToggleGroup = function DxcToggleGroup(_ref) {
     }) : _react["default"].createElement(LabelContainer, {
       disabled: disabled
     }, option.label));
-  }))));
+  })));
 };
 
 var ToggleGroup = _styledComponents["default"].div(_templateObject(), function (props) {
@@ -186,13 +174,11 @@ 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 ToggleGroupContainer = _styledComponents["default"].div(_templateObject2());
-
-var ToggleContainer = _styledComponents["default"].div(_templateObject3(), function (props) {
-  return "\n    background-color: ".concat(props.selected ? props.disabled ? props.theme.disabledSelectedBackgroundColor : props.theme.selectedBackgroundColor : props.disabled ? props.theme.disabledUnselectedBackgroundColor : props.theme.unselectedBackgroundColor, ";\n    &:focus {\n      outline: ").concat(props.theme.focusColor, " auto 1px;\n    }\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    ").concat(!props.disabled ? "&:hover {\n          background-color: ".concat(props.selected ? props.theme.selectedHoverBackgroundColor : props.theme.unselectedHoverBackgroundColor, ";\n          color: ").concat(props.selected ? props.theme.selectedHoverFontColor : props.theme.unselectedHoverFontColor, " !important;\n        }\n        cursor: pointer;") : "color: ".concat(props.selected ? props.theme.disabledSelectedFontColor : props.theme.disabledUnselectedFontColor, " !important;\n        cursor: not-allowed;"), "\n  ");
+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(_templateObject4(), function (props) {
+var LabelContainer = _styledComponents["default"].span(_templateObject3(), function (props) {
   return props.theme.fontFamily;
 }, function (props) {
   return props.theme.fontSize;
@@ -200,19 +186,15 @@ var LabelContainer = _styledComponents["default"].span(_templateObject4(), funct
   return props.theme.fontStyle;
 }, function (props) {
   return props.theme.fontWeight;
-}, function (props) {
-  return props.theme.fontTextTransform;
-}, function (props) {
-  return props.theme.fontLetterSpacing;
 });
 
-var Icon = _styledComponents["default"].img(_templateObject5(), function (props) {
+var Icon = _styledComponents["default"].img(_templateObject4(), function (props) {
   return props.theme.iconSize;
 }, function (props) {
   return props.theme.iconSize;
 });
 
-var IconContainer = _styledComponents["default"].div(_templateObject6(), function (props) {
+var IconContainer = _styledComponents["default"].div(_templateObject5(), function (props) {
   return props.theme.iconSize;
 }, function (props) {
   return props.theme.iconSize;

package/dist/upload/transaction/Transaction.js

@@ -119,8 +119,8 @@ var DxcTransaction = function DxcTransaction(_ref) {
     color: colorsTheme.upload.backgroundColor
   }, _react["default"].createElement(_Spinner["default"], {
     mode: "small"
-  }))) || status === "success" && _react["default"].createElement(FileData, null, _react["default"].createElement(FileName, null, name), _react["default"].createElement(_Spinner["default"], {
-    mode: "small"
+  }))) || status === "success" && _react["default"].createElement(FileData, null, _react["default"].createElement(FileName, null, name), _react["default"].createElement(FileStatus, {
+    status: status
   })) || status === "error" && _react["default"].createElement(FileData, null, _react["default"].createElement(_Tooltip["default"], {
     title: message
   }, _react["default"].createElement(FileName, null, name)), _react["default"].createElement(FileStatus, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxc-technology/halstack-react",
-  "version": "0.0.0-13e0035",
+  "version": "0.0.0-1418b62",
   "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/FileInput.test.js

@@ -0,0 +1,201 @@
+import React from "react";
+import { render, fireEvent, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+
+import DxcFileInput from "../src/file-input/FileInput";
+
+describe("FileInput component tests", () => {
+  const file1 = new File(["file1"], "file1.png", { type: "image/png" });
+  const file2 = new File(["file2"], "file2.txt", {
+    type: "text/plain",
+  });
+
+  const files = [
+    {
+      error: null,
+      preview: null,
+      file: file1,
+    },
+    {
+      error: "Error message",
+      preview: null,
+      file: file2,
+    },
+  ];
+
+  test("Renders with correct labels and helper text in file mode", () => {
+    const { getByText } = render(<DxcFileInput label="File input label" helperText="File input helper text" />);
+    expect(getByText("File input label")).toBeTruthy();
+    expect(getByText("File input helper text")).toBeTruthy();
+  });
+  test("Renders with correct button label in file mode", () => {
+    const { getByText } = render(<DxcFileInput label="File input label" helperText="File input helper text" />);
+    expect(getByText("Select files")).toBeTruthy();
+  });
+  test("Renders with correct labels in filedrop mode", () => {
+    const { getByText } = render(
+      <DxcFileInput label="File input label" helperText="File input helper text" mode="filedrop" />
+    );
+    expect(getByText("Select")).toBeTruthy();
+    expect(getByText("or drop files")).toBeTruthy();
+  });
+  test("Renders with correct labels in dropzone mode", () => {
+    const { getByText } = render(
+      <DxcFileInput label="File input label" helperText="File input helper text" mode="dropzone" />
+    );
+    expect(getByText("Select")).toBeTruthy();
+    expect(getByText("or drop files")).toBeTruthy();
+  });
+  test("Disabled file input", () => {
+    const { getByText, getByRole } = render(
+      <DxcFileInput label="File input label" helperText="File input helper text" disabled />
+    );
+    expect(getByText("Select files")).toBeTruthy();
+    const button = getByRole("button");
+    expect(button.disabled).toBeTruthy();
+  });
+  test("Renders file items passed in value when multiple file input", () => {
+    const callbackFile = jest.fn();
+    const { getByText } = render(
+      <DxcFileInput
+        label="File input label"
+        helperText="File input helper text"
+        value={files}
+        callbackFile={callbackFile}
+      />
+    );
+    expect(getByText("file1.png")).toBeTruthy();
+    expect(getByText("file2.txt")).toBeTruthy();
+    expect(getByText("Error message")).toBeTruthy();
+  });
+  test("Renders file items when single file input", () => {
+    const callbackFile = jest.fn();
+    const { getByText } = render(
+      <DxcFileInput
+        label="File input label"
+        helperText="File input helper text"
+        multiple={false}
+        value={files}
+        callbackFile={callbackFile}
+      />
+    );
+    expect(getByText("file1.png")).toBeTruthy();
+    expect(getByText("file2.txt")).toBeTruthy();
+    expect(getByText("Error message")).toBeTruthy();
+  });
+  test("Add file item when single file input", async () => {
+    const newFile = new File(["newFile"], "newFile.pdf", { type: "pdf" });
+    const callbackFile = jest.fn();
+    const { getByText, getByLabelText } = render(
+      <DxcFileInput
+        label="File input label"
+        helperText="File input helper text"
+        value={files}
+        callbackFile={callbackFile}
+        multiple={false}
+      />
+    );
+    expect(getByText("file1.png")).toBeTruthy();
+    expect(getByText("file2.txt")).toBeTruthy();
+    expect(getByText("Error message")).toBeTruthy();
+    const inputFile = getByLabelText("File input label", { hidden: true });
+    fireEvent.change(inputFile, { target: { files: [newFile] } });
+    await waitFor(() => {
+      expect(callbackFile).toHaveBeenCalledWith([
+        {
+          error: undefined,
+          file: newFile,
+          preview: (
+            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+              <path fill="none" d="M0 0h24v24H0V0z" />
+              <path d="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zM6 20V4h7v5h5v11H6z" />
+            </svg>
+          ),
+        },
+      ]);
+    });
+  });
+  test("Renders file items and delete one file", async () => {
+    const callbackFile = jest.fn();
+    const { getByText, getAllByRole } = render(
+      <DxcFileInput
+        label="File input label"
+        helperText="File input helper text"
+        value={files}
+        callbackFile={callbackFile}
+      />
+    );
+    expect(getByText("file1.png")).toBeTruthy();
+    expect(getByText("file2.txt")).toBeTruthy();
+    expect(getByText("Error message")).toBeTruthy();
+    const removeBtn = getAllByRole("button")[1];
+    userEvent.click(removeBtn);
+    await waitFor(() => {
+      expect(callbackFile).toHaveBeenCalledWith([{ error: "Error message", file: file2, preview: null }]);
+    });
+  });
+
+  test("CallbackFile is correctly called", async () => {
+    const newFile = new File(["newFile"], "newFile.pdf", { type: "pdf" });
+    const callbackFile = jest.fn();
+    const { getByLabelText } = render(
+      <DxcFileInput
+        label="File input label"
+        helperText="File input helper text"
+        value={files}
+        callbackFile={callbackFile}
+      />
+    );
+    const inputFile = getByLabelText("File input label", { hidden: true });
+    fireEvent.change(inputFile, { target: { files: [newFile] } });
+    await waitFor(() => {
+      expect(callbackFile).toHaveBeenCalledWith([
+        { error: null, preview: null, file: file1 },
+        { error: "Error message", preview: null, file: file2 },
+        {
+          error: undefined,
+          file: newFile,
+          preview: (
+            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+              <path fill="none" d="M0 0h24v24H0V0z" />
+              <path d="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zM6 20V4h7v5h5v11H6z" />
+            </svg>
+          ),
+        },
+      ]);
+    });
+  });
+
+  test("Callback called correctly when a file size does not comply minSize or maxSize", async () => {
+    const newFile = new File(["newFile"], "newFile.pdf", { type: "pdf" });
+    const callbackFile = jest.fn();
+    const { getByLabelText } = render(
+      <DxcFileInput
+        label="File input label"
+        helperText="File input helper text"
+        minSize={1000}
+        maxSize={20000}
+        value={files}
+        callbackFile={callbackFile}
+      />
+    );
+    const inputFile = getByLabelText("File input label", { hidden: true });
+    fireEvent.change(inputFile, { target: { files: [newFile] } });
+    await waitFor(() => {
+      expect(callbackFile).toHaveBeenCalledWith([
+        { error: null, preview: null, file: file1 },
+        { error: "Error message", preview: null, file: file2 },
+        {
+          error: "File size must be greater than min size.",
+          file: newFile,
+          preview: (
+            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+              <path fill="none" d="M0 0h24v24H0V0z" />
+              <path d="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zM6 20V4h7v5h5v11H6z" />
+            </svg>
+          ),
+        },
+      ]);
+    });
+  });
+});

package/test/NewDate.test.js

@@ -14,7 +14,7 @@ describe("NewDate component tests", () => {
     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("");
@@ -22,17 +22,29 @@ describe("NewDate component tests", () => {
 
   test("Renders with personalized error", () => {
     const { getByText } = render(<DxcNewDate 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(<DxcNewDate 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(<DxcNewDate 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", () => {
@@ -68,7 +80,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(<DxcNewDate onBlur={onBlur} />);
     const calendarAction = getByRole("button");
     const d = new Date();
     const options = { weekday: "short", month: "short", day: "numeric" };
@@ -76,7 +89,8 @@ 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();
   });
@@ -86,7 +100,7 @@ describe("NewDate component tests", () => {
     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);
@@ -121,7 +135,7 @@ describe("NewDate component tests", () => {
     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 });
@@ -132,12 +146,11 @@ describe("NewDate component tests", () => {
     const onChange = jest.fn();
     const { getByRole } = render(<DxcNewDate 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 });
@@ -164,7 +177,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(<DxcNewDate onBlur={onBlur} optional />);
     const input = getByRole("textbox");
 
     userEvent.type(input, "test");
@@ -178,6 +191,22 @@ describe("NewDate component tests", () => {
     expect(onBlur).toHaveBeenCalledWith({ value: "", error: null, date: null });
   });
 
+  test("onBlur & onChange functions error: required field (not optional)", () => {
+    const onBlur = jest.fn();
+    const onChange = jest.fn();
+    const { getByRole } = render(<DxcNewDate 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 (calendar action must be shown but not clickable)", () => {
     const { getByRole, queryByText } = render(<DxcNewDate disabled />);
     const calendarAction = getByRole("button");