@dxc-technology/halstack-react 12.0.2 → 12.1.0

package/date-input/Calendar.js

@@ -11,8 +11,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
-var _Flex = _interopRequireDefault(require("../flex/Flex"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var getDays = function getDays(innerDate) {
@@ -49,12 +48,20 @@ var getDateToFocus = function getDateToFocus(selectedDate, innerDate, today) {
 var isDaySelected = function isDaySelected(date, selectedDate) {
   return (selectedDate === null || selectedDate === void 0 ? void 0 : selectedDate.get("month")) === date.month && (selectedDate === null || selectedDate === void 0 ? void 0 : selectedDate.get("year")) === date.year && (selectedDate === null || selectedDate === void 0 ? void 0 : selectedDate.get("date")) === date.day;
 };
+var divideDaysIntoWeeks = function divideDaysIntoWeeks(data, weekSize) {
+  return Array.from({
+    length: Math.ceil(data.length / weekSize)
+  }, function (_, rowIndex) {
+    return data.slice(rowIndex * weekSize, (rowIndex + 1) * weekSize);
+  });
+};
 var Calendar = function Calendar(_ref) {
   var selectedDate = _ref.selectedDate,
     innerDate = _ref.innerDate,
     onInnerDateChange = _ref.onInnerDateChange,
     onDaySelect = _ref.onDaySelect,
     today = _ref.today;
+  var id = (0, _react.useId)();
   var _useState = (0, _react.useState)(getDateToFocus(selectedDate, innerDate, today)),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     dateToFocus = _useState2[0],
@@ -88,7 +95,7 @@ var Calendar = function Calendar(_ref) {
   (0, _react.useEffect)(function () {
     if (isFocusable) {
       var _document$getElementB;
-      (_document$getElementB = document.getElementById("day_".concat(dateToFocus.get("date"), "_month").concat(dateToFocus.get("month")))) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.focus();
+      (_document$getElementB = document.getElementById("".concat(id, "_day_").concat(dateToFocus.get("date"), "_month").concat(dateToFocus.get("month")))) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.focus();
       setIsFocusable(false);
     }
   }, [dateToFocus, isFocusable]);
@@ -146,33 +153,40 @@ var Calendar = function Calendar(_ref) {
         break;
     }
   };
-  return /*#__PURE__*/_react["default"].createElement(CalendarContainer, null, /*#__PURE__*/_react["default"].createElement(_Flex["default"], {
-    alignItems: "center",
-    justifyContent: "space-between"
+  return /*#__PURE__*/_react["default"].createElement(CalendarContainer, {
+    role: "grid"
+  }, /*#__PURE__*/_react["default"].createElement(CalendarHeaderRow, {
+    role: "row"
   }, weekDays.map(function (weekDay) {
     return /*#__PURE__*/_react["default"].createElement(WeekHeaderCell, {
-      key: weekDay
+      key: weekDay,
+      role: "columnheader"
     }, weekDay);
-  })), /*#__PURE__*/_react["default"].createElement(DayCellsContainer, {
-    onBlur: handleOnBlur
-  }, dayCells.map(function (date, index) {
-    return /*#__PURE__*/_react["default"].createElement(DayCell, {
-      onKeyDown: function onKeyDown(event) {
-        return handleDayKeyboardEvent(event, date);
-      },
-      "aria-label": date.day,
-      id: "day_".concat(date.day, "_month").concat(date.month),
-      key: "day_".concat(index),
-      onClick: function onClick() {
-        return onDateClickHandler(date);
-      },
-      selected: isDaySelected(date, selectedDate),
-      actualMonth: date.month === innerDate.get("month"),
-      autoFocus: date.day === dateToFocus.get("date") && date.month === dateToFocus.get("month"),
-      "aria-selected": isDaySelected(date, selectedDate),
-      tabIndex: date.day === dateToFocus.get("date") && date.month === dateToFocus.get("month") ? 0 : -1,
-      isCurrentDay: today.get("date") === date.day && today.get("month") === innerDate.get("month") && today.get("month") === date.month && today.get("year") === innerDate.get("year")
-    }, date.day);
+  })), /*#__PURE__*/_react["default"].createElement(MonthContainer, {
+    onBlur: handleOnBlur,
+    role: "rowgroup"
+  }, divideDaysIntoWeeks(dayCells, weekDays.length).map(function (week, rowIndex) {
+    return /*#__PURE__*/_react["default"].createElement(WeekContainer, {
+      key: "".concat(id, "_week_").concat(rowIndex),
+      role: "row"
+    }, week.map(function (date, index) {
+      return /*#__PURE__*/_react["default"].createElement(DayCellButton, {
+        id: "".concat(id, "_day_").concat(date.day, "_month").concat(date.month),
+        role: "gridcell",
+        "aria-selected": isDaySelected(date, selectedDate),
+        onKeyDown: function onKeyDown(event) {
+          return handleDayKeyboardEvent(event, date);
+        },
+        onClick: function onClick() {
+          return onDateClickHandler(date);
+        },
+        selected: isDaySelected(date, selectedDate),
+        actualMonth: date.month === innerDate.get("month"),
+        autoFocus: date.day === dateToFocus.get("date") && date.month === dateToFocus.get("month"),
+        tabIndex: date.day === dateToFocus.get("date") && date.month === dateToFocus.get("month") ? 0 : -1,
+        isCurrentDay: today.get("date") === date.day && today.get("month") === innerDate.get("month") && today.get("month") === date.month && today.get("year") === innerDate.get("year")
+      }, date.day);
+    }));
   })));
 };
 var CalendarContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  padding: 0px 8px 8px 8px;\n  width: 292px;\n  font-family: ", ";\n  font-size: ", ";\n  color: ", ";\n  font-weight: ", ";\n"])), function (props) {
@@ -184,9 +198,11 @@ var CalendarContainer = _styledComponents["default"].div(_templateObject || (_te
 }, function (props) {
   return props.theme.dateInput.pickerFontWeight;
 });
-var WeekHeaderCell = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  width: 36px;\n  height: 36px;\n"])));
-var DayCellsContainer = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  gap: 4px;\n  flex-wrap: wrap;\n  justify-content: space-between;\n"])));
-var DayCell = _styledComponents["default"].button(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  justify-content: center;\n  align-items: center;\n  width: 36px;\n  height: 36px;\n  padding: 0;\n  border: none;\n  border-radius: 50%;\n  cursor: pointer;\n  font-family: ", ";\n  font-size: ", ";\n  color: ", ";\n  font-weight: ", ";\n\n  &:focus {\n    outline: ", " solid 2px;\n  }\n  &:hover {\n    background-color: ", ";\n    color: ", ";\n  }\n  &:active {\n    background-color: ", ";\n    color: ", ";\n  }\n\n  ", "\n  background-color: ", ";\n  color: ", ";\n"])), function (props) {
+var CalendarHeaderRow = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n  flex-wrap: nowrap;\n  justify-content: space-between;\n  align-items: center;\n"])));
+var WeekHeaderCell = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  width: 36px;\n  height: 36px;\n"])));
+var MonthContainer = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  gap: 4px;\n  flex-direction: column;\n  justify-content: space-between;\n"])));
+var WeekContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  gap: 4px;\n  justify-content: space-between;\n"])));
+var DayCellButton = _styledComponents["default"].button(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  justify-content: center;\n  align-items: center;\n  width: 36px;\n  height: 36px;\n  padding: 0;\n  border: none;\n  border-radius: 50%;\n  cursor: pointer;\n  font-family: ", ";\n  font-size: ", ";\n  color: ", ";\n  font-weight: ", ";\n\n  &:focus {\n    outline: ", " solid 2px;\n  }\n  &:hover {\n    background-color: ", ";\n    color: ", ";\n  }\n  &:active {\n    background-color: ", ";\n    color: ", ";\n  }\n\n  ", "\n  background-color: ", ";\n  color: ", ";\n"])), function (props) {
   return props.theme.dateInput.pickerFontFamily;
 }, function (props) {
   return props.theme.dateInput.pickerFontSize;

package/date-input/DateInput.accessibility.test.js

@@ -10,17 +10,6 @@ var _react2 = require("@testing-library/react");
 var _axeHelper = require("../../test/accessibility/axe-helper.js");
 var _DateInput = _interopRequireDefault(require("./DateInput"));
 var _disabledRules = require("../../test/accessibility/rules/specific/date-input/disabledRules.js");
-// TODO: REMOVE
-
-var disabledRules = {
-  rules: _disabledRules.disabledRules.reduce(function (rulesObj, rule) {
-    rulesObj[rule] = {
-      enabled: false
-    };
-    return rulesObj;
-  }, {})
-};
-
 // Mocking DOMRect for Radix Primitive Popover
 global.globalThis = global;
 global.DOMRect = {
@@ -41,7 +30,7 @@ global.ResizeObserver = /*#__PURE__*/function () {
   function ResizeObserver() {
     (0, _classCallCheck2["default"])(this, ResizeObserver);
   }
-  (0, _createClass2["default"])(ResizeObserver, [{
+  return (0, _createClass2["default"])(ResizeObserver, [{
     key: "observe",
     value: function observe() {}
   }, {
@@ -51,8 +40,18 @@ global.ResizeObserver = /*#__PURE__*/function () {
     key: "disconnect",
     value: function disconnect() {}
   }]);
-  return ResizeObserver;
 }();
+
+// TODO: REMOVE
+
+var disabledRules = {
+  rules: _disabledRules.disabledRules.reduce(function (rulesObj, rule) {
+    rulesObj[rule] = {
+      enabled: false
+    };
+    return rulesObj;
+  }, {})
+};
 describe("DateInput component accessibility tests", function () {
   it("Should not have basic accessibility issues", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
     var _render, baseElement, results;

package/date-input/DateInput.js

@@ -18,7 +18,7 @@ var _TextInput = _interopRequireDefault(require("../text-input/TextInput"));
 var _DatePicker = _interopRequireDefault(require("./DatePicker"));
 var Popover = _interopRequireWildcard(require("@radix-ui/react-popover"));
 var _customParseFormat = _interopRequireDefault(require("dayjs/plugin/customParseFormat"));
-var _templateObject;
+var _templateObject, _templateObject2;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -97,7 +97,9 @@ var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref
       actionButtonRef === null || actionButtonRef === void 0 ? void 0 : actionButtonRef.setAttribute("role", "combobox");
       actionButtonRef === null || actionButtonRef === void 0 ? void 0 : actionButtonRef.setAttribute("aria-expanded", isOpen);
       actionButtonRef === null || actionButtonRef === void 0 ? void 0 : actionButtonRef.setAttribute("aria-controls", calendarId);
-      actionButtonRef === null || actionButtonRef === void 0 ? void 0 : actionButtonRef.setAttribute("aria-describedby", calendarId);
+      if (isOpen) {
+        actionButtonRef === null || actionButtonRef === void 0 ? void 0 : actionButtonRef.setAttribute("aria-describedby", calendarId);
+      }
     }
   }, [isOpen, disabled, calendarId]);
   var handleCalendarOnClick = function handleCalendarOnClick(newDate) {
@@ -174,7 +176,8 @@ var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref
   };
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme
-  }, /*#__PURE__*/_react["default"].createElement("div", {
+  }, /*#__PURE__*/_react["default"].createElement(DateInputContainer, {
+    size: size,
     ref: ref
   }, /*#__PURE__*/_react["default"].createElement(Popover.Root, {
     open: isOpen
@@ -219,4 +222,7 @@ var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref
   }))))));
 });
 var StyledPopoverContent = (0, _styledComponents["default"])(Popover.Content)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  z-index: 2147483647;\n  &:focus-visible {\n    outline: none;\n  }\n"])));
+var DateInputContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  ", "\n"])), function (props) {
+  return props.size == "fillParent" && "width: 100%;";
+});
 var _default = exports["default"] = DxcDateInput;

package/date-input/DateInput.stories.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { userEvent, within, fireEvent, screen } from "@storybook/testing-library";
+import { userEvent, within, fireEvent, screen } from "@storybook/test";
 import DxcDateInput from "./DateInput";
 import DxcDatePicker from "./DatePicker";
 import YearPicker from "./YearPicker";
@@ -17,11 +17,10 @@ export default {
   title: "Date Input",
   component: DxcDateInput,
   parameters: {
-    // TODO: REMOVE
     a11y: {
       config: {
         rules: [
-          ...disabledRules.map((ruleId) => ({ id: ruleId, reviewOnFail: true })),
+          ...disabledRules.map((ruleId) => ({ id: ruleId, enabled: false })),
           ...preview?.parameters?.a11y?.config?.rules,
         ],
       },
@@ -209,15 +208,15 @@ const DatePickerButtonStates = () => {
       <ThemeProvider theme={colorsTheme}>
         <ExampleContainer pseudoState="pseudo-focus">
           <Title title="Isolated calendar focused" theme="light" level={4} />
-          <DxcDatePicker date={dayjs("06-04-1950", "DD-MM-YYYY")} onDateSelect={() => {}} id="test-calendar" />
+          <DxcDatePicker date={dayjs("06-04-1950", "DD-MM-YYYY")} onDateSelect={() => {}} id="test-calendar1" />
         </ExampleContainer>
         <ExampleContainer pseudoState="pseudo-hover">
           <Title title="Isolated calendar hovered" theme="light" level={4} />
-          <DxcDatePicker date={dayjs("06-04-1950", "DD-MM-YYYY")} onDateSelect={() => {}} id="test-calendar" />
+          <DxcDatePicker date={dayjs("06-04-1950", "DD-MM-YYYY")} onDateSelect={() => {}} id="test-calendar2" />
         </ExampleContainer>
         <ExampleContainer pseudoState="pseudo-active">
           <Title title="Isolated calendar actived" theme="light" level={4} />
-          <DxcDatePicker date={dayjs("06-04-1950", "DD-MM-YYYY")} onDateSelect={() => {}} id="test-calendar" />
+          <DxcDatePicker date={dayjs("06-04-1950", "DD-MM-YYYY")} onDateSelect={() => {}} id="test-calendar3" />
         </ExampleContainer>
       </ThemeProvider>
     </>

package/date-input/DateInput.test.js

@@ -28,7 +28,7 @@ global.ResizeObserver = /*#__PURE__*/function () {
   function ResizeObserver() {
     (0, _classCallCheck2["default"])(this, ResizeObserver);
   }
-  (0, _createClass2["default"])(ResizeObserver, [{
+  return (0, _createClass2["default"])(ResizeObserver, [{
     key: "observe",
     value: function observe() {}
   }, {
@@ -38,7 +38,6 @@ global.ResizeObserver = /*#__PURE__*/function () {
     key: "disconnect",
     value: function disconnect() {}
   }]);
-  return ResizeObserver;
 }();
 describe("DateInput component tests", function () {
   test("Renders with correct label, helper text, optional, placeholder and clearable action", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
@@ -308,7 +307,7 @@ describe("DateInput component tests", function () {
           _context10.next = 5;
           return _userEvent["default"].click(calendarAction);
         case 5:
-          dayButton = getAllByText("10")[0].closest("button");
+          dayButton = getAllByText("10")[0];
           _react2.fireEvent.click(dayButton);
           d = (0, _dayjs["default"])();
           d = d.set("date", 10);
@@ -374,7 +373,7 @@ describe("DateInput component tests", function () {
           _context12.next = 5;
           return _userEvent["default"].click(calendarAction);
         case 5:
-          dayButton = getAllByText("31")[0].closest("button");
+          dayButton = getAllByText("31")[0];
           _react2.fireEvent.click(dayButton);
           d = (0, _dayjs["default"])("10-08-2021", "DD-MM-YYYY", true);
           d = d.set("date", 31).set("month", 6);
@@ -444,31 +443,31 @@ describe("DateInput component tests", function () {
           _context14.next = 7;
           return _userEvent["default"].click(calendarAction);
         case 7:
-          expect(document.activeElement === getAllByText("1")[0].closest("button")).toBeTruthy();
-          _react2.fireEvent.keyDown(getAllByText("1")[0].closest("button"), {
+          expect(document.activeElement === getAllByText("1")[0]).toBeTruthy();
+          _react2.fireEvent.keyDown(getAllByText("1")[0], {
             key: "ArrowRight",
             code: "ArrowRight",
             keyCode: 39,
             charCode: 39
           });
-          expect(document.activeElement === getAllByText("2")[0].closest("button")).toBeTruthy();
-          _react2.fireEvent.keyDown(getAllByText("2")[0].closest("button"), {
+          expect(document.activeElement === getAllByText("2")[0]).toBeTruthy();
+          _react2.fireEvent.keyDown(getAllByText("2")[0], {
             key: "PageUp",
             code: "PageUp",
             keyCode: 33,
             charCode: 33
           });
-          expect(document.activeElement === getAllByText("2")[0].closest("button")).toBeTruthy();
+          expect(document.activeElement === getAllByText("2")[0]).toBeTruthy();
           expect(getByText("December 2009")).toBeTruthy();
-          _react2.fireEvent.keyDown(getAllByText("2")[0].closest("button"), {
+          _react2.fireEvent.keyDown(getAllByText("2")[0], {
             key: "PageDown",
             code: "PageDown",
             keyCode: 34,
             charCode: 34
           });
-          expect(document.activeElement === getAllByText("2")[0].closest("button")).toBeTruthy();
+          expect(document.activeElement === getAllByText("2")[0]).toBeTruthy();
           expect(getByText("January 2010")).toBeTruthy();
-          _react2.fireEvent.keyDown(getAllByText("2")[0].closest("button"), {
+          _react2.fireEvent.keyDown(getAllByText("2")[0], {
             key: "PageDown",
             code: "PageDown",
             keyCode: 34,
@@ -476,7 +475,7 @@ describe("DateInput component tests", function () {
             shiftKey: true
           });
           expect(getByText("January 2011")).toBeTruthy();
-          _react2.fireEvent.keyDown(getAllByText("2")[0].closest("button"), {
+          _react2.fireEvent.keyDown(getAllByText("2")[0], {
             key: "PageUp",
             code: "PageUp",
             keyCode: 33,
@@ -484,14 +483,14 @@ describe("DateInput component tests", function () {
             shiftKey: true
           });
           expect(getByText("January 2010")).toBeTruthy();
-          expect(document.activeElement === getAllByText("2")[0].closest("button")).toBeTruthy();
-          _react2.fireEvent.click(getAllByText("2")[0].closest("button"), {
+          expect(document.activeElement === getAllByText("2")[0]).toBeTruthy();
+          _react2.fireEvent.click(getAllByText("2")[0], {
             key: " ",
             code: "Space",
             keyCode: 32,
             charCode: 32
           });
-          expect(getAllByText("2")[0].closest("button").getAttribute("aria-selected")).toBe("true");
+          expect(getAllByText("2")[0].getAttribute("aria-selected")).toBe("true");
           _react2.fireEvent.keyDown(document, {
             key: "Escape",
             code: "Escape",
@@ -518,42 +517,42 @@ describe("DateInput component tests", function () {
           _context15.next = 7;
           return _userEvent["default"].click(calendarAction);
         case 7:
-          expect(document.activeElement === getAllByText("1")[0].closest("button")).toBeTruthy();
-          _react2.fireEvent.keyDown(getAllByText("1")[0].closest("button"), {
+          expect(document.activeElement === getAllByText("1")[0]).toBeTruthy();
+          _react2.fireEvent.keyDown(getAllByText("1")[0], {
             key: "ArrowDown",
             code: "ArrowDown",
             keyCode: 40,
             charCode: 40
           });
-          expect(document.activeElement === getAllByText("8")[0].closest("button")).toBeTruthy();
-          _react2.fireEvent.keyDown(getAllByText("8")[0].closest("button"), {
+          expect(document.activeElement === getAllByText("8")[0]).toBeTruthy();
+          _react2.fireEvent.keyDown(getAllByText("8")[0], {
             key: "ArrowDown",
             code: "ArrowDown",
             keyCode: 40,
             charCode: 40
           });
-          expect(document.activeElement === getAllByText("15")[0].closest("button")).toBeTruthy();
-          _react2.fireEvent.keyDown(getAllByText("15")[0].closest("button"), {
+          expect(document.activeElement === getAllByText("15")[0]).toBeTruthy();
+          _react2.fireEvent.keyDown(getAllByText("15")[0], {
             key: "ArrowUp",
             code: "ArrowUp",
             keyCode: 38,
             charCode: 38
           });
-          expect(document.activeElement === getAllByText("8")[0].closest("button")).toBeTruthy();
-          _react2.fireEvent.keyDown(getAllByText("8")[0].closest("button"), {
+          expect(document.activeElement === getAllByText("8")[0]).toBeTruthy();
+          _react2.fireEvent.keyDown(getAllByText("8")[0], {
             key: "End",
             code: "End",
             keyCode: 35,
             charCode: 35
           });
-          expect(document.activeElement === getAllByText("10")[0].closest("button")).toBeTruthy();
-          _react2.fireEvent.keyDown(getAllByText("10")[0].closest("button"), {
+          expect(document.activeElement === getAllByText("10")[0]).toBeTruthy();
+          _react2.fireEvent.keyDown(getAllByText("10")[0], {
             key: "Home",
             code: "Home",
             keyCode: 36,
             charCode: 36
           });
-          _react2.fireEvent.keyDown(getAllByText("10")[0].closest("button"), {
+          _react2.fireEvent.keyDown(getAllByText("10")[0], {
             key: " ",
             code: "Space",
             keyCode: 32,
@@ -728,16 +727,16 @@ describe("DateInput component tests", function () {
           calendarAction = getByRole("combobox");
           expect(calendarAction.getAttribute("aria-autocomplete")).toBeNull();
           expect(calendarAction.getAttribute("aria-controls")).toBeTruthy();
-          expect(calendarAction.getAttribute("aria-describedby")).toBeTruthy();
-          expect(calendarAction.getAttribute("aria-describedby") === calendarAction.getAttribute("aria-controls")).toBeTruthy();
+          expect(calendarAction.getAttribute("aria-describedby")).toBeFalsy();
           expect(calendarAction.getAttribute("aria-expanded")).toBe("false");
-          _context17.next = 13;
+          _context17.next = 12;
           return _userEvent["default"].click(calendarAction);
-        case 13:
+        case 12:
           datePicker = getByRole("dialog");
           expect(datePicker.getAttribute("aria-modal")).toBe("true");
           expect(calendarAction.getAttribute("aria-expanded")).toBe("true");
           expect(document.getElementById(calendarAction.getAttribute("aria-describedby"))).toBeTruthy();
+          expect(calendarAction.getAttribute("aria-describedby") === calendarAction.getAttribute("aria-controls")).toBeTruthy();
           _context17.next = 19;
           return _userEvent["default"].type(calendarAction, "{esc}");
         case 19:

package/date-input/YearPicker.js

@@ -26,13 +26,14 @@ var YearPicker = function YearPicker(_ref) {
   var onYearSelect = _ref.onYearSelect,
     selectedDate = _ref.selectedDate,
     today = _ref.today;
+  var id = (0, _react.useId)();
   var _useState = (0, _react.useState)(selectedDate ? selectedDate.get("year") : (0, _dayjs["default"])().get("year")),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     yearToFocus = _useState2[0],
     setYearToFocus = _useState2[1];
   (0, _react.useEffect)(function () {
     var _yearToFocusEl$scroll;
-    var yearToFocusEl = document.getElementById("year_".concat(yearToFocus));
+    var yearToFocusEl = document.getElementById("".concat(id, "_year_").concat(yearToFocus));
     yearToFocusEl === null || yearToFocusEl === void 0 ? void 0 : (_yearToFocusEl$scroll = yearToFocusEl.scrollIntoView) === null || _yearToFocusEl$scroll === void 0 ? void 0 : _yearToFocusEl$scroll.call(yearToFocusEl, {
       block: "nearest",
       inline: "start"
@@ -53,7 +54,10 @@ var YearPicker = function YearPicker(_ref) {
         break;
     }
   };
-  return /*#__PURE__*/_react["default"].createElement(YearPickerContainer, null, yearList.map(function (year) {
+  return /*#__PURE__*/_react["default"].createElement(YearPickerContainer, {
+    role: "listbox",
+    "aria-label": "Year Picker"
+  }, yearList.map(function (year) {
     return /*#__PURE__*/_react["default"].createElement(YearPickerButton, {
       "aria-label": year,
       key: year,
@@ -64,10 +68,11 @@ var YearPicker = function YearPicker(_ref) {
       onKeyDown: function onKeyDown(event) {
         return handleDayKeyboardEvent(event);
       },
-      id: "year_".concat(year),
+      id: "".concat(id, "_year_").concat(year),
       onClick: function onClick() {
         onYearSelect(year);
-      }
+      },
+      role: "option"
     }, year);
   }));
 };

package/dialog/Dialog.stories.tsx

@@ -10,7 +10,7 @@ import { HalstackProvider } from "../HalstackContext";
 import DxcHeading from "../heading/Heading";
 import DxcParagraph from "../paragraph/Paragraph";
 import DxcAlert from "../alert/Alert";
-import { userEvent, within } from "@storybook/testing-library";
+import { userEvent, within } from "@storybook/test";
 import { INITIAL_VIEWPORTS } from "@storybook/addon-viewport";
 
 export default {
@@ -362,8 +362,7 @@ MobileResponsiveDialog.parameters = {
 };
 
 export const ScrollDialog = ScrollingDialog.bind({});
-ScrollDialog.play = async ({ canvasElement }) => {
-  const canvas = within(canvasElement);
+ScrollDialog.play = async () => {
   await userEvent.tab();
   await userEvent.tab();
   await userEvent.tab();

package/dialog/Dialog.test.js

@@ -38,7 +38,7 @@ global.ResizeObserver = /*#__PURE__*/function () {
   function ResizeObserver() {
     (0, _classCallCheck2["default"])(this, ResizeObserver);
   }
-  (0, _createClass2["default"])(ResizeObserver, [{
+  return (0, _createClass2["default"])(ResizeObserver, [{
     key: "observe",
     value: function observe() {}
   }, {
@@ -48,7 +48,6 @@ global.ResizeObserver = /*#__PURE__*/function () {
     key: "disconnect",
     value: function disconnect() {}
   }]);
-  return ResizeObserver;
 }();
 var options = [{
   label: "Female",

package/dropdown/Dropdown.accessibility.test.js

@@ -40,7 +40,7 @@ global.ResizeObserver = /*#__PURE__*/function () {
   function ResizeObserver() {
     (0, _classCallCheck2["default"])(this, ResizeObserver);
   }
-  (0, _createClass2["default"])(ResizeObserver, [{
+  return (0, _createClass2["default"])(ResizeObserver, [{
     key: "observe",
     value: function observe() {}
   }, {
@@ -50,7 +50,6 @@ global.ResizeObserver = /*#__PURE__*/function () {
     key: "disconnect",
     value: function disconnect() {}
   }]);
-  return ResizeObserver;
 }();
 var options = [{
   value: "1",

package/dropdown/Dropdown.stories.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { userEvent, within } from "@storybook/testing-library";
+import { userEvent, within } from "@storybook/test";
 import DxcDropdown from "./Dropdown";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";

package/dropdown/Dropdown.test.js

@@ -27,7 +27,7 @@ global.ResizeObserver = /*#__PURE__*/function () {
   function ResizeObserver() {
     (0, _classCallCheck2["default"])(this, ResizeObserver);
   }
-  (0, _createClass2["default"])(ResizeObserver, [{
+  return (0, _createClass2["default"])(ResizeObserver, [{
     key: "observe",
     value: function observe() {}
   }, {
@@ -37,7 +37,6 @@ global.ResizeObserver = /*#__PURE__*/function () {
     key: "disconnect",
     value: function disconnect() {}
   }]);
-  return ResizeObserver;
 }();
 var options = [{
   value: "1",

package/file-input/FileInput.js

@@ -79,9 +79,7 @@ var isFileIncluded = function isFileIncluded(file, fileList) {
   });
 };
 var DxcFileInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref3, ref) {
-  var _ref3$name = _ref3.name,
-    name = _ref3$name === void 0 ? "" : _ref3$name,
-    _ref3$mode = _ref3.mode,
+  var _ref3$mode = _ref3.mode,
     mode = _ref3$mode === void 0 ? "file" : _ref3$mode,
     _ref3$label = _ref3.label,
     label = _ref3$label === void 0 ? "" : _ref3$label,

package/file-input/types.d.ts

@@ -20,10 +20,6 @@ export type FileData = {
     preview?: string;
 };
 type CommonProps = {
-    /**
-     * @deprecated Name attribute.
-     */
-    name?: string;
     /**
      * Text to be placed above the component.
      */

package/grid/Grid.stories.tsx

@@ -209,7 +209,9 @@ const ColoredContainer = styled.div<{ color?: string; width?: string; height?: s
   padding: 1rem;
   border: 1px solid #a46ede;
   border-radius: 0.5rem;
-  font-family: Open Sans, sans-serif;
+  font-family:
+    Open Sans,
+    sans-serif;
   font-size: 1.5rem;
   font-weight: bold;
   color: #a46ede;

package/header/Header.stories.tsx

@@ -3,7 +3,7 @@ import DxcHeader from "./Header";
 import DxcButton from "../button/Button";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
-import { userEvent, waitFor, within } from "@storybook/testing-library";
+import { userEvent, waitFor, within } from "@storybook/test";
 import DxcFlex from "../flex/Flex";
 import DxcLink from "../link/Link";
 import { HalstackProvider } from "../HalstackContext";

package/number-input/NumberInput.accessibility.test.js

@@ -27,7 +27,7 @@ global.ResizeObserver = /*#__PURE__*/function () {
   function ResizeObserver() {
     (0, _classCallCheck2["default"])(this, ResizeObserver);
   }
-  (0, _createClass2["default"])(ResizeObserver, [{
+  return (0, _createClass2["default"])(ResizeObserver, [{
     key: "observe",
     value: function observe() {}
   }, {
@@ -37,7 +37,6 @@ global.ResizeObserver = /*#__PURE__*/function () {
     key: "disconnect",
     value: function disconnect() {}
   }]);
-  return ResizeObserver;
 }();
 describe("Number input component accessibility tests", function () {
   it("Should not have basic accessibility issues", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {