@dxc-technology/halstack-react 0.0.0-4e1277a → 0.0.0-4e3dbad

package/date-input/DateInput.js

@@ -18,11 +18,9 @@ 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 _uuid = require("uuid");
-var _Icons = require("./Icons");
-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 && Object.prototype.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 _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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 _dayjs["default"].extend(_customParseFormat["default"]);
@@ -77,17 +75,15 @@ var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     isOpen = _useState4[0],
     setIsOpen = _useState4[1];
-  var _useState5 = (0, _react.useState)("date-picker-".concat((0, _uuid.v4)())),
-    _useState6 = (0, _slicedToArray2["default"])(_useState5, 1),
-    calendarId = _useState6[0];
-  var _useState7 = (0, _react.useState)(getValueForPicker((_ref2 = value !== null && value !== void 0 ? value : defaultValue) !== null && _ref2 !== void 0 ? _ref2 : "", format)),
+  var calendarId = "date-picker-".concat((0, _react.useId)());
+  var _useState5 = (0, _react.useState)(getValueForPicker((_ref2 = value !== null && value !== void 0 ? value : defaultValue) !== null && _ref2 !== void 0 ? _ref2 : "", format)),
+    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
+    dayjsDate = _useState6[0],
+    setDayjsDate = _useState6[1];
+  var _useState7 = (0, _react.useState)(innerValue || value ? !format.toUpperCase().includes("YYYY") && +getValueForPicker(value !== null && value !== void 0 ? value : innerValue, format).format("YY") < 68 ? 2000 : 1900 : undefined),
     _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
-    dayjsDate = _useState8[0],
-    setDayjsDate = _useState8[1];
-  var _useState9 = (0, _react.useState)(innerValue || value ? !format.toUpperCase().includes("YYYY") && +getValueForPicker(value !== null && value !== void 0 ? value : innerValue, format).format("YY") < 68 ? 2000 : 1900 : undefined),
-    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
-    lastValidYear = _useState10[0],
-    setLastValidYear = _useState10[1];
+    lastValidYear = _useState8[0],
+    setLastValidYear = _useState8[1];
   var colorsTheme = (0, _useTheme["default"])();
   var translatedLabels = (0, _useTranslatedLabels["default"])();
   var dateRef = (0, _react.useRef)(null);
@@ -96,12 +92,14 @@ var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref
   }, [value, format, lastValidYear]);
   (0, _react.useEffect)(function () {
     if (!disabled) {
-      var actionButtonRef = dateRef === null || dateRef === void 0 ? void 0 : dateRef.current.querySelector("[title='Open calendar']");
+      var actionButtonRef = dateRef === null || dateRef === void 0 ? void 0 : dateRef.current.querySelector("[title='Select date']");
       actionButtonRef === null || actionButtonRef === void 0 ? void 0 : actionButtonRef.setAttribute("aria-haspopup", true);
       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) {
@@ -166,16 +164,20 @@ var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref
     setIsOpen(false);
   };
   var handleDatePickerEscKeydown = function handleDatePickerEscKeydown(event) {
-    event.preventDefault();
-    closeCalendar();
-    dateRef === null || dateRef === void 0 ? void 0 : dateRef.current.getElementsByTagName("input")[0].focus();
+    if (event.key === "Escape") {
+      event.preventDefault();
+      isOpen && event.stopPropagation();
+      closeCalendar();
+      dateRef === null || dateRef === void 0 ? void 0 : dateRef.current.getElementsByTagName("input")[0].focus();
+    }
   };
   var handleDatePickerOnBlur = function handleDatePickerOnBlur(event) {
     if (!(event !== null && event !== void 0 && event.currentTarget.contains(event.relatedTarget))) closeCalendar();
   };
   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
@@ -191,8 +193,8 @@ var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref
     placeholder: placeholder ? format.toUpperCase() : null,
     action: {
       onClick: openCalendar,
-      icon: _Icons.calendarIcon,
-      title: "Open calendar"
+      icon: "filled_calendar_today",
+      title: "Select date"
     },
     clearable: clearable,
     disabled: disabled,
@@ -211,7 +213,7 @@ var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref
     align: "end",
     "aria-modal": true,
     onBlur: handleDatePickerOnBlur,
-    onEscapeKeyDown: handleDatePickerEscKeydown,
+    onKeyDown: handleDatePickerEscKeydown,
     avoidCollisions: false
   }, /*#__PURE__*/_react["default"].createElement(_DatePicker["default"], {
     id: calendarId,
@@ -220,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";
@@ -10,10 +10,22 @@ import dayjs from "dayjs";
 import useTheme from "../useTheme";
 import { ThemeProvider } from "styled-components";
 import { HalstackProvider } from "../HalstackContext";
+import preview from "../../.storybook/preview";
+import { disabledRules } from "../../test/accessibility/rules/specific/date-input/disabledRules";
 
 export default {
   title: "Date Input",
   component: DxcDateInput,
+  parameters: {
+    a11y: {
+      config: {
+        rules: [
+          ...disabledRules.map((ruleId) => ({ id: ruleId, enabled: false })),
+          ...preview?.parameters?.a11y?.config?.rules,
+        ],
+      },
+    },
+  },
 };
 
 const opinionatedTheme = {
@@ -41,13 +53,7 @@ const DateInputChromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Read only" theme="light" level={4} />
-      <DxcDateInput
-        label="Example label"
-        helperText="Help message"
-        defaultValue="06-04-2007"
-        clearable
-        readOnly
-      />
+      <DxcDateInput label="Example label" helperText="Help message" defaultValue="06-04-2007" clearable readOnly />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Invalid" theme="light" level={4} />
@@ -202,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>
     </>
@@ -220,7 +226,7 @@ const DatePickerButtonStates = () => {
 export const DatePickerStates = DatePickerButtonStates.bind({});
 DatePickerStates.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
-  const dateBtn = canvas.getAllByTitle("Open calendar")[0];
+  const dateBtn = canvas.getAllByTitle("Select date")[0];
   await userEvent.click(dateBtn);
 };
 

package/date-input/DateInput.test.d.ts

@@ -0,0 +1 @@
+export {};

package/date-input/DateInput.test.js

@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@testing-library/react");
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
-var _DateInput = _interopRequireDefault(require("./DateInput.tsx"));
+var _DateInput = _interopRequireDefault(require("./DateInput"));
 // Mocking DOMRect for Radix Primitive Popover
 global.globalThis = global;
 global.DOMRect = {
@@ -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() {
@@ -214,7 +213,7 @@ describe("DateInput component tests", function () {
           _context6.next = 5;
           return _userEvent["default"].click(calendarAction);
         case 5:
-          expect(document.activeElement === getAllByText(d.get("date")).length === 2 && +d.get("date") > 20 ? getAllByText(d.get("date"))[1] : getAllByText(d.get("date"))[0]).toBeTruthy();
+          expect(document.activeElement === (getAllByText(d.get("date")).length === 2 && +d.get("date") > 20 ? getAllByText(d.get("date"))[1] : getAllByText(d.get("date"))[0])).toBeTruthy();
           expect(getByText(d.format("MMMM YYYY"))).toBeTruthy();
         case 7:
         case "end":
@@ -286,7 +285,7 @@ describe("DateInput component tests", function () {
           _context9.next = 11;
           return _userEvent["default"].click(calendarAction);
         case 11:
-          expect(document.activeElement === getAllByText(d.get("date")).length === 2 && +d.get("date") > 20 ? getAllByText(d.get("date"))[1] : getAllByText(d.get("date"))[0]).toBeTruthy();
+          expect(document.activeElement === (getAllByText(d.get("date")).length === 2 && +d.get("date") > 20 ? getAllByText(d.get("date"))[1] : getAllByText(d.get("date"))[0])).toBeTruthy();
           expect(getByText(d.format("MMMM YYYY"))).toBeTruthy();
         case 13:
         case "end":
@@ -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,
@@ -687,7 +686,7 @@ describe("DateInput component tests", function () {
     });
   });
   test("Disabled date input (calendar action must be shown but not clickable)", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee16() {
-    var _render22, getByRole, queryByText, calendarAction, d, options;
+    var _render22, getByRole, queryByText, calendarAction, d, options, input;
     return _regenerator["default"].wrap(function _callee16$(_context16) {
       while (1) switch (_context16.prev = _context16.next) {
         case 0:
@@ -701,12 +700,13 @@ describe("DateInput component tests", function () {
             month: "short",
             day: "numeric"
           };
-          expect(getByRole("textbox").disabled).toBeTruthy();
-          _context16.next = 7;
+          input = getByRole("textbox");
+          expect(input.disabled).toBeTruthy();
+          _context16.next = 8;
           return _userEvent["default"].click(calendarAction);
-        case 7:
-          expect(queryByText(d.toLocaleString("en-US", options))).toBeFalsy();
         case 8:
+          expect(queryByText(d.toLocaleString("en-US", options))).toBeFalsy();
+        case 9:
         case "end":
           return _context16.stop();
       }
@@ -727,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/DatePicker.js

@@ -14,10 +14,10 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _Calendar = _interopRequireDefault(require("./Calendar"));
 var _YearPicker = _interopRequireDefault(require("./YearPicker"));
 var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
-var _Icons = require("./Icons");
+var _Icon = _interopRequireDefault(require("../icon/Icon"));
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 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 && Object.prototype.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 _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 today = (0, _dayjs["default"])();
 var DxcDatePicker = function DxcDatePicker(_ref) {
   var date = _ref.date,
@@ -52,20 +52,26 @@ var DxcDatePicker = function DxcDatePicker(_ref) {
     onClick: function onClick() {
       return handleMonthChange(innerDate.set("month", innerDate.get("month") - 1));
     }
-  }, _Icons.leftCaret), /*#__PURE__*/_react["default"].createElement(HeaderYearTrigger, {
+  }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: "keyboard_arrow_left"
+  })), /*#__PURE__*/_react["default"].createElement(HeaderYearTrigger, {
     "aria-live": "polite",
     onClick: function onClick() {
       return setContent(function (content) {
         return content === "yearPicker" ? "calendar" : "yearPicker";
       });
     }
-  }, /*#__PURE__*/_react["default"].createElement(HeaderYearTriggerLabel, null, translatedLabels.calendar.months[innerDate.get("month")], " ", innerDate.format("YYYY")), content === "yearPicker" ? _Icons.upCaret : _Icons.downCaret), /*#__PURE__*/_react["default"].createElement(HeaderButton, {
+  }, /*#__PURE__*/_react["default"].createElement(HeaderYearTriggerLabel, null, translatedLabels.calendar.months[innerDate.get("month")], " ", innerDate.format("YYYY")), /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: content === "yearPicker" ? "arrow_drop_up" : "arrow_drop_down"
+  })), /*#__PURE__*/_react["default"].createElement(HeaderButton, {
     "aria-label": translatedLabels.calendar.nextMonthTitle,
     title: translatedLabels.calendar.nextMonthTitle,
     onClick: function onClick() {
       return handleMonthChange(innerDate.set("month", innerDate.get("month") + 1));
     }
-  }, _Icons.rightCaret)), content === "calendar" && /*#__PURE__*/_react["default"].createElement(_Calendar["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: "keyboard_arrow_right"
+  }))), content === "calendar" && /*#__PURE__*/_react["default"].createElement(_Calendar["default"], {
     innerDate: innerDate,
     selectedDate: selectedDate,
     onInnerDateChange: setInnerDate,
@@ -91,7 +97,7 @@ var DatePicker = _styledComponents["default"].div(_templateObject || (_templateO
   return props.theme.dateInput.pickerFontWeight;
 });
 var PickerHeader = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  gap: 8px;\n  align-items: center;\n  justify-content: space-between;\n  padding: 0px 16px;\n"])));
-var HeaderButton = _styledComponents["default"].button(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  width: 24px;\n  height: 24px;\n  padding: 0px;\n  color: ", ";\n  background-color: ", ";\n  border-radius: 4px;\n  border: none;\n  cursor: pointer;\n\n  &:hover {\n    color: ", ";\n    background-color: ", ";\n  }\n  &:focus {\n    outline: ", ";\n  }\n  &:active {\n    color: ", ";\n    background-color: ", ";\n  }\n  svg {\n    width: 24px;\n    height: 24px;\n  }\n"])), function (props) {
+var HeaderButton = _styledComponents["default"].button(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  width: 24px;\n  height: 24px;\n  padding: 0px;\n  color: ", ";\n  background-color: ", ";\n  border-radius: 4px;\n  border: none;\n  cursor: pointer;\n\n  &:hover {\n    color: ", ";\n    background-color: ", ";\n  }\n  &:focus {\n    outline: ", ";\n  }\n  &:active {\n    color: ", ";\n    background-color: ", ";\n  }\n\n  span::before {\n    font-size: 24px;\n  }\n"])), function (props) {
   return props.theme.dateInput.pickerHeaderFontColor;
 }, function (props) {
   return props.theme.dateInput.pickerHeaderBackgroundColor;
@@ -106,7 +112,7 @@ var HeaderButton = _styledComponents["default"].button(_templateObject3 || (_tem
 }, function (props) {
   return props.theme.dateInput.pickerHeaderActiveBackgroundColor;
 });
-var HeaderYearTrigger = (0, _styledComponents["default"])(HeaderButton)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  gap: 8px;\n  height: 40px;\n  width: 172px;\n"])));
+var HeaderYearTrigger = (0, _styledComponents["default"])(HeaderButton)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  gap: 8px;\n  height: 40px;\n  width: 172px;\n  font-size: 24px;\n  span::before {\n    font-size: 24px;\n  }\n"])));
 var HeaderYearTriggerLabel = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  font-family: ", ";\n  font-size: ", ";\n"])), function (props) {
   return props.theme.dateInput.pickerFontFamily;
 }, function (props) {

package/date-input/YearPicker.js

@@ -13,7 +13,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 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 && Object.prototype.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 _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 getYearsArray = function getYearsArray() {
   var yearList = [];
   for (var i = 1899; i <= 2100; i++) {
@@ -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.accessibility.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dialog/Dialog.accessibility.test.js

@@ -0,0 +1,69 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@testing-library/react");
+var _axeHelper = require("../../test/accessibility/axe-helper.js");
+var _Dialog = _interopRequireDefault(require("./Dialog"));
+describe("Dialog 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;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, "Dialog text")), baseElement = _render.baseElement;
+          _context.next = 3;
+          return (0, _axeHelper.axe)(baseElement);
+        case 3:
+          results = _context.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+  it("Should not have basic accessibility issues for close button not visible", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _render2, baseElement, results;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], {
+            isCloseVisible: false
+          }, "Dialog text")), baseElement = _render2.baseElement;
+          _context2.next = 3;
+          return (0, _axeHelper.axe)(baseElement);
+        case 3:
+          results = _context2.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+  it("Should not have basic accessibility issues for overlay not visible", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+    var _render3, baseElement, results;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], {
+            overlay: false
+          }, "Dialog text")), baseElement = _render3.baseElement;
+          _context3.next = 3;
+          return (0, _axeHelper.axe)(baseElement);
+        case 3:
+          results = _context3.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  })));
+});