@elliemae/ds-controlled-form 2.0.0-alpha.1 → 2.0.0-alpha.13

package/cjs/controlled-date-time-picker/parts/Pickers/Calendar/CalendarHead.js

@@ -4,10 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _jsx = require('@babel/runtime/helpers/jsx');
 var React = require('react');
-var ChevronDoubleLeft = require('@elliemae/ds-icons/ChevronDoubleLeft');
-var ChevronLeft = require('@elliemae/ds-icons/ChevronLeft');
-var ChevronRight = require('@elliemae/ds-icons/ChevronRight');
-var ChevronDoubleRight = require('@elliemae/ds-icons/ChevronDoubleRight');
+var DSButton = require('@elliemae/ds-button');
+var dsIcons = require('@elliemae/ds-icons');
+var ControlledDateTimePickerDatatestid = require('../../../ControlledDateTimePickerDatatestid.js');
 var dateHelpers = require('../../../utils/dateHelpers.js');
 var Styleds = require('./Styleds.js');
 var CalendarContext = require('./CalendarContext.js');
@@ -15,10 +14,6 @@ var CalendarContext = require('./CalendarContext.js');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
-var ChevronDoubleLeft__default = /*#__PURE__*/_interopDefaultLegacy(ChevronDoubleLeft);
-var ChevronLeft__default = /*#__PURE__*/_interopDefaultLegacy(ChevronLeft);
-var ChevronRight__default = /*#__PURE__*/_interopDefaultLegacy(ChevronRight);
-var ChevronDoubleRight__default = /*#__PURE__*/_interopDefaultLegacy(ChevronDoubleRight);
 
 var _ChevronDoubleLeft, _ChevronLeft, _ChevronRight, _ChevronDoubleRight;
 
@@ -27,8 +22,8 @@ const useGetFormattedCurrentDate = () => {
     currentMonth,
     currentYear
   } = React.useContext(CalendarContext.CalendarContext);
-  const monthString = currentMonth >= 0 && currentMonth <= 11 ? `${dateHelpers.getMonthNameByMonthNumber(currentMonth)} ` : '';
-  return React.useMemo(() => `${monthString}${currentYear}`, [monthString, currentYear]);
+  const monthString = currentMonth >= 0 && currentMonth <= 11 ? "".concat(dateHelpers.getMonthNameByMonthNumber(currentMonth), " ") : '';
+  return React.useMemo(() => "".concat(monthString).concat(currentYear), [monthString, currentYear]);
 };
 
 const CalendarHead = () => {
@@ -49,58 +44,62 @@ const CalendarHead = () => {
     onPrevYearFocus,
     onPrevMonthFocus,
     onNextMonthFocus,
-    onNextYearFocus
+    onNextYearFocus,
+    isControllerOnly,
+    autoFocusPrevMonthArrow
   } = React.useContext(CalendarContext.CalendarContext);
-  return /*#__PURE__*/_jsx__default['default'](Styleds.StyledHeader, {}, void 0, /*#__PURE__*/_jsx__default['default'](Styleds.StyledHeaderButton, {
+  return /*#__PURE__*/_jsx__default["default"](Styleds.StyledHeader, {}, void 0, /*#__PURE__*/_jsx__default["default"](Styleds.StyledHeaderButton, {
     "aria-label": "previous year",
-    buttonType: "text",
-    leftIcon: _ChevronDoubleLeft || (_ChevronDoubleLeft = /*#__PURE__*/_jsx__default['default'](ChevronDoubleLeft__default['default'], {
-      height: 14,
-      width: 14,
-      fill: "#25292f"
-    })),
-    size: "m",
+    buttonType: "raw",
+    size: DSButton.BUTTON_SIZES.M,
     onClick: handlePrevYear,
     innerRef: prevYearBtnRef,
     onKeyDown: handlePrevYearKeyDown,
-    onFocus: onPrevYearFocus
-  }), /*#__PURE__*/_jsx__default['default'](Styleds.StyledHeaderButton, {
+    onFocus: onPrevYearFocus,
+    tabIndex: isControllerOnly ? -1 : 1,
+    "data-testid": ControlledDateTimePickerDatatestid.ControlledDateTimePickerDatatestid.CALENDAR.PREV_YEAR
+  }, void 0, _ChevronDoubleLeft || (_ChevronDoubleLeft = /*#__PURE__*/_jsx__default["default"](dsIcons.ChevronDoubleLeft, {
+    height: 14,
+    width: 14,
+    fill: "#25292f"
+  }))), /*#__PURE__*/_jsx__default["default"](Styleds.StyledHeaderButton, {
+    autoFocus: autoFocusPrevMonthArrow,
     "aria-label": "previous month",
-    buttonType: "text",
-    leftIcon: _ChevronLeft || (_ChevronLeft = /*#__PURE__*/_jsx__default['default'](ChevronLeft__default['default'], {
-      fill: "#25292f"
-    })),
-    size: "m",
+    buttonType: "raw",
+    size: DSButton.BUTTON_SIZES.M,
     onClick: handlePrevMonth,
     innerRef: prevMonthBtnRef,
     onKeyDown: handlePrevMonthKeyDown,
-    onFocus: onPrevMonthFocus // this is a tabstop for when the calendar is open
+    onFocus: onPrevMonthFocus,
+    "data-testid": ControlledDateTimePickerDatatestid.ControlledDateTimePickerDatatestid.CALENDAR.PREV_MONTH // this is a tabstop for when the calendar is open
 
-  }), /*#__PURE__*/_jsx__default['default']("h3", {}, void 0, currentFormatedDate), /*#__PURE__*/_jsx__default['default'](Styleds.StyledHeaderButton, {
+  }, void 0, _ChevronLeft || (_ChevronLeft = /*#__PURE__*/_jsx__default["default"](dsIcons.ChevronLeft, {
+    fill: "#25292f"
+  }))), /*#__PURE__*/_jsx__default["default"]("h3", {}, void 0, currentFormatedDate), /*#__PURE__*/_jsx__default["default"](Styleds.StyledHeaderButton, {
     "aria-label": "next month",
-    buttonType: "text",
-    leftIcon: _ChevronRight || (_ChevronRight = /*#__PURE__*/_jsx__default['default'](ChevronRight__default['default'], {
-      fill: "#25292f"
-    })),
-    size: "m",
+    buttonType: "raw",
+    size: DSButton.BUTTON_SIZES.M,
     onClick: handleNextMonth,
     innerRef: nextMonthBtnRef,
     onKeyDown: handleNextMonthKeyDown,
-    onFocus: onNextMonthFocus
-  }), /*#__PURE__*/_jsx__default['default'](Styleds.StyledHeaderButton, {
+    onFocus: onNextMonthFocus,
+    "data-testid": ControlledDateTimePickerDatatestid.ControlledDateTimePickerDatatestid.CALENDAR.NEXT_MONTH
+  }, void 0, _ChevronRight || (_ChevronRight = /*#__PURE__*/_jsx__default["default"](dsIcons.ChevronRight, {
+    fill: "#25292f"
+  }))), /*#__PURE__*/_jsx__default["default"](Styleds.StyledHeaderButton, {
     "aria-label": "next year",
-    buttonType: "text",
-    leftIcon: _ChevronDoubleRight || (_ChevronDoubleRight = /*#__PURE__*/_jsx__default['default'](ChevronDoubleRight__default['default'], {
-      height: 14,
-      width: 14,
-      fill: "#25292f"
-    })),
-    size: "m",
+    buttonType: "raw",
+    size: DSButton.BUTTON_SIZES.M,
     onClick: handleNextYear,
     innerRef: nextYearBtnRef,
     onKeyDown: handleNextYearKeyDown,
-    onFocus: onNextYearFocus
-  }));
+    onFocus: onNextYearFocus,
+    "data-testid": ControlledDateTimePickerDatatestid.ControlledDateTimePickerDatatestid.CALENDAR.NEXT_YEAR
+  }, void 0, _ChevronDoubleRight || (_ChevronDoubleRight = /*#__PURE__*/_jsx__default["default"](dsIcons.ChevronDoubleRight, {
+    height: 14,
+    width: 14,
+    fill: "#25292f"
+  }))));
 };
 
 exports.CalendarHead = CalendarHead;

package/cjs/controlled-date-time-picker/parts/Pickers/Calendar/CalendarIconTrigger.js

@@ -4,16 +4,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _jsx = require('@babel/runtime/helpers/jsx');
 var React = require('react');
-var DSButton = require('@elliemae/ds-basic/Button');
-var DatePicker = require('@elliemae/ds-icons/DatePicker');
+var DSButton = require('@elliemae/ds-button');
+var dsIcons = require('@elliemae/ds-icons');
 var ControlledDateTimePickerDatatestid = require('../../../ControlledDateTimePickerDatatestid.js');
 var CalendarContext = require('./CalendarContext.js');
+var Styleds = require('./Styleds.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
-var DSButton__default = /*#__PURE__*/_interopDefaultLegacy(DSButton);
-var DatePicker__default = /*#__PURE__*/_interopDefaultLegacy(DatePicker);
 
 var _DatePicker;
 // this is particularly usefull due to how usePopper needs to check the references
@@ -23,19 +22,21 @@ const CalendarIconTrigger = () => {
   const {
     handleToggleCalendar,
     handleSetTriggerRef,
-    handlePickerIconKeyDown
+    handlePickerIconKeyDown,
+    ariaCurrentValueForInputs,
+    disabled
   } = React.useContext(CalendarContext.CalendarContext);
-  return React.useMemo(() => /*#__PURE__*/_jsx__default['default'](DSButton__default['default'], {
-    "aria-label": "date picker context menu trigger",
-    buttonType: "text",
-    leftIcon: _DatePicker || (_DatePicker = /*#__PURE__*/_jsx__default['default'](DatePicker__default['default'], {})),
-    size: "m",
+  return React.useMemo(() => /*#__PURE__*/_jsx__default["default"](Styleds.StyledIconTriggerButton, {
+    "aria-label": "date picker context menu trigger, ".concat(ariaCurrentValueForInputs),
+    buttonType: "icon",
+    size: DSButton.BUTTON_SIZES.M,
     variant: DSButton.BUTTON_VARIANT.DEFAULT,
     innerRef: handleSetTriggerRef,
     onClick: handleToggleCalendar,
     onKeyDown: handlePickerIconKeyDown,
-    "data-testid": ControlledDateTimePickerDatatestid.ControlledDateTimePickerDatatestid.PICKER_ICONS.CALENDAR
-  }), [handlePickerIconKeyDown, handleSetTriggerRef, handleToggleCalendar]);
+    "data-testid": ControlledDateTimePickerDatatestid.ControlledDateTimePickerDatatestid.PICKER_ICONS.CALENDAR,
+    disabled: disabled
+  }, void 0, _DatePicker || (_DatePicker = /*#__PURE__*/_jsx__default["default"](dsIcons.DatePicker, {}))), [ariaCurrentValueForInputs, handleSetTriggerRef, handleToggleCalendar, handlePickerIconKeyDown, disabled]);
 };
 
 exports.CalendarIconTrigger = CalendarIconTrigger;

package/cjs/controlled-date-time-picker/parts/Pickers/Calendar/CalendarMonthDays.js

@@ -13,11 +13,15 @@ var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 
 const CalendarMonthDays = () => {
   const {
-    daysArray,
+    invisibleFirstDay,
+    daysMatrixByWeekday,
+    invisibleLastDay,
     calendarDaysWrapperRef
   } = React.useContext(CalendarContext.CalendarContext);
-  return /*#__PURE__*/_jsx__default['default'](CalendarDaysList.CalendarDaysList, {
-    daysArray: daysArray,
+  return /*#__PURE__*/_jsx__default["default"](CalendarDaysList.CalendarDaysList, {
+    invisibleFirstDay: invisibleFirstDay,
+    daysMatrixByWeekday: daysMatrixByWeekday,
+    invisibleLastDay: invisibleLastDay,
     innerRef: calendarDaysWrapperRef
   });
 };

package/cjs/controlled-date-time-picker/parts/Pickers/Calendar/CalendarWeekDays.js

@@ -11,7 +11,39 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-var _StyledWeekDaysUList;
-const CalendarWeekDays = /*#__PURE__*/React__default['default'].memo(() => _StyledWeekDaysUList || (_StyledWeekDaysUList = /*#__PURE__*/_jsx__default['default'](Styleds.StyledWeekDaysUList, {}, void 0, /*#__PURE__*/_jsx__default['default']("li", {}, void 0, "sun"), /*#__PURE__*/_jsx__default['default']("li", {}, void 0, "mon"), /*#__PURE__*/_jsx__default['default']("li", {}, void 0, "tue"), /*#__PURE__*/_jsx__default['default']("li", {}, void 0, "wed"), /*#__PURE__*/_jsx__default['default']("li", {}, void 0, "thu"), /*#__PURE__*/_jsx__default['default']("li", {}, void 0, "fri"), /*#__PURE__*/_jsx__default['default']("li", {}, void 0, "sat"))));
+var _StyledWeekDaysHeader, _StyledWeekDaysHeader2, _StyledWeekDaysHeader3, _StyledWeekDaysHeader4, _StyledWeekDaysHeader5, _StyledWeekDaysHeader6, _StyledWeekDaysHeader7;
+const CalendarWeekDays = /*#__PURE__*/React__default["default"].memo(() => /*#__PURE__*/_jsx__default["default"]("span", {
+  role: "rowgroup"
+}, void 0, /*#__PURE__*/_jsx__default["default"](Styleds.StyledWeekDaysListWrapper, {
+  role: "row",
+  cols: ['32px', '32px', '32px', '32px', '32px', '32px', '32px'],
+  rows: ['22px'],
+  py: "xxxs",
+  px: "6px",
+  justifyContent: "space-between",
+  alignItems: "center",
+  isHeader: true
+}, void 0, _StyledWeekDaysHeader || (_StyledWeekDaysHeader = /*#__PURE__*/_jsx__default["default"](Styleds.StyledWeekDaysHeaderItem, {
+  role: "columnheader",
+  "aria-colindex": 1
+}, void 0, "sun")), _StyledWeekDaysHeader2 || (_StyledWeekDaysHeader2 = /*#__PURE__*/_jsx__default["default"](Styleds.StyledWeekDaysHeaderItem, {
+  role: "columnheader",
+  "aria-colindex": 2
+}, void 0, "mon")), _StyledWeekDaysHeader3 || (_StyledWeekDaysHeader3 = /*#__PURE__*/_jsx__default["default"](Styleds.StyledWeekDaysHeaderItem, {
+  role: "columnheader",
+  "aria-colindex": 3
+}, void 0, "tue")), _StyledWeekDaysHeader4 || (_StyledWeekDaysHeader4 = /*#__PURE__*/_jsx__default["default"](Styleds.StyledWeekDaysHeaderItem, {
+  role: "columnheader",
+  "aria-colindex": 4
+}, void 0, "wed")), _StyledWeekDaysHeader5 || (_StyledWeekDaysHeader5 = /*#__PURE__*/_jsx__default["default"](Styleds.StyledWeekDaysHeaderItem, {
+  role: "columnheader",
+  "aria-colindex": 5
+}, void 0, "thu")), _StyledWeekDaysHeader6 || (_StyledWeekDaysHeader6 = /*#__PURE__*/_jsx__default["default"](Styleds.StyledWeekDaysHeaderItem, {
+  role: "columnheader",
+  "aria-colindex": 6
+}, void 0, "fri")), _StyledWeekDaysHeader7 || (_StyledWeekDaysHeader7 = /*#__PURE__*/_jsx__default["default"](Styleds.StyledWeekDaysHeaderItem, {
+  role: "columnheader",
+  "aria-colindex": 7
+}, void 0, "sat")))));
 
 exports.CalendarWeekDays = CalendarWeekDays;

package/cjs/controlled-date-time-picker/parts/Pickers/Calendar/CalendarWrapper.js

@@ -2,9 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.filter.js');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.for-each.js');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _jsx = require('@babel/runtime/helpers/jsx');
 var React = require('react');
+var ControlledDateTimePickerDatatestid = require('../../../ControlledDateTimePickerDatatestid.js');
 var CalendarContent = require('./CalendarContent.js');
 var CalendarContext = require('./CalendarContext.js');
 var jsxRuntime = require('react/jsx-runtime');
@@ -18,7 +24,7 @@ var _CalendarContent, _CalendarContent2;
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 const CalendarWrapper = () => {
   const {
     setPopperElement,
@@ -29,7 +35,7 @@ const CalendarWrapper = () => {
     setArrowElement,
     isControllerOnly
   } = React.useContext(CalendarContext.CalendarContext);
-  if (isControllerOnly) return _CalendarContent || (_CalendarContent = /*#__PURE__*/_jsx__default['default'](CalendarContent.CalendarContent, {}));
+  if (isControllerOnly) return _CalendarContent || (_CalendarContent = /*#__PURE__*/_jsx__default["default"](CalendarContent.CalendarContent, {}));
   return /*#__PURE__*/jsxRuntime.jsxs("div", _objectSpread(_objectSpread({
     ref: setPopperElement,
     style: _objectSpread(_objectSpread({}, styles.popper), {}, {
@@ -37,7 +43,8 @@ const CalendarWrapper = () => {
       zIndex: 110
     })
   }, attributes.popper), {}, {
-    children: [_CalendarContent2 || (_CalendarContent2 = /*#__PURE__*/_jsx__default['default'](CalendarContent.CalendarContent, {})), /*#__PURE__*/jsxRuntime.jsx("div", {
+    "data-testid": ControlledDateTimePickerDatatestid.ControlledDateTimePickerDatatestid.CONTEXTUAL_MENU.CALENDAR,
+    children: [_CalendarContent2 || (_CalendarContent2 = /*#__PURE__*/_jsx__default["default"](CalendarContent.CalendarContent, {})), /*#__PURE__*/jsxRuntime.jsx("div", {
       ref: setArrowElement,
       style: styles.arrow
     })]

package/cjs/controlled-date-time-picker/parts/Pickers/Calendar/Day.js

@@ -2,29 +2,46 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.filter.js');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.for-each.js');
 var _jsx = require('@babel/runtime/helpers/jsx');
+var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var React = require('react');
 var dateHelpers = require('../../../utils/dateHelpers.js');
+var constants = require('../../../utils/constants.js');
+var stringHelpers = require('../../../utils/stringHelpers.js');
 var ControlledDateTimePickerDatatestid = require('../../../ControlledDateTimePickerDatatestid.js');
 var ControlledDateTimePickerCTX = require('../../../ControlledDateTimePickerCTX.js');
 var CalendarContext = require('./CalendarContext.js');
 var Styleds = require('./Styleds.js');
+var jsxRuntime = require('react/jsx-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
+var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 const displayNone = {
   display: 'none'
 };
-const Day = ({
-  metaDay
-}) => {
+const Day = _ref => {
+  let {
+    metaDay,
+    colIndex,
+    isInvisible
+  } = _ref;
   const {
     day,
     isCurrMonthDay,
     isHidden,
-    dayBtnRef
+    dayBtnRef,
+    dayAsString
   } = metaDay;
   const {
     handleChangeComposedDateString,
@@ -68,18 +85,19 @@ const Day = ({
 
     if (!isDisabled && !isOutOfRange) {
       const newDateString = dateHelpers.getDateStringFromDay(day);
-      const metaInfo = {
-        isAutomaticFillTrigger: false,
+
+      const metaInfo = _objectSpread(_objectSpread({}, constants.defaultMetaInfo), {}, {
         newDateString
-      };
+      });
+
       const {
         month,
         day: dayNumber,
         year
       } = dateHelpers.getDateValuesFromDate(day);
-      onMonthChange(`${month + 1}`, e, metaInfo);
-      onDayChange(`${dayNumber}`, e, metaInfo);
-      onYearChange(`${year}`, e, metaInfo);
+      onMonthChange("".concat(month + 1), e, metaInfo);
+      onDayChange("".concat(dayNumber), e, metaInfo);
+      onYearChange("".concat(year), e, metaInfo);
       handleChangeComposedDateString(newDateString, metaInfo);
       setLatestInteractionRegion('calendar-days');
       if (!isWithTimeWheelToo && !preventCloseOnSelection) closeCalendar();
@@ -88,25 +106,38 @@ const Day = ({
   const handleOnDayFocus = React.useCallback(() => {
     setLatestInteractionRegion('calendar-days');
   }, [setLatestInteractionRegion]);
-  const dayClassModifiers = React.useMemo(() => `${isSelected ? 'selectedDay ' : ''}${isDisabled ? 'disabledDay ' : ''}${isOutOfRange ? 'outOfRangeDay ' : ''}${isFocused ? 'focusedDay ' : ''}${isStartRangeDay ? 'startRangeDay ' : ''}${isDayInRange ? 'inRangeDay ' : ''}${isEndRangeDay ? 'endRangeDay ' : ''}${isCurrMonthDay ? '' : 'notCurrentMonth'}`, [isSelected, isDisabled, isOutOfRange, isFocused, isStartRangeDay, isDayInRange, isEndRangeDay, isCurrMonthDay]);
-  return /*#__PURE__*/_jsx__default['default']("li", {
+  const dayClassModifiers = React.useMemo(() => "dayWrapper ".concat(isSelected ? 'selectedDay ' : '').concat(isDisabled ? 'disabledDay ' : '').concat(isOutOfRange ? 'outOfRangeDay ' : '').concat(isFocused ? 'focusedDay ' : '').concat(isStartRangeDay ? 'startRangeDay ' : '').concat(isDayInRange ? 'inRangeDay ' : '').concat(isEndRangeDay ? 'endRangeDay ' : '').concat(isCurrMonthDay ? '' : 'notCurrentMonth'), [isSelected, isDisabled, isOutOfRange, isFocused, isStartRangeDay, isDayInRange, isEndRangeDay, isCurrMonthDay]);
+  let dataTestid = ControlledDateTimePickerDatatestid.ControlledDateTimePickerDatatestid.CALENDAR.DAY;
+  if (isSelected) dataTestid = ControlledDateTimePickerDatatestid.ControlledDateTimePickerDatatestid.CALENDAR.SELECTED_DAY;
+  if (isFocused) dataTestid = ControlledDateTimePickerDatatestid.ControlledDateTimePickerDatatestid.CALENDAR.FOCUSED_DAY;
+  if (isFocused && isSelected) dataTestid = ControlledDateTimePickerDatatestid.ControlledDateTimePickerDatatestid.CALENDAR.SELECTED_FOCUSED_DAY;
+  if (isStartRangeDay) dataTestid = ControlledDateTimePickerDatatestid.ControlledDateTimePickerDatatestid.CALENDAR.START_RANGE_DAY;
+  if (isEndRangeDay) dataTestid = ControlledDateTimePickerDatatestid.ControlledDateTimePickerDatatestid.CALENDAR.END_RANGE_DAY;
+  if (isDayInRange) dataTestid = ControlledDateTimePickerDatatestid.ControlledDateTimePickerDatatestid.CALENDAR.IN_RANGE_DAY;
+  return /*#__PURE__*/jsxRuntime.jsx("div", _objectSpread(_objectSpread({
     className: dayClassModifiers,
-    style: isHidden ? displayNone : undefined
-  }, void 0, /*#__PURE__*/_jsx__default['default'](Styleds.StyledDayBtn, {
-    "aria-label": "Date picker",
-    buttonType: "text",
-    labelText: `${day.getDate()}`,
-    size: "m",
-    onClick: handleOnDayClick // DSButton triggers this with "spacebar" and "enter" too...
-    ,
-    onFocus: handleOnDayFocus,
-    onKeyDown: e => {
-      handleDayOnKeyDown(e, metaDay);
-    },
-    innerRef: dayBtnRef,
-    tabIndex: isSelected ? 0 : -1,
-    "data-isfocused": isFocused,
-    "data-testid": ControlledDateTimePickerDatatestid.ControlledDateTimePickerDatatestid.CALENDAR[isFocused ? 'FOCUSED_DAY' : 'DAY']
+    style: isHidden ? displayNone : undefined,
+    role: !isInvisible ? 'gridcell' : undefined
+  }, Number.isInteger(colIndex) && {
+    'aria-colindex': colIndex
+  }), {}, {
+    children: /*#__PURE__*/_jsx__default["default"](Styleds.StyledDayBtn, {
+      "aria-label": "".concat(stringHelpers.getAriaDayFromDateString(dayAsString), ", ").concat(constants.weekDays[metaDay.day.getDay()]),
+      "aria-disabled": isOutOfRange || isDisabled,
+      "aria-hidden": !!isInvisible,
+      buttonType: "raw",
+      size: "m",
+      onClick: handleOnDayClick // DSButton triggers this with "spacebar" and "enter" too...
+      ,
+      onFocus: handleOnDayFocus,
+      onKeyDown: e => {
+        handleDayOnKeyDown(e, metaDay);
+      },
+      innerRef: dayBtnRef,
+      tabIndex: isSelected ? 0 : -1,
+      "data-isfocused": isFocused,
+      "data-testid": dataTestid
+    }, void 0, "".concat(day.getDate()))
   }));
 };