primereact 10.3.1 → 10.3.3

package/calendar/calendar.cjs.js

@@ -170,13 +170,14 @@ function _slicedToArray(arr, i) {
   return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray$1(arr, i) || _nonIterableRest();
 }
 
-var styles = "\n@layer primereact {\n    .p-calendar {\n        position: relative;\n        display: inline-flex;\n        max-width: 100%;\n    }\n    \n    .p-calendar .p-inputtext {\n        flex: 1 1 auto;\n        width: 1%;\n    }\n    \n    .p-calendar-w-btn-right .p-inputtext {\n        border-top-right-radius: 0;\n        border-bottom-right-radius: 0;\n    }\n    \n    .p-calendar-w-btn-right .p-datepicker-trigger {\n        border-top-left-radius: 0;\n        border-bottom-left-radius: 0;\n    }\n    \n    .p-calendar-w-btn-left .p-inputtext {\n        border-top-left-radius: 0;\n        border-bottom-left-radius: 0;\n    }\n    \n    .p-calendar-w-btn-left .p-datepicker-trigger {\n        border-top-right-radius: 0;\n        border-bottom-right-radius: 0;\n    }\n    \n    /* Fluid */\n    .p-fluid .p-calendar {\n        display: flex;\n    }\n    \n    .p-fluid .p-calendar .p-inputtext {\n        width: 1%;\n    }\n    \n    /* Datepicker */\n    .p-calendar .p-datepicker {\n        min-width: 100%;\n    }\n    \n    .p-datepicker {\n        width: auto;\n        position: absolute;\n        top: 0;\n        left: 0;\n    }\n    \n    .p-datepicker-inline {\n        display: inline-block;\n        position: static;\n        overflow-x: auto;\n    }\n    \n    /* Header */\n    .p-datepicker-header {\n        display: flex;\n        align-items: center;\n        justify-content: space-between;\n    }\n    \n    .p-datepicker-header .p-datepicker-title {\n        margin: 0 auto;\n    }\n    \n    .p-datepicker-prev,\n    .p-datepicker-next {\n        cursor: pointer;\n        display: inline-flex;\n        justify-content: center;\n        align-items: center;\n        overflow: hidden;\n        position: relative;\n    }\n    \n    /* Multiple Month DatePicker */\n    .p-datepicker-multiple-month .p-datepicker-group-container {\n        display: flex;\n    }\n    \n    .p-datepicker-multiple-month .p-datepicker-group-container .p-datepicker-group {\n        flex: 1 1 auto;\n    }\n    \n    /* Multiple Month DatePicker */\n    .p-datepicker-multiple-month .p-datepicker-group-container {\n        display: flex;\n    }\n    \n    /* DatePicker Table */\n    .p-datepicker table {\n        width: 100%;\n        border-collapse: collapse;\n    }\n    \n    .p-datepicker td > span {\n        display: flex;\n        justify-content: center;\n        align-items: center;\n        cursor: pointer;\n        margin: 0 auto;\n        overflow: hidden;\n        position: relative;\n    }\n    \n    /* Month Picker */\n    .p-monthpicker-month {\n        width: 33.3%;\n        display: inline-flex;\n        align-items: center;\n        justify-content: center;\n        cursor: pointer;\n        overflow: hidden;\n        position: relative;\n    }\n    \n    /*  Button Bar */\n    .p-datepicker-buttonbar {\n        display: flex;\n        justify-content: space-between;\n        align-items: center;\n    }\n    \n    /* Time Picker */\n    .p-timepicker {\n        display: flex;\n        justify-content: center;\n        align-items: center;\n    }\n    \n    .p-timepicker button {\n        display: flex;\n        align-items: center;\n        justify-content: center;\n        cursor: pointer;\n        overflow: hidden;\n        position: relative;\n    }\n    \n    .p-timepicker > div {\n        display: flex;\n        align-items: center;\n        flex-direction: column;\n    }\n    \n    /* Touch UI */\n    .p-datepicker-touch-ui,\n    .p-calendar .p-datepicker-touch-ui {\n        position: fixed;\n        top: 50%;\n        left: 50%;\n        min-width: 80vw;\n        transform: translate(-50%, -50%);\n    }\n    \n    /* Year Picker */\n    .p-yearpicker-year {\n        width: 50%;\n        display: inline-flex;\n        align-items: center;\n        justify-content: center;\n        cursor: pointer;\n        overflow: hidden;\n        position: relative;\n    }\n}\n";
+var styles = "\n@layer primereact {\n    .p-calendar {\n        position: relative;\n        display: inline-flex;\n        max-width: 100%;\n    }\n\n    .p-calendar .p-inputtext {\n        flex: 1 1 auto;\n        width: 1%;\n    }\n\n    .p-calendar-w-btn-right .p-inputtext {\n        border-top-right-radius: 0;\n        border-bottom-right-radius: 0;\n    }\n\n    .p-calendar-w-btn-right .p-datepicker-trigger {\n        border-top-left-radius: 0;\n        border-bottom-left-radius: 0;\n    }\n\n    .p-calendar-w-btn-left .p-inputtext {\n        border-top-left-radius: 0;\n        border-bottom-left-radius: 0;\n    }\n\n    .p-calendar-w-btn-left .p-datepicker-trigger {\n        border-top-right-radius: 0;\n        border-bottom-right-radius: 0;\n    }\n\n    /* Fluid */\n    .p-fluid .p-calendar {\n        display: flex;\n    }\n\n    .p-fluid .p-calendar .p-inputtext {\n        width: 1%;\n    }\n\n    /* Datepicker */\n    .p-calendar .p-datepicker {\n        min-width: 100%;\n    }\n\n    .p-datepicker {\n        width: auto;\n        position: absolute;\n        top: 0;\n        left: 0;\n    }\n\n    .p-datepicker-inline {\n        display: inline-block;\n        position: static;\n        overflow-x: auto;\n    }\n\n    /* Header */\n    .p-datepicker-header {\n        display: flex;\n        align-items: center;\n        justify-content: space-between;\n    }\n\n    .p-datepicker-header .p-datepicker-title {\n        margin: 0 auto;\n    }\n\n    .p-datepicker-prev,\n    .p-datepicker-next {\n        cursor: pointer;\n        display: inline-flex;\n        justify-content: center;\n        align-items: center;\n        overflow: hidden;\n        position: relative;\n    }\n\n    /* Multiple Month DatePicker */\n    .p-datepicker-multiple-month .p-datepicker-group-container {\n        display: flex;\n    }\n\n    .p-datepicker-multiple-month .p-datepicker-group-container .p-datepicker-group {\n        flex: 1 1 auto;\n    }\n\n    /* Multiple Month DatePicker */\n    .p-datepicker-multiple-month .p-datepicker-group-container {\n        display: flex;\n    }\n\n    /* DatePicker Table */\n    .p-datepicker table {\n        width: 100%;\n        border-collapse: collapse;\n    }\n\n    .p-datepicker td > span {\n        display: flex;\n        justify-content: center;\n        align-items: center;\n        cursor: pointer;\n        margin: 0 auto;\n        overflow: hidden;\n        position: relative;\n    }\n\n    /* Month Picker */\n    .p-monthpicker-month {\n        width: 33.3%;\n        display: inline-flex;\n        align-items: center;\n        justify-content: center;\n        cursor: pointer;\n        overflow: hidden;\n        position: relative;\n    }\n\n    /*  Button Bar */\n    .p-datepicker-buttonbar {\n        display: flex;\n        justify-content: space-between;\n        align-items: center;\n    }\n\n    /* Time Picker */\n    .p-timepicker {\n        display: flex;\n        justify-content: center;\n        align-items: center;\n    }\n\n    .p-timepicker button {\n        display: flex;\n        align-items: center;\n        justify-content: center;\n        cursor: pointer;\n        overflow: hidden;\n        position: relative;\n    }\n\n    .p-timepicker > div {\n        display: flex;\n        align-items: center;\n        flex-direction: column;\n    }\n\n    /* Touch UI */\n    .p-datepicker-touch-ui,\n    .p-calendar .p-datepicker-touch-ui {\n        position: fixed;\n        top: 50%;\n        left: 50%;\n        min-width: 80vw;\n        transform: translate(-50%, -50%);\n    }\n\n    /* Year Picker */\n    .p-yearpicker-year {\n        width: 50%;\n        display: inline-flex;\n        align-items: center;\n        justify-content: center;\n        cursor: pointer;\n        overflow: hidden;\n        position: relative;\n    }\n}\n";
 var classes = {
   root: function root(_ref) {
     var props = _ref.props,
       focusedState = _ref.focusedState,
-      isFilled = _ref.isFilled;
-    return utils.classNames('p-calendar p-component p-inputwrapper', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "p-calendar-w-btn p-calendar-w-btn-".concat(props.iconPos), props.showIcon), 'p-calendar-disabled', props.disabled), 'p-calendar-timeonly', props.timeOnly), 'p-inputwrapper-filled', props.value || isFilled), 'p-inputwrapper-focus', focusedState));
+      isFilled = _ref.isFilled,
+      panelVisible = _ref.panelVisible;
+    return utils.classNames('p-calendar p-component p-inputwrapper', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "p-calendar-w-btn p-calendar-w-btn-".concat(props.iconPos), props.showIcon), 'p-calendar-disabled', props.disabled), 'p-calendar-timeonly', props.timeOnly), 'p-inputwrapper-filled', props.value || isFilled), 'p-inputwrapper-focus', focusedState), 'p-focus', focusedState || panelVisible));
   },
   dropdownButton: 'p-datepicker-trigger',
   buttonbar: 'p-datepicker-buttonbar',
@@ -255,6 +256,7 @@ var CalendarBase = componentbase.ComponentBase.extend({
     __TYPE: 'Calendar',
     appendTo: null,
     ariaLabelledBy: null,
+    ariaLabel: null,
     autoZIndex: true,
     autoFocus: false,
     baseZIndex: 0,
@@ -355,18 +357,23 @@ var CalendarBase = componentbase.ComponentBase.extend({
 
 var CalendarPanel = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
   var cx = props.cx;
+  var mergeProps = hooks.useMergeProps();
   var createElement = function createElement() {
-    var panelProps = utils.mergeProps({
+    var panelProps = mergeProps({
       className: cx('panel', {
         panelClassName: props.className
       }),
       style: props.style,
+      role: props.inline ? null : 'dialog',
+      id: props.id,
+      'aria-label': PrimeReact.localeOption('chooseDate', props.locale),
+      'aria-modal': props.inline ? null : 'true',
       onClick: props.onClick,
       onMouseUp: props.onMouseUp
     }, props.ptm('panel', {
       hostName: props.hostName
     }));
-    var transitionProps = utils.mergeProps({
+    var transitionProps = mergeProps({
       classNames: cx('transition'),
       "in": props["in"],
       timeout: {
@@ -402,6 +409,7 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = hooks.useMergeProps();
   var context = React__namespace.useContext(PrimeReact.PrimeReactContext);
   var props = CalendarBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -416,6 +424,10 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     _React$useState6 = _slicedToArray(_React$useState5, 2),
     viewDateState = _React$useState6[0],
     setViewDateState = _React$useState6[1];
+  var _React$useState7 = React__namespace.useState(props.id),
+    _React$useState8 = _slicedToArray(_React$useState7, 2),
+    idState = _React$useState8[0],
+    setIdState = _React$useState8[1];
   var metaData = {
     props: props,
     state: {
@@ -444,26 +456,29 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   var isOverlayClicked = React__namespace.useRef(false);
   var previousButton = React__namespace.useRef(false);
   var nextButton = React__namespace.useRef(false);
+  var viewChangedWithKeyDown = React__namespace.useRef(false);
   var onChangeRef = React__namespace.useRef(null);
-  var _React$useState7 = React__namespace.useState('date'),
-    _React$useState8 = _slicedToArray(_React$useState7, 2),
-    currentView = _React$useState8[0],
-    setCurrentView = _React$useState8[1];
-  var _React$useState9 = React__namespace.useState(null),
+  var isClearClicked = React__namespace.useRef(false);
+  var _React$useState9 = React__namespace.useState('date'),
     _React$useState10 = _slicedToArray(_React$useState9, 2),
-    currentMonth = _React$useState10[0],
-    setCurrentMonth = _React$useState10[1];
+    currentView = _React$useState10[0],
+    setCurrentView = _React$useState10[1];
   var _React$useState11 = React__namespace.useState(null),
     _React$useState12 = _slicedToArray(_React$useState11, 2),
-    currentYear = _React$useState12[0],
-    setCurrentYear = _React$useState12[1];
-  var _React$useState13 = React__namespace.useState([]),
+    currentMonth = _React$useState12[0],
+    setCurrentMonth = _React$useState12[1];
+  var _React$useState13 = React__namespace.useState(null),
     _React$useState14 = _slicedToArray(_React$useState13, 2),
-    yearOptions = _React$useState14[0],
-    setYearOptions = _React$useState14[1];
+    currentYear = _React$useState14[0],
+    setCurrentYear = _React$useState14[1];
+  var _React$useState15 = React__namespace.useState([]),
+    _React$useState16 = _slicedToArray(_React$useState15, 2),
+    yearOptions = _React$useState16[0],
+    setYearOptions = _React$useState16[1];
   var previousValue = hooks.usePrevious(props.value);
   var visible = props.inline || (props.onVisibleChange ? props.visible : overlayVisibleState);
   var attributeSelector = utils.UniqueComponentId();
+  var panelId = idState + '_panel';
   var _useOverlayListener = hooks.useOverlayListener({
       target: elementRef,
       overlay: overlayRef,
@@ -471,7 +486,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         var type = _ref.type,
           valid = _ref.valid;
         if (valid) {
-          type === 'outside' ? !isOverlayClicked.current && !isNavIconClicked(event.target) && hide('outside') : hide();
+          type === 'outside' ? !isOverlayClicked.current && !isNavIconClicked(event.target) && hide('outside', reFocusInputField) : hide(null, reFocusInputField);
         }
         isOverlayClicked.current = false;
       },
@@ -501,21 +516,34 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     setFocusedState(false);
   };
   var onInputKeyDown = function onInputKeyDown(event) {
-    switch (event.which) {
-      //escape
-      case 27:
+    switch (event.code) {
+      case 'ArrowDown':
         {
-          hide();
+          if (!overlayVisibleState) {
+            show();
+          } else {
+            focusToFirstCell();
+            event.preventDefault();
+          }
           break;
         }
-
-      //tab
-      case 9:
+      case 'Escape':
         {
-          visible && trapFocus(event);
+          hide();
           props.touchUI && disableModality();
           break;
         }
+      case 'Tab':
+        {
+          if (overlayRef && overlayRef.current) {
+            utils.DomHandler.getFocusableElements(overlayRef.current).forEach(function (el) {
+              return el.tabIndex = '-1';
+            });
+            hide();
+            props.touchUI && disableModality();
+          }
+          break;
+        }
     }
   };
   var onUserInput = function onUserInput(event) {
@@ -578,28 +606,40 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     navForward(event);
   };
   var onContainerButtonKeydown = function onContainerButtonKeydown(event) {
-    switch (event.which) {
-      //tab
-      case 9:
-        trapFocus(event);
+    switch (event.code) {
+      case 'Tab':
+        !props.inline && trapFocus(event);
         break;
-
-      //escape
-      case 27:
+      case 'Escape':
         hide(null, reFocusInputField);
         event.preventDefault();
         break;
     }
   };
+  var onPickerKeyDown = function onPickerKeyDown(event, type, direction) {
+    if (event.code === 'Enter' || event.code === 'Space') {
+      onTimePickerElementMouseDown(event, type, direction);
+      event.preventDefault();
+      return;
+    }
+    onContainerButtonKeydown(event);
+  };
+  var onPickerKeyUp = function onPickerKeyUp(event) {
+    if (event.code === 'Enter' || event.code === 'Space') {
+      onTimePickerElementMouseUp();
+      event.preventDefault();
+      return;
+    }
+  };
   var trapFocus = function trapFocus(event) {
-    event.preventDefault();
+    event === null || event === void 0 || event.preventDefault();
     var focusableElements = utils.DomHandler.getFocusableElements(overlayRef.current);
     if (focusableElements && focusableElements.length > 0) {
       if (!document.activeElement) {
         focusableElements[0].focus();
       } else {
         var focusedIndex = focusableElements.indexOf(document.activeElement);
-        if (event.shiftKey) {
+        if (event !== null && event !== void 0 && event.shiftKey) {
           if (focusedIndex === -1 || focusedIndex === 0) focusableElements[focusableElements.length - 1].focus();else focusableElements[focusedIndex - 1].focus();
         } else {
           if (focusedIndex === -1 || focusedIndex === focusableElements.length - 1) focusableElements[0].focus();else focusableElements[focusedIndex + 1].focus();
@@ -632,7 +672,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   };
   var initFocusableCell = function initFocusableCell() {
     var cell;
-    if (props.view === 'month') {
+    if (currentView === 'month') {
       var cells = utils.DomHandler.find(overlayRef.current, '[data-pc-section="monthpicker"] [data-pc-section="month"]');
       var selectedCell = utils.DomHandler.findSingle(overlayRef.current, '[data-pc-section="monthpicker"] [data-pc-section="month"][data-p-highlight="true"]');
       cells.forEach(function (cell) {
@@ -650,6 +690,27 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
       cell.tabIndex = '0';
     }
   };
+  var focusToFirstCell = function focusToFirstCell() {
+    if (currentView) {
+      var cell;
+      if (currentView === 'date') {
+        cell = utils.DomHandler.findSingle(overlayRef.current, 'span[data-p-highlight="true"]');
+        if (!cell) {
+          var todayCell = utils.DomHandler.findSingle(overlayRef.current, 'td.p-datepicker-today span:not(.p-disabled)');
+          cell = todayCell || utils.DomHandler.findSingle(overlayRef.current, 'table td span:not([data-p-disabled="true"])');
+        }
+      } else if (currentView === 'month' || currentView === 'year') {
+        cell = utils.DomHandler.findSingle(overlayRef.current, 'span[data-p-highlight="true"]');
+        if (!cell) {
+          cell = utils.DomHandler.findSingle(overlayRef.current, "[data-pc-section=\"".concat(currentView, "picker\"] [data-pc-section=\"").concat(currentView, "\"]:not([data-p-disabled=\"true\"])"));
+        }
+      }
+      if (cell) {
+        cell.tabIndex = '0';
+        cell && cell.focus();
+      }
+    }
+  };
   var navBackward = function navBackward(event) {
     if (props.disabled) {
       event.preventDefault();
@@ -779,6 +840,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     props.onTodayButtonClick && props.onTodayButtonClick(event);
   };
   var onClearButtonClick = function onClearButtonClick(event) {
+    isClearClicked.current = true;
     updateModel(event, null);
     updateInputfield(null);
     hide();
@@ -1260,23 +1322,29 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   var onDateCellKeydown = function onDateCellKeydown(event, date, groupIndex) {
     var cellContent = event.currentTarget;
     var cell = cellContent.parentElement;
-    switch (event.which) {
-      //down arrow
-      case 40:
+    var cellIndex = utils.DomHandler.index(cell);
+    switch (event.code) {
+      case 'ArrowDown':
         {
           cellContent.tabIndex = '-1';
-          var cellIndex = utils.DomHandler.index(cell);
           var nextRow = cell.parentElement.nextElementSibling;
           if (nextRow) {
-            var focusCell = nextRow.children[cellIndex].children[0];
-            if (utils.DomHandler.hasClass(focusCell, 'p-disabled')) {
+            var tableRowIndex = utils.DomHandler.index(cell.parentElement);
+            var tableRows = Array.from(cell.parentElement.parentElement.children);
+            var nextTableRows = tableRows.slice(tableRowIndex + 1);
+            var hasNextFocusableDate = nextTableRows.find(function (el) {
+              var focusCell = el.children[cellIndex].children[0];
+              return !utils.DomHandler.getAttribute(focusCell, 'data-p-disabled');
+            });
+            if (hasNextFocusableDate) {
+              var focusCell = hasNextFocusableDate.children[cellIndex].children[0];
+              focusCell.tabIndex = '0';
+              focusCell.focus();
+            } else {
               navigation.current = {
                 backward: false
               };
               navForward(event);
-            } else {
-              nextRow.children[cellIndex].children[0].tabIndex = '0';
-              nextRow.children[cellIndex].children[0].focus();
             }
           } else {
             navigation.current = {
@@ -1287,46 +1355,58 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
           event.preventDefault();
           break;
         }
-
-      //up arrow
-      case 38:
+      case 'ArrowUp':
         {
           cellContent.tabIndex = '-1';
-          var _cellIndex = utils.DomHandler.index(cell);
-          var prevRow = cell.parentElement.previousElementSibling;
-          if (prevRow) {
-            var _focusCell = prevRow.children[_cellIndex].children[0];
-            if (utils.DomHandler.hasClass(_focusCell, 'p-disabled')) {
+          if (event.altKey) {
+            hide(null, reFocusInputField);
+          } else {
+            var prevRow = cell.parentElement.previousElementSibling;
+            if (prevRow) {
+              var _tableRowIndex = utils.DomHandler.index(cell.parentElement);
+              var _tableRows = Array.from(cell.parentElement.parentElement.children);
+              var prevTableRows = _tableRows.slice(0, _tableRowIndex).reverse();
+              var _hasNextFocusableDate = prevTableRows.find(function (el) {
+                var focusCell = el.children[cellIndex].children[0];
+                return !utils.DomHandler.getAttribute(focusCell, 'data-p-disabled');
+              });
+              if (_hasNextFocusableDate) {
+                var _focusCell = _hasNextFocusableDate.children[cellIndex].children[0];
+                _focusCell.tabIndex = '0';
+                _focusCell.focus();
+              } else {
+                navigation.current = {
+                  backward: true
+                };
+                navBackward(event);
+              }
+            } else {
               navigation.current = {
                 backward: true
               };
               navBackward(event);
-            } else {
-              _focusCell.tabIndex = '0';
-              _focusCell.focus();
             }
-          } else {
-            navigation.current = {
-              backward: true
-            };
-            navBackward(event);
           }
           event.preventDefault();
           break;
         }
-
-      //left arrow
-      case 37:
+      case 'ArrowLeft':
         {
           cellContent.tabIndex = '-1';
           var prevCell = cell.previousElementSibling;
           if (prevCell) {
-            var _focusCell2 = prevCell.children[0];
-            if (utils.DomHandler.hasClass(_focusCell2, 'p-disabled')) {
-              navigateToMonth(true, groupIndex, event);
-            } else {
+            var cells = Array.from(cell.parentElement.children);
+            var prevCells = cells.slice(0, cellIndex).reverse();
+            var _hasNextFocusableDate2 = prevCells.find(function (el) {
+              var focusCell = el.children[0];
+              return !utils.DomHandler.getAttribute(focusCell, 'data-p-disabled');
+            });
+            if (_hasNextFocusableDate2) {
+              var _focusCell2 = _hasNextFocusableDate2.children[0];
               _focusCell2.tabIndex = '0';
               _focusCell2.focus();
+            } else {
+              navigateToMonth(true, groupIndex, event);
             }
           } else {
             navigateToMonth(true, groupIndex, event);
@@ -1334,19 +1414,23 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
           event.preventDefault();
           break;
         }
-
-      //right arrow
-      case 39:
+      case 'ArrowRight':
         {
           cellContent.tabIndex = '-1';
           var nextCell = cell.nextElementSibling;
           if (nextCell) {
-            var _focusCell3 = nextCell.children[0];
-            if (utils.DomHandler.hasClass(_focusCell3, 'p-disabled')) {
-              navigateToMonth(false, groupIndex, event);
-            } else {
+            var _cells = Array.from(cell.parentElement.children);
+            var nextCells = _cells.slice(cellIndex + 1);
+            var _hasNextFocusableDate3 = nextCells.find(function (el) {
+              var focusCell = el.children[0];
+              return !utils.DomHandler.getAttribute(focusCell, 'data-p-disabled');
+            });
+            if (_hasNextFocusableDate3) {
+              var _focusCell3 = _hasNextFocusableDate3.children[0];
               _focusCell3.tabIndex = '0';
               _focusCell3.focus();
+            } else {
+              navigateToMonth(false, groupIndex, event);
             }
           } else {
             navigateToMonth(false, groupIndex, event);
@@ -1354,27 +1438,75 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
           event.preventDefault();
           break;
         }
-
-      //enter
-      case 13:
+      case 'Enter':
+      case 'NumpadEnter':
+      case 'Space':
         {
           onDateSelect(event, date);
           event.preventDefault();
           break;
         }
-
-      //escape
-      case 27:
+      case 'Escape':
         {
           hide(null, reFocusInputField);
           event.preventDefault();
           break;
         }
-
-      //tab
-      case 9:
+      case 'Tab':
         {
-          trapFocus(event);
+          if (!props.inline) trapFocus(event);
+          break;
+        }
+      case 'Home':
+        {
+          cellContent.tabIndex = '-1';
+          var currentRow = cell.parentElement;
+          var _focusCell4 = currentRow.children[0].children[0];
+          if (utils.DomHandler.getAttribute(_focusCell4, 'data-p-disabled')) {
+            navigateToMonth(groupIndex, true, event);
+          } else {
+            _focusCell4.tabIndex = '0';
+            _focusCell4.focus();
+          }
+          event.preventDefault();
+          break;
+        }
+      case 'End':
+        {
+          cellContent.tabIndex = '-1';
+          var _currentRow = cell.parentElement;
+          var _focusCell5 = _currentRow.children[_currentRow.children.length - 1].children[0];
+          if (utils.DomHandler.getAttribute(_focusCell5, 'data-p-disabled')) {
+            navigateToMonth(groupIndex, false, event);
+          } else {
+            _focusCell5.tabIndex = '0';
+            _focusCell5.focus();
+          }
+          event.preventDefault();
+          break;
+        }
+      case 'PageUp':
+        {
+          cellContent.tabIndex = '-1';
+          if (event.shiftKey) {
+            navigation.current = {
+              backward: true
+            };
+            navBackward(event);
+          } else navigateToMonth(groupIndex, true, event);
+          event.preventDefault();
+          break;
+        }
+      case 'PageDown':
+        {
+          cellContent.tabIndex = '-1';
+          if (event.shiftKey) {
+            navigation.current = {
+              backward: false
+            };
+            navForward(event);
+          } else navigateToMonth(groupIndex, false, event);
+          event.preventDefault();
           break;
         }
     }
@@ -1401,18 +1533,18 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         navForward(event);
       } else {
         var nextMonthContainer = overlayRef.current.children[groupIndex + 1];
-        var _focusCell4 = utils.DomHandler.findSingle(nextMonthContainer, 'table td span:not([data-p-disabled="true"])');
-        _focusCell4.tabIndex = '0';
-        _focusCell4.focus();
+        var _focusCell6 = utils.DomHandler.findSingle(nextMonthContainer, 'table td span:not([data-p-disabled="true"])');
+        _focusCell6.tabIndex = '0';
+        _focusCell6.focus();
       }
     }
   };
   var onMonthCellKeydown = function onMonthCellKeydown(event, index) {
     var cell = event.currentTarget;
-    switch (event.which) {
+    switch (event.code) {
       //arrows
-      case 38:
-      case 40:
+      case 'ArrowUp':
+      case 'ArrowDown':
         {
           cell.tabIndex = '-1';
           var cells = cell.parentElement.children;
@@ -1425,51 +1557,162 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
           event.preventDefault();
           break;
         }
-
-      //left arrow
-      case 37:
+      case 'ArrowLeft':
         {
           cell.tabIndex = '-1';
           var prevCell = cell.previousElementSibling;
           if (prevCell) {
             prevCell.tabIndex = '0';
             prevCell.focus();
+          } else {
+            navigation.current = {
+              backward: true
+            };
+            navBackward(event);
           }
           event.preventDefault();
           break;
         }
-
-      //right arrow
-      case 39:
+      case 'ArrowRight':
         {
           cell.tabIndex = '-1';
           var _nextCell = cell.nextElementSibling;
           if (_nextCell) {
             _nextCell.tabIndex = '0';
             _nextCell.focus();
+          } else {
+            navigation.current = {
+              backward: false
+            };
+            navForward(event);
           }
           event.preventDefault();
           break;
         }
-
-      //enter
-      case 13:
+      case 'PageUp':
+        {
+          if (event.shiftKey) return;
+          navigation.current = {
+            backward: true
+          };
+          navBackward(event);
+          break;
+        }
+      case 'PageDown':
         {
+          if (event.shiftKey) return;
+          navigation.current = {
+            backward: false
+          };
+          navForward(event);
+          break;
+        }
+      case 'Enter':
+      case 'NumpadEnter':
+      case 'Space':
+        {
+          if (props.view !== 'month') viewChangedWithKeyDown.current = true;
           onMonthSelect(event, index);
           event.preventDefault();
           break;
         }
-
-      //escape
-      case 27:
+      case 'Escape':
         {
           hide(null, reFocusInputField);
           event.preventDefault();
           break;
         }
-
-      //tab
-      case 9:
+      case 'Tab':
+        {
+          trapFocus(event);
+          break;
+        }
+    }
+  };
+  var onYearCellKeydown = function onYearCellKeydown(event, index) {
+    var cell = event.currentTarget;
+    switch (event.code) {
+      //arrows
+      case 'ArrowUp':
+      case 'ArrowDown':
+        {
+          cell.tabIndex = '-1';
+          var cells = cell.parentElement.children;
+          var cellIndex = utils.DomHandler.index(cell);
+          var nextCell = cells[event.code === 'ArrowDown' ? cellIndex + 2 : cellIndex - 2];
+          if (nextCell) {
+            nextCell.tabIndex = '0';
+            nextCell.focus();
+          }
+          event.preventDefault();
+          break;
+        }
+      case 'ArrowLeft':
+        {
+          cell.tabIndex = '-1';
+          var prevCell = cell.previousElementSibling;
+          if (prevCell) {
+            prevCell.tabIndex = '0';
+            prevCell.focus();
+          } else {
+            navigation.current = {
+              backward: true
+            };
+            navBackward(event);
+          }
+          event.preventDefault();
+          break;
+        }
+      case 'ArrowRight':
+        {
+          cell.tabIndex = '-1';
+          var _nextCell2 = cell.nextElementSibling;
+          if (_nextCell2) {
+            _nextCell2.tabIndex = '0';
+            _nextCell2.focus();
+          } else {
+            navigation.current = {
+              backward: false
+            };
+            navForward(event);
+          }
+          event.preventDefault();
+          break;
+        }
+      case 'PageUp':
+        {
+          if (event.shiftKey) return;
+          navigation.current = {
+            backward: true
+          };
+          navBackward(event);
+          break;
+        }
+      case 'PageDown':
+        {
+          if (event.shiftKey) return;
+          navigation.current = {
+            backward: false
+          };
+          navForward(event);
+          break;
+        }
+      case 'Enter':
+      case 'NumpadEnter':
+      case 'Space':
+        {
+          if (props.view !== 'year') viewChangedWithKeyDown.current = true;
+          onYearSelect(event, index);
+          event.preventDefault();
+          break;
+        }
+      case 'Escape':
+        {
+          hide(null, reFocusInputField);
+          event.preventDefault();
+          break;
+        }
+      case 'Tab':
         {
           trapFocus(event);
           break;
@@ -1586,10 +1829,16 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     return _currentYear;
   };
   var switchToMonthView = function switchToMonthView(event) {
+    if (event && event.code && (event.code === 'Enter' || event.code === 'Space')) {
+      viewChangedWithKeyDown.current = true;
+    }
     setCurrentView('month');
     event.preventDefault();
   };
   var switchToYearView = function switchToYearView(event) {
+    if (event && event.code && (event.code === 'Enter' || event.code === 'Space')) {
+      viewChangedWithKeyDown.current = true;
+    }
     setCurrentView('year');
     event.preventDefault();
   };
@@ -1615,6 +1864,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         month: month + 1,
         year: currentYear
       });
+      updateViewDate(event, currentDate);
     }
   };
   var onYearSelect = function onYearSelect(event, year) {
@@ -1729,7 +1979,6 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   var onOverlayEntered = function onOverlayEntered() {
     bindOverlayListener();
     props.onShow && props.onShow();
-    utils.DomHandler.focusFirstElement(overlayRef.current);
     setFocusedState(false);
   };
   var onOverlayExit = function onOverlayExit() {
@@ -2405,8 +2654,13 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     if (isNaN(h) || isNaN(m) || h > 23 || m > 59 || props.hourFormat === '12' && h > 12 || props.showSeconds && (isNaN(s) || s > 59) || props.showMillisec && (isNaN(s) || s > 1000)) {
       throw new Error('Invalid time');
     } else {
-      if (props.hourFormat === '12' && h !== 12 && ampm === 'PM') {
-        h += 12;
+      if (props.hourFormat === '12') {
+        if (h !== 12 && ampm === 'PM') {
+          h += 12;
+        }
+        if (h === 12 && ampm === 'AM') {
+          h -= 12;
+        }
       }
       return {
         hour: h,
@@ -2595,6 +2849,10 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     setCurrentMonth(viewDate.getMonth());
     setCurrentYear(viewDate.getFullYear());
     setCurrentView(props.view);
+    if (!idState) {
+      var uniqueId = utils.UniqueComponentId();
+      !idState && setIdState(uniqueId);
+    }
     if (props.inline) {
       overlayRef && overlayRef.current.setAttribute(attributeSelector, '');
       if (!props.disabled) {
@@ -2642,8 +2900,14 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [props.disabled, props.mask, props.readOnlyInput]);
   hooks.useUpdateEffect(function () {
-    setCurrentView(props.view);
+    if (viewChangedWithKeyDown.current) {
+      setCurrentView(props.view);
+    }
+    viewChangedWithKeyDown.current = false;
   }, [props.view]);
+  hooks.useUpdateEffect(function () {
+    focusToFirstCell();
+  }, [currentView]);
   hooks.useUpdateEffect(function () {
     if (!props.onViewDateChange && !viewStateChanged.current) {
       setValue(props.value);
@@ -2734,12 +2998,16 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     if (Array.isArray(prevPropValue)) {
       prevPropValue = prevPropValue[0];
     }
+    var viewDate = props.viewDate && isValidDate(props.viewDate) ? props.viewDate : propValue && isValidDate(propValue) ? propValue : new Date();
+    if (isClearClicked.current && props.showTime) {
+      viewDate.setHours(0, 0, 0);
+      isClearClicked.current = false;
+    }
     if (!prevPropValue && propValue || propValue && propValue instanceof Date && propValue.getTime() !== prevPropValue.getTime()) {
-      var viewDate = props.viewDate && isValidDate(props.viewDate) ? props.viewDate : propValue && isValidDate(propValue) ? propValue : new Date();
       validateDate(viewDate);
-      setViewDateState(viewDate);
-      viewStateChanged.current = true;
     }
+    setViewDateState(viewDate);
+    viewStateChanged.current = true;
   };
   var createBackwardNavigator = function createBackwardNavigator(isVisible) {
     var navigatorProps = isVisible ? {
@@ -2752,16 +3020,22 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         visibility: 'hidden'
       }
     };
-    var previousIconProps = utils.mergeProps({
+    var previousIconProps = mergeProps({
       className: cx('previousIcon')
     }, ptm('previousIcon'));
     var icon = props.prevIcon || /*#__PURE__*/React__namespace.createElement(chevronleft.ChevronLeftIcon, previousIconProps);
     var backwardNavigatorIcon = utils.IconUtils.getJSXIcon(icon, _objectSpread({}, previousIconProps), {
       props: props
     });
-    var previousButtonProps = utils.mergeProps(_objectSpread({
+    var _localeOptions4 = PrimeReact.localeOptions(props.locale),
+      prevDecade = _localeOptions4.prevDecade,
+      prevYear = _localeOptions4.prevYear,
+      prevMonth = _localeOptions4.prevMonth;
+    var previousButtonLabel = currentView === 'year' ? prevDecade : currentView === 'month' ? prevYear : prevMonth;
+    var previousButtonProps = mergeProps(_objectSpread({
       type: 'button',
-      className: cx('previousButton')
+      className: cx('previousButton'),
+      'aria-label': previousButtonLabel
     }, navigatorProps), ptm('previousButton'));
     return /*#__PURE__*/React__namespace.createElement("button", _extends({
       ref: previousButton
@@ -2778,16 +3052,22 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         visibility: 'hidden'
       }
     };
-    var nextIconProps = utils.mergeProps({
+    var nextIconProps = mergeProps({
       className: cx('nextIcon')
     }, ptm('nextIcon'));
     var icon = props.nextIcon || /*#__PURE__*/React__namespace.createElement(chevronright.ChevronRightIcon, nextIconProps);
     var forwardNavigatorIcon = utils.IconUtils.getJSXIcon(icon, _objectSpread({}, nextIconProps), {
       props: props
     });
-    var nextButtonProps = utils.mergeProps(_objectSpread({
+    var _localeOptions5 = PrimeReact.localeOptions(props.locale),
+      nextDecade = _localeOptions5.nextDecade,
+      nextYear = _localeOptions5.nextYear,
+      nextMonth = _localeOptions5.nextMonth;
+    var nextButtonLabel = currentView === 'year' ? nextDecade : currentView === 'month' ? nextYear : nextMonth;
+    var nextButtonProps = mergeProps(_objectSpread({
       type: 'button',
-      className: cx('nextButton')
+      className: cx('nextButton'),
+      'aria-label': nextButtonLabel
     }, navigatorProps), ptm('nextButton'));
     return /*#__PURE__*/React__namespace.createElement("button", _extends({
       ref: nextButton
@@ -2813,7 +3093,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
       var displayedMonthNames = displayedMonthOptions.map(function (option) {
         return option.label;
       });
-      var selectProps = utils.mergeProps({
+      var selectProps = mergeProps({
         className: cx('select'),
         onChange: function onChange(e) {
           return onMonthDropdownChange(e, e.target.value);
@@ -2821,7 +3101,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         value: viewMonth
       }, ptm('select'));
       var _content = /*#__PURE__*/React__namespace.createElement("select", selectProps, displayedMonthOptions.map(function (option) {
-        var optionProps = utils.mergeProps({
+        var optionProps = mergeProps({
           value: option.value
         }, ptm('option'));
         return /*#__PURE__*/React__namespace.createElement("option", _extends({}, optionProps, {
@@ -2842,8 +3122,10 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
       }
       return _content;
     }
-    var monthTitleProps = utils.mergeProps({
+    var monthTitleProps = mergeProps({
       className: cx('monthTitle'),
+      onKeyDown: onContainerButtonKeydown,
+      'aria-label': PrimeReact.localeOption('chooseMonth', props.locale),
       onClick: switchToMonthView,
       disabled: switchViewButtonDisabled()
     }, ptm('monthTitle'));
@@ -2863,7 +3145,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
       var displayedYearNames = _yearOptions2.filter(function (year) {
         return !(props.minDate && props.minDate.getFullYear() > year) && !(props.maxDate && props.maxDate.getFullYear() < year);
       });
-      var selectProps = utils.mergeProps({
+      var selectProps = mergeProps({
         className: cx('select'),
         onChange: function onChange(e) {
           return onYearDropdownChange(e, e.target.value);
@@ -2871,7 +3153,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         value: viewYear
       }, ptm('select'));
       var _content2 = /*#__PURE__*/React__namespace.createElement("select", selectProps, displayedYearNames.map(function (year) {
-        var optionProps = utils.mergeProps({
+        var optionProps = mergeProps({
           value: year
         }, ptm('option'));
         return /*#__PURE__*/React__namespace.createElement("option", _extends({}, optionProps, {
@@ -2900,8 +3182,9 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
       return _content2;
     }
     var displayYear = props.numberOfMonths > 1 ? metaYear : currentYear;
-    var yearTitleProps = utils.mergeProps({
+    var yearTitleProps = mergeProps({
       className: cx('yearTitle'),
+      'aria-label': PrimeReact.localeOption('chooseYear', props.locale),
       onClick: function onClick(e) {
         return switchToYearView(e);
       },
@@ -2911,11 +3194,11 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   };
   var createTitleDecadeElement = function createTitleDecadeElement() {
     var years = yearPickerValues();
-    var decadeTitleProps = utils.mergeProps({
+    var decadeTitleProps = mergeProps({
       className: cx('decadeTitle')
     }, ptm('decadeTitle'));
     if (currentView === 'year') {
-      var decadeTitleTextProps = utils.mergeProps(ptm('decadeTitleText'));
+      var decadeTitleTextProps = mergeProps(ptm('decadeTitleText'));
       return /*#__PURE__*/React__namespace.createElement("span", decadeTitleProps, props.decadeTemplate ? props.decadeTemplate(years) : /*#__PURE__*/React__namespace.createElement("span", decadeTitleTextProps, "".concat(yearPickerValues()[0], " - ").concat(yearPickerValues()[yearPickerValues().length - 1])));
     }
     return null;
@@ -2924,15 +3207,15 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     var month = createTitleMonthElement(monthMetaData.month, index);
     var year = createTitleYearElement(monthMetaData.year);
     var decade = createTitleDecadeElement();
-    var titleProps = utils.mergeProps({
+    var titleProps = mergeProps({
       className: cx('title')
     }, ptm('title'));
     var showMonthAfterYear = PrimeReact.localeOption('showMonthAfterYear', props.locale);
     return /*#__PURE__*/React__namespace.createElement("div", titleProps, showMonthAfterYear ? year : month, showMonthAfterYear ? month : year, decade);
   };
   var createDayNames = function createDayNames(weekDays) {
-    var weekDayProps = utils.mergeProps(ptm('weekDay'));
-    var tableHeaderCellProps = utils.mergeProps({
+    var weekDayProps = mergeProps(ptm('weekDay'));
+    var tableHeaderCellProps = mergeProps({
       scope: 'col'
     }, ptm('tableHeaderCell'));
     var dayNames = weekDays.map(function (weekDay, index) {
@@ -2941,7 +3224,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
       }), /*#__PURE__*/React__namespace.createElement("span", weekDayProps, weekDay));
     });
     if (props.showWeek) {
-      var weekHeaderProps = utils.mergeProps({
+      var weekHeaderProps = mergeProps({
         scope: 'col',
         className: cx('weekHeader'),
         'data-p-disabled': props.showWeek
@@ -2950,7 +3233,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
           disabled: props.showWeek
         }
       }));
-      var weekLabel = utils.mergeProps(ptm('weekLabel'));
+      var weekLabel = mergeProps(ptm('weekLabel'));
       var weekHeader = /*#__PURE__*/React__namespace.createElement("th", _extends({}, weekHeaderProps, {
         key: "wn"
       }), /*#__PURE__*/React__namespace.createElement("span", weekLabel, PrimeReact.localeOption('weekHeader', props.locale)));
@@ -2960,25 +3243,33 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   };
   var createDateCellContent = function createDateCellContent(date, className, groupIndex) {
     var content = props.dateTemplate ? props.dateTemplate(date) : date.day;
-    var dayLabelProps = utils.mergeProps({
+    var selected = isSelected(date);
+    var dayLabelProps = mergeProps({
       className: cx('dayLabel', {
         className: className
       }),
+      'aria-selected': selected,
+      'aria-disabled': !date.selectable,
       onClick: function onClick(e) {
         return onDateSelect(e, date);
       },
       onKeyDown: function onKeyDown(e) {
         return onDateCellKeydown(e, date, groupIndex);
       },
-      'data-p-highlight': isSelected(date),
+      'data-p-highlight': selected,
       'data-p-disabled': !date.selectable
     }, ptm('dayLabel', {
       context: {
-        selected: isSelected(date),
+        selected: selected,
         disabled: !date.selectable
       }
     }));
-    return /*#__PURE__*/React__namespace.createElement("span", dayLabelProps, content);
+    return /*#__PURE__*/React__namespace.createElement("span", dayLabelProps, content, selected && /*#__PURE__*/React__namespace.createElement("div", {
+      "aria-live": "polite",
+      className: "p-hidden-accessible",
+      "data-p-hidden-accessible": true,
+      pt: ptm('hiddenSelectedDay')
+    }));
   };
   var createWeek = function createWeek(weekDates, weekNumber, groupIndex) {
     var week = weekDates.map(function (date) {
@@ -2988,10 +3279,11 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         'p-disabled': !date.selectable
       });
       var content = date.otherMonth && !props.showOtherMonths ? null : createDateCellContent(date, dateClassName, groupIndex);
-      var dayProps = utils.mergeProps({
+      var dayProps = mergeProps({
         className: cx('day', {
           date: date
         }),
+        'aria-label': date.day,
         'data-p-today': date.today,
         'data-p-other-month': date.otherMonth
       }, ptm('day', {
@@ -3006,10 +3298,10 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
       }), content);
     });
     if (props.showWeek) {
-      var weekNumberProps = utils.mergeProps({
+      var weekNumberProps = mergeProps({
         className: cx('weekNumber')
       }, ptm('weekNumber'));
-      var weekLabelContainerProps = utils.mergeProps({
+      var weekLabelContainerProps = mergeProps({
         className: cx('weekLabelContainer'),
         'data-p-disabled': props.showWeek
       }, ptm('weekLabelContainer', {
@@ -3025,7 +3317,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     return week;
   };
   var createDates = function createDates(monthMetaData, groupIndex) {
-    var tableBodyRowProps = utils.mergeProps(ptm('tableBodyRowProps'));
+    var tableBodyRowProps = mergeProps(ptm('tableBodyRowProps'));
     return monthMetaData.dates.map(function (weekDates, index) {
       return /*#__PURE__*/React__namespace.createElement("tr", _extends({}, tableBodyRowProps, {
         key: index
@@ -3035,16 +3327,17 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   var createDateViewGrid = function createDateViewGrid(monthMetaData, weekDays, groupIndex) {
     var dayNames = createDayNames(weekDays);
     var dates = createDates(monthMetaData, groupIndex);
-    var containerProps = utils.mergeProps({
+    var containerProps = mergeProps({
       className: cx('container'),
       key: utils.UniqueComponentId('calendar_container_')
     }, ptm('container'));
-    var tableProps = utils.mergeProps({
+    var tableProps = mergeProps({
+      role: 'grid',
       className: cx('table')
     }, ptm('table'));
-    var tableHeaderProps = utils.mergeProps(ptm('tableHeader'));
-    var tableHeaderRowProps = utils.mergeProps(ptm('tableHeaderRow'));
-    var tableBodyProps = utils.mergeProps(ptm('tableBody'));
+    var tableHeaderProps = mergeProps(ptm('tableHeader'));
+    var tableHeaderRowProps = mergeProps(ptm('tableHeaderRow'));
+    var tableBodyProps = mergeProps(ptm('tableBody'));
     return currentView === 'date' && /*#__PURE__*/React__namespace.createElement("div", containerProps, /*#__PURE__*/React__namespace.createElement("table", tableProps, /*#__PURE__*/React__namespace.createElement("thead", tableHeaderProps, /*#__PURE__*/React__namespace.createElement("tr", tableHeaderRowProps, dayNames)), /*#__PURE__*/React__namespace.createElement("tbody", tableBodyProps, dates)));
   };
   var createMonth = function createMonth(monthMetaData, index) {
@@ -3055,10 +3348,10 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     var dateViewGrid = createDateViewGrid(monthMetaData, weekDays, index);
     var header = props.headerTemplate ? props.headerTemplate() : null;
     var monthKey = monthMetaData.month + '-' + monthMetaData.year;
-    var groupProps = utils.mergeProps({
+    var groupProps = mergeProps({
       className: cx('group')
     }, ptm('group'));
-    var headerProps = utils.mergeProps({
+    var headerProps = mergeProps({
       className: cx('header'),
       key: index
     }, ptm('header'));
@@ -3068,7 +3361,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   };
   var createMonths = function createMonths(monthsMetaData) {
     var groups = monthsMetaData.map(createMonth);
-    var groupContainerProps = utils.mergeProps({
+    var groupContainerProps = mergeProps({
       className: cx('groupContainer')
     }, ptm('groupContainer'));
     return /*#__PURE__*/React__namespace.createElement("div", groupContainerProps, groups);
@@ -3100,16 +3393,16 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     var forwardNavigator = createForwardNavigator(true);
     var yearElement = createTitleYearElement(getViewDate().getFullYear());
     var decade = createTitleDecadeElement();
-    var groupContainerProps = utils.mergeProps({
+    var groupContainerProps = mergeProps({
       className: cx('groupContainer')
     }, ptm('groupContainer'));
-    var groupProps = utils.mergeProps({
+    var groupProps = mergeProps({
       className: cx('group')
     }, ptm('group'));
-    var headerProps = utils.mergeProps({
+    var headerProps = mergeProps({
       className: cx('header')
     }, ptm('header'));
-    var titleProps = utils.mergeProps({
+    var titleProps = mergeProps({
       className: cx('title')
     }, ptm('title'));
     return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement("div", groupContainerProps, /*#__PURE__*/React__namespace.createElement("div", groupProps, /*#__PURE__*/React__namespace.createElement("div", headerProps, backwardNavigator, /*#__PURE__*/React__namespace.createElement("div", titleProps, yearElement, decade), forwardNavigator))));
@@ -3124,8 +3417,8 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     }
     return null;
   };
-  var incrementIconProps = utils.mergeProps(ptm('incrementIcon'));
-  var decrementIconProps = utils.mergeProps(ptm('decrementIcon'));
+  var incrementIconProps = mergeProps(ptm('incrementIcon'));
+  var decrementIconProps = mergeProps(ptm('decrementIcon'));
   var incrementIcon = utils.IconUtils.getJSXIcon(props.incrementIcon || /*#__PURE__*/React__namespace.createElement(chevronup.ChevronUpIcon, incrementIconProps), _objectSpread({}, incrementIconProps), {
     props: props
   });
@@ -3142,34 +3435,41 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     if (props.hourFormat === '12') {
       if (hour === 0) hour = 12;else if (hour > 11 && hour !== 12) hour = hour - 12;
     }
-    var hourProps = utils.mergeProps(ptm('hour'));
+    var hourProps = mergeProps(ptm('hour'));
+    var _localeOptions6 = PrimeReact.localeOptions(props.locale),
+      nextHour = _localeOptions6.nextHour,
+      prevHour = _localeOptions6.prevHour;
     var hourDisplay = hour < 10 ? '0' + hour : hour;
-    var hourPickerProps = utils.mergeProps({
+    var hourPickerProps = mergeProps({
       className: cx('hourPicker')
     }, ptm('hourPicker'));
-    var incrementButtonProps = utils.mergeProps({
+    var incrementButtonProps = mergeProps({
       type: 'button',
       className: cx('incrementButton'),
+      'aria-label': nextHour,
       onMouseDown: function onMouseDown(e) {
         return onTimePickerElementMouseDown(e, 0, 1);
       },
       onMouseUp: onTimePickerElementMouseUp,
       onMouseLeave: onTimePickerElementMouseLeave,
       onKeyDown: function onKeyDown(e) {
-        return onContainerButtonKeydown(e);
-      }
+        return onPickerKeyDown(e, 0, 1);
+      },
+      onKeyUp: onPickerKeyUp
     }, ptm('incrementButton'));
-    var decrementButtonProps = utils.mergeProps({
+    var decrementButtonProps = mergeProps({
       type: 'button',
       className: cx('decrementButton'),
+      'aria-label': prevHour,
       onMouseDown: function onMouseDown(e) {
         return onTimePickerElementMouseDown(e, 0, -1);
       },
       onMouseUp: onTimePickerElementMouseUp,
       onMouseLeave: onTimePickerElementMouseLeave,
       onKeyDown: function onKeyDown(e) {
-        return onContainerButtonKeydown(e);
-      }
+        return onPickerKeyDown(e, 0, -1);
+      },
+      onKeyUp: onPickerKeyUp
     }, ptm('decrementButton'));
     return /*#__PURE__*/React__namespace.createElement("div", hourPickerProps, /*#__PURE__*/React__namespace.createElement("button", incrementButtonProps, incrementIcon, /*#__PURE__*/React__namespace.createElement(ripple.Ripple, null)), /*#__PURE__*/React__namespace.createElement("span", hourProps, hourDisplay), /*#__PURE__*/React__namespace.createElement("button", decrementButtonProps, decrementIcon, /*#__PURE__*/React__namespace.createElement(ripple.Ripple, null)));
   };
@@ -3177,69 +3477,83 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     var currentTime = getCurrentDateTime();
     var minute = doStepMinute(currentTime.getMinutes());
     minute = minute > 59 ? minute - 60 : minute;
-    var minuteProps = utils.mergeProps(ptm('minute'));
+    var minuteProps = mergeProps(ptm('minute'));
+    var _localeOptions7 = PrimeReact.localeOptions(props.locale),
+      nextMinute = _localeOptions7.nextMinute,
+      prevMinute = _localeOptions7.prevMinute;
     var minuteDisplay = minute < 10 ? '0' + minute : minute;
-    var minutePickerProps = utils.mergeProps({
+    var minutePickerProps = mergeProps({
       className: cx('minutePicker')
     }, ptm('minutePicker'));
-    var incrementButtonProps = utils.mergeProps({
+    var incrementButtonProps = mergeProps({
       type: 'button',
       className: cx('incrementButton'),
+      'aria-label': nextMinute,
       onMouseDown: function onMouseDown(e) {
         return onTimePickerElementMouseDown(e, 1, 1);
       },
       onMouseUp: onTimePickerElementMouseUp,
       onMouseLeave: onTimePickerElementMouseLeave,
       onKeyDown: function onKeyDown(e) {
-        return onContainerButtonKeydown(e);
-      }
+        return onPickerKeyDown(e, 1, 1);
+      },
+      onKeyUp: onPickerKeyUp
     }, ptm('incrementButton'));
-    var decrementButtonProps = utils.mergeProps({
+    var decrementButtonProps = mergeProps({
       type: 'button',
       className: cx('decrementButton'),
+      'aria-label': prevMinute,
       onMouseDown: function onMouseDown(e) {
         return onTimePickerElementMouseDown(e, 1, -1);
       },
       onMouseUp: onTimePickerElementMouseUp,
       onMouseLeave: onTimePickerElementMouseLeave,
       onKeyDown: function onKeyDown(e) {
-        return onContainerButtonKeydown(e);
-      }
+        return onPickerKeyDown(e, 1, -1);
+      },
+      onKeyUp: onPickerKeyUp
     }, ptm('decrementButton'));
     return /*#__PURE__*/React__namespace.createElement("div", minutePickerProps, /*#__PURE__*/React__namespace.createElement("button", incrementButtonProps, incrementIcon, /*#__PURE__*/React__namespace.createElement(ripple.Ripple, null)), /*#__PURE__*/React__namespace.createElement("span", minuteProps, minuteDisplay), /*#__PURE__*/React__namespace.createElement("button", decrementButtonProps, decrementIcon, /*#__PURE__*/React__namespace.createElement(ripple.Ripple, null)));
   };
   var createSecondPicker = function createSecondPicker() {
     if (props.showSeconds) {
       var currentTime = getCurrentDateTime();
-      var secondProps = utils.mergeProps(ptm('second'));
+      var _localeOptions8 = PrimeReact.localeOptions(props.locale),
+        nextSecond = _localeOptions8.nextSecond,
+        prevSecond = _localeOptions8.prevSecond;
+      var secondProps = mergeProps(ptm('second'));
       var second = currentTime.getSeconds();
       var secondDisplay = second < 10 ? '0' + second : second;
-      var secondPickerProps = utils.mergeProps({
+      var secondPickerProps = mergeProps({
         className: cx('secondPicker')
       }, ptm('secondPicker'));
-      var incrementButtonProps = utils.mergeProps({
+      var incrementButtonProps = mergeProps({
         type: 'button',
         className: cx('incrementButton'),
+        'aria-label': nextSecond,
         onMouseDown: function onMouseDown(e) {
           return onTimePickerElementMouseDown(e, 2, 1);
         },
         onMouseUp: onTimePickerElementMouseUp,
         onMouseLeave: onTimePickerElementMouseLeave,
         onKeyDown: function onKeyDown(e) {
-          return onContainerButtonKeydown(e);
-        }
+          return onPickerKeyDown(e, 2, 1);
+        },
+        onKeyUp: onPickerKeyUp
       }, ptm('incrementButton'));
-      var decrementButtonProps = utils.mergeProps({
+      var decrementButtonProps = mergeProps({
         type: 'button',
         className: cx('decrementButton'),
+        'aria-label': prevSecond,
         onMouseDown: function onMouseDown(e) {
           return onTimePickerElementMouseDown(e, 2, -1);
         },
         onMouseUp: onTimePickerElementMouseUp,
         onMouseLeave: onTimePickerElementMouseLeave,
         onKeyDown: function onKeyDown(e) {
-          return onContainerButtonKeydown(e);
-        }
+          return onPickerKeyDown(e, 2, -1);
+        },
+        onKeyUp: onPickerKeyUp
       }, ptm('decrementButton'));
       return /*#__PURE__*/React__namespace.createElement("div", secondPickerProps, /*#__PURE__*/React__namespace.createElement("button", incrementButtonProps, incrementIcon, /*#__PURE__*/React__namespace.createElement(ripple.Ripple, null)), /*#__PURE__*/React__namespace.createElement("span", secondProps, secondDisplay), /*#__PURE__*/React__namespace.createElement("button", decrementButtonProps, decrementIcon, /*#__PURE__*/React__namespace.createElement(ripple.Ripple, null)));
     }
@@ -3248,35 +3562,42 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   var createMiliSecondPicker = function createMiliSecondPicker() {
     if (props.showMillisec) {
       var currentTime = getCurrentDateTime();
-      var millisecondProps = utils.mergeProps(ptm('millisecond'));
+      var _localeOptions9 = PrimeReact.localeOptions(props.locale),
+        nextMilliSecond = _localeOptions9.nextMilliSecond,
+        prevMilliSecond = _localeOptions9.prevMilliSecond;
+      var millisecondProps = mergeProps(ptm('millisecond'));
       var millisecond = currentTime.getMilliseconds();
       var millisecondDisplay = millisecond < 100 ? (millisecond < 10 ? '00' : '0') + millisecond : millisecond;
-      var millisecondPickerProps = utils.mergeProps({
+      var millisecondPickerProps = mergeProps({
         className: cx('millisecondPicker')
       }, ptm('millisecondPicker'));
-      var incrementButtonProps = utils.mergeProps({
+      var incrementButtonProps = mergeProps({
         type: 'button',
         className: cx('incrementButton'),
+        'aria-label': nextMilliSecond,
         onMouseDown: function onMouseDown(e) {
           return onTimePickerElementMouseDown(e, 3, 1);
         },
         onMouseUp: onTimePickerElementMouseUp,
         onMouseLeave: onTimePickerElementMouseLeave,
         onKeyDown: function onKeyDown(e) {
-          return onContainerButtonKeydown(e);
-        }
+          return onPickerKeyDown(e, 3, 1);
+        },
+        onKeyUp: onPickerKeyUp
       }, ptm('incrementButton'));
-      var decrementButtonProps = utils.mergeProps({
+      var decrementButtonProps = mergeProps({
         type: 'button',
         className: cx('decrementButton'),
+        'aria-label': prevMilliSecond,
         onMouseDown: function onMouseDown(e) {
           return onTimePickerElementMouseDown(e, 3, -1);
         },
         onMouseUp: onTimePickerElementMouseUp,
         onMouseLeave: onTimePickerElementMouseLeave,
         onKeyDown: function onKeyDown(e) {
-          return onContainerButtonKeydown(e);
-        }
+          return onPickerKeyDown(e, 3, -1);
+        },
+        onKeyUp: onPickerKeyUp
       }, ptm('decrementButton'));
       return /*#__PURE__*/React__namespace.createElement("div", millisecondPickerProps, /*#__PURE__*/React__namespace.createElement("button", incrementButtonProps, incrementIcon, /*#__PURE__*/React__namespace.createElement(ripple.Ripple, null)), /*#__PURE__*/React__namespace.createElement("span", millisecondProps, millisecondDisplay), /*#__PURE__*/React__namespace.createElement("button", decrementButtonProps, decrementIcon, /*#__PURE__*/React__namespace.createElement(ripple.Ripple, null)));
     }
@@ -3285,22 +3606,27 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   var createAmPmPicker = function createAmPmPicker() {
     if (props.hourFormat === '12') {
       var currentTime = getCurrentDateTime();
+      var _localeOptions10 = PrimeReact.localeOptions(props.locale),
+        am = _localeOptions10.am,
+        pm = _localeOptions10.pm;
       var hour = currentTime.getHours();
       var display = hour > 11 ? 'PM' : 'AM';
-      var ampmProps = utils.mergeProps(ptm('ampm'));
-      var ampmPickerProps = utils.mergeProps({
+      var ampmProps = mergeProps(ptm('ampm'));
+      var ampmPickerProps = mergeProps({
         className: cx('ampmPicker')
       }, ptm('ampmPicker'));
-      var incrementButtonProps = utils.mergeProps({
+      var incrementButtonProps = mergeProps({
         type: 'button',
         className: cx('incrementButton'),
+        'aria-label': am,
         onClick: function onClick(e) {
           return toggleAmPm(e);
         }
       }, ptm('incrementButton'));
-      var decrementButtonProps = utils.mergeProps({
+      var decrementButtonProps = mergeProps({
         type: 'button',
         className: cx('decrementButton'),
+        'aria-label': pm,
         onClick: function onClick(e) {
           return toggleAmPm(e);
         }
@@ -3310,15 +3636,15 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     return null;
   };
   var createSeparator = function createSeparator(separator) {
-    var separatorContainerProps = utils.mergeProps({
+    var separatorContainerProps = mergeProps({
       className: cx('separatorContainer')
     }, ptm('separatorContainer'));
-    var separatorProps = utils.mergeProps(ptm('separator'));
+    var separatorProps = mergeProps(ptm('separator'));
     return /*#__PURE__*/React__namespace.createElement("div", separatorContainerProps, /*#__PURE__*/React__namespace.createElement("span", separatorProps, separator));
   };
   var createTimePicker = function createTimePicker() {
     if ((props.showTime || props.timeOnly) && currentView === 'date') {
-      var timePickerProps = utils.mergeProps({
+      var timePickerProps = mergeProps({
         className: cx('timePicker')
       }, ptm('timePicker'));
       return /*#__PURE__*/React__namespace.createElement("div", timePickerProps, createHourPicker(), createSeparator(':'), createMinutePicker(), props.showSeconds && createSeparator(':'), createSecondPicker(), props.showMillisec && createSeparator('.'), createMiliSecondPicker(), props.hourFormat === '12' && createSeparator(':'), createAmPmPicker());
@@ -3332,6 +3658,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         id: props.inputId,
         name: props.name,
         type: "text",
+        role: "combobox",
         className: props.inputClassName,
         style: props.inputStyle,
         readOnly: props.readOnlyInput,
@@ -3344,7 +3671,12 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         onFocus: onInputFocus,
         onBlur: onInputBlur,
         onKeyDown: onInputKeyDown,
+        "aria-expanded": overlayVisibleState,
+        "aria-autocomplete": "none",
+        "aria-haspopup": "dialog",
+        "aria-controls": panelId,
         "aria-labelledby": props.ariaLabelledBy,
+        "aria-label": props.ariaLabel,
         inputMode: props.inputMode,
         tooltip: props.tooltip,
         tooltipOptions: props.tooltipOptions,
@@ -3364,6 +3696,10 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         onClick: onButtonClick,
         tabIndex: "-1",
         disabled: props.disabled,
+        "aria-haspopup": "dialog",
+        "aria-label": PrimeReact.localeOption('chooseDate', props.locale),
+        "aria-expanded": overlayVisibleState,
+        "aria-controls": panelId,
         className: cx('dropdownButton'),
         pt: ptm('dropdownButton'),
         __parentMetadata: {
@@ -3383,21 +3719,27 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   };
   var createButtonBar = function createButtonBar() {
     if (props.showButtonBar) {
-      var _localeOptions4 = PrimeReact.localeOptions(props.locale),
-        today = _localeOptions4.today,
-        clear = _localeOptions4.clear;
-      var buttonbarProps = utils.mergeProps({
+      var _localeOptions11 = PrimeReact.localeOptions(props.locale),
+        today = _localeOptions11.today,
+        clear = _localeOptions11.clear,
+        now = _localeOptions11.now;
+      var nowDate = new Date();
+      var isHidden = props.minDate && props.minDate > nowDate || props.maxDate && props.maxDate < nowDate;
+      var buttonbarProps = mergeProps({
         className: cx('buttonbar')
       }, ptm('buttonbar'));
       return /*#__PURE__*/React__namespace.createElement("div", buttonbarProps, /*#__PURE__*/React__namespace.createElement(button.Button, {
         type: "button",
-        label: today,
+        label: props.showTime ? now : today,
         onClick: onTodayButtonClick,
         onKeyDown: function onKeyDown(e) {
           return onContainerButtonKeydown(e);
         },
         className: utils.classNames(props.todayButtonClassName, cx('todayButton')),
-        pt: ptm('todayButton')
+        pt: ptm('todayButton'),
+        style: isHidden ? {
+          visibility: 'hidden'
+        } : undefined
       }), /*#__PURE__*/React__namespace.createElement(button.Button, {
         type: "button",
         label: clear,
@@ -3414,7 +3756,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   var createFooter = function createFooter() {
     if (props.footerTemplate) {
       var _content3 = props.footerTemplate();
-      var footerProps = utils.mergeProps({
+      var footerProps = mergeProps({
         className: cx('footer')
       }, ptm('footer'));
       return /*#__PURE__*/React__namespace.createElement("div", footerProps, _content3);
@@ -3423,11 +3765,12 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   };
   var createMonthPicker = function createMonthPicker() {
     if (currentView === 'month') {
-      var monthPickerProps = utils.mergeProps({
+      var monthPickerProps = mergeProps({
         className: cx('monthPicker')
       }, ptm('monthPicker'));
       return /*#__PURE__*/React__namespace.createElement("div", monthPickerProps, monthPickerValues().map(function (m, i) {
-        var monthProps = utils.mergeProps({
+        var selected = isMonthSelected(i);
+        var monthProps = mergeProps({
           className: cx('month', {
             isMonthSelected: isMonthSelected,
             isMonthYearDisabled: isMonthYearDisabled,
@@ -3441,29 +3784,35 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
             return onMonthCellKeydown(event, i);
           },
           'data-p-disabled': isMonthYearDisabled(i, currentYear),
-          'data-p-highlight': isMonthSelected(i)
+          'data-p-highlight': selected
         }, ptm('month', {
           context: {
             month: m,
             monthIndex: i,
-            selected: isMonthSelected(i),
+            selected: selected,
             disabled: isMonthYearDisabled(i, currentYear)
           }
         }));
         return /*#__PURE__*/React__namespace.createElement("span", _extends({}, monthProps, {
           key: "month".concat(i + 1)
-        }), m);
+        }), m, selected && /*#__PURE__*/React__namespace.createElement("div", {
+          "aria-live": "polite",
+          className: "p-hidden-accessible",
+          "data-p-hidden-accessible": true,
+          pt: ptm('hiddenMonth')
+        }, m));
       }));
     }
     return null;
   };
   var createYearPicker = function createYearPicker() {
     if (currentView === 'year') {
-      var yearPickerProps = utils.mergeProps({
+      var yearPickerProps = mergeProps({
         className: cx('yearPicker')
       }, ptm('yearPicker'));
       return /*#__PURE__*/React__namespace.createElement("div", yearPickerProps, yearPickerValues().map(function (y, i) {
-        var yearProps = utils.mergeProps({
+        var selected = isYearSelected(y);
+        var yearProps = mergeProps({
           className: cx('year', {
             isYearSelected: isYearSelected,
             isMonthYearDisabled: isMonthYearDisabled,
@@ -3472,19 +3821,27 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
           onClick: function onClick(event) {
             return onYearSelect(event, y);
           },
+          onKeyDown: function onKeyDown(event) {
+            return onYearCellKeydown(event, y);
+          },
           'data-p-highlight': isYearSelected(y),
           'data-p-disabled': isMonthYearDisabled(-1, y)
         }, ptm('year', {
           context: {
             year: y,
             yearIndex: i,
-            selected: isYearSelected(i),
+            selected: selected,
             disabled: isMonthYearDisabled(-1, y)
           }
         }));
         return /*#__PURE__*/React__namespace.createElement("span", _extends({}, yearProps, {
           key: "year".concat(i + 1)
-        }), y);
+        }), y, selected && /*#__PURE__*/React__namespace.createElement("div", {
+          "aria-live": "polite",
+          className: "p-hidden-accessible",
+          "data-p-hidden-accessible": true,
+          pt: ptm('hiddenYear')
+        }, y));
       }));
     }
     return null;
@@ -3507,11 +3864,12 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   var monthPicker = createMonthPicker();
   var yearPicker = createYearPicker();
   var isFilled = utils.DomHandler.hasClass(inputRef.current, 'p-filled') && inputRef.current.value !== '';
-  var rootProps = utils.mergeProps({
+  var rootProps = mergeProps({
     id: props.id,
     className: utils.classNames(props.className, cx('root', {
       focusedState: focusedState,
-      isFilled: isFilled
+      isFilled: isFilled,
+      panelVisible: visible
     })),
     style: props.style
   }, CalendarBase.getOtherProps(props), ptm('root'));
@@ -3519,6 +3877,8 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     ref: elementRef
   }, rootProps), content, /*#__PURE__*/React__namespace.createElement(CalendarPanel, {
     hostName: "Calendar",
+    id: panelId,
+    locale: props.locale,
     ref: overlayRef,
     className: panelClassName,
     style: props.panelStyle,