primereact 10.3.1 → 10.3.3

package/primereact.all.cjs.js

@@ -1937,8 +1937,8 @@ var ObjectUtils = /*#__PURE__*/function () {
   return ObjectUtils;
 }();
 
-function ownKeys$1T(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1T(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1T(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1T(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$1U(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$1U(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1U(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1U(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var IconUtils = /*#__PURE__*/function () {
   function IconUtils() {
     _classCallCheck(this, IconUtils);
@@ -1956,7 +1956,7 @@ var IconUtils = /*#__PURE__*/function () {
           className: className
         }));
         if (iconType !== 'string') {
-          var defaultContentOptions = _objectSpread$1T({
+          var defaultContentOptions = _objectSpread$1U({
             iconProps: iconProps,
             element: content
           }, options);
@@ -1969,8 +1969,8 @@ var IconUtils = /*#__PURE__*/function () {
   return IconUtils;
 }();
 
-function ownKeys$1S(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1S(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1S(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1S(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$1T(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$1T(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1T(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1T(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function mask(el, options) {
   var defaultOptions = {
     mask: null,
@@ -1983,7 +1983,7 @@ function mask(el, options) {
     onFocus: null,
     onBlur: null
   };
-  options = _objectSpread$1S(_objectSpread$1S({}, defaultOptions), options);
+  options = _objectSpread$1T(_objectSpread$1T({}, defaultOptions), options);
   var tests, partialPosition, len, firstNonMaskPos, defs, androidChrome, lastRequiredNonMaskPos, oldVal, focusText, caretTimeoutId, buffer, defaultBuffer;
   var caret = function caret(first, last) {
     var range, begin, end;
@@ -2390,13 +2390,12 @@ function mask(el, options) {
   };
 }
 
-function ownKeys$1R(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1R(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1R(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1R(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function mergeProps() {
-  for (var _len = arguments.length, props = new Array(_len), _key = 0; _key < _len; _key++) {
-    props[_key] = arguments[_key];
-  }
+function ownKeys$1S(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$1S(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1S(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1S(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _mergeProps(props) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (props) {
+    var classNameMergeFunction = options.classNameMergeFunction;
     var isFn = function isFn(o) {
       return !!(o && o.constructor && o.call && o.apply);
     };
@@ -2404,9 +2403,14 @@ function mergeProps() {
       var _loop = function _loop() {
         var value = ps[key];
         if (key === 'style') {
-          merged['style'] = _objectSpread$1R(_objectSpread$1R({}, merged['style']), ps['style']);
+          merged['style'] = _objectSpread$1S(_objectSpread$1S({}, merged['style']), ps['style']);
         } else if (key === 'className') {
-          var newClassname = [merged['className'], ps['className']].join(' ').trim();
+          var newClassname = '';
+          if (classNameMergeFunction && classNameMergeFunction instanceof Function) {
+            newClassname = classNameMergeFunction(merged['className'], ps['className']);
+          } else {
+            newClassname = [merged['className'], ps['className']].join(' ').trim();
+          }
           var isEmpty = newClassname === null || newClassname === undefined || newClassname === '';
           merged['className'] = isEmpty ? undefined : newClassname;
         } else if (isFn(value)) {
@@ -2428,6 +2432,41 @@ function mergeProps() {
   return undefined;
 }
 
+// @todo - Update this function and remove _mergeProps
+function mergeProps() {
+  for (var _len = arguments.length, props = new Array(_len), _key = 0; _key < _len; _key++) {
+    props[_key] = arguments[_key];
+  }
+  if (props) {
+    var isFn = function isFn(o) {
+      return !!(o && o.constructor && o.call && o.apply);
+    };
+    return props.reduce(function (merged, ps) {
+      var _loop2 = function _loop2() {
+        var value = ps[key];
+        if (key === 'style') {
+          merged['style'] = _objectSpread$1S(_objectSpread$1S({}, merged['style']), ps['style']);
+        } else if (key === 'className') {
+          merged['className'] = [merged['className'], ps['className']].join(' ').trim();
+        } else if (isFn(value)) {
+          var fn = merged[key];
+          merged[key] = fn ? function () {
+            fn.apply(void 0, arguments);
+            value.apply(void 0, arguments);
+          } : value;
+        } else {
+          merged[key] = value;
+        }
+      };
+      for (var key in ps) {
+        _loop2();
+      }
+      return merged;
+    }, {});
+  }
+  return undefined;
+}
+
 var lastId = 0;
 function UniqueComponentId() {
   var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'pr_id_';
@@ -2738,8 +2777,8 @@ _defineProperty(PrimeReact$1, "changeTheme", function (currentTheme, newTheme, l
   (_linkElement$parentNo = linkElement.parentNode) === null || _linkElement$parentNo === void 0 || _linkElement$parentNo.insertBefore(cloneLinkElement, linkElement.nextSibling);
 });
 
-function ownKeys$1Q(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1Q(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1Q(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1Q(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$1R(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$1R(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1R(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1R(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var locales = {
   en: {
     startsWith: 'Starts with',
@@ -2779,7 +2818,27 @@ var locales = {
     dayNamesMin: ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'],
     monthNames: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
     monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+    chooseYear: 'Choose Year',
+    chooseMonth: 'Choose Month',
+    chooseDate: 'Choose Date',
+    prevDecade: 'Previous Decade',
+    nextDecade: 'Next Decade',
+    prevYear: 'Previous Year',
+    nextYear: 'Next Year',
+    prevMonth: 'Previous Month',
+    nextMonth: 'Next Month',
+    prevHour: 'Previous Hour',
+    nextHour: 'Next Hour',
+    prevMinute: 'Previous Minute',
+    nextMinute: 'Next Minute',
+    prevSecond: 'Previous Second',
+    nextSecond: 'Next Second',
+    prevMilliSecond: 'Previous Second',
+    nextMilliSecond: 'Next Second',
+    am: 'am',
+    pm: 'pm',
     today: 'Today',
+    now: 'Now',
     weekHeader: 'Wk',
     firstDayOfWeek: 0,
     showMonthAfterYear: false,
@@ -2854,14 +2913,14 @@ function locale(locale) {
   };
 }
 function addLocale(locale, options) {
-  locales[locale] = _objectSpread$1Q(_objectSpread$1Q({}, locales['en']), options);
+  locales[locale] = _objectSpread$1R(_objectSpread$1R({}, locales['en']), options);
 }
 function updateLocaleOption(key, value, locale) {
   localeOptions(locale)[key] = value;
 }
 function updateLocaleOptions(options, locale) {
   var _locale = locale || PrimeReact$1.locale;
-  locales[_locale] = _objectSpread$1Q(_objectSpread$1Q({}, locales[_locale]), options);
+  locales[_locale] = _objectSpread$1R(_objectSpread$1R({}, locales[_locale]), options);
 }
 function localeOption(key, locale) {
   var _locale = locale || PrimeReact$1.locale;
@@ -2884,7 +2943,7 @@ function localeOption(key, locale) {
  * @param {any} options JSON options like { page: 2, user: "John", role: "Admin" }
  * @returns the ARIA label with replaced values
  */
-function ariaLabel(ariaKey, options) {
+function ariaLabel$1(ariaKey, options) {
   var _locale = PrimeReact$1.locale;
   try {
     var _ariaLabel = localeOptions(_locale)['aria'][ariaKey];
@@ -3512,7 +3571,7 @@ var useDisplayOrder = function useDisplayOrder(group) {
     }),
     _React$useState2 = _slicedToArray(_React$useState, 1),
     uid = _React$useState2[0];
-  var _React$useState3 = React__namespace.useState(),
+  var _React$useState3 = React__namespace.useState(0),
     _React$useState4 = _slicedToArray(_React$useState3, 2),
     displayOrder = _React$useState4[0],
     setDisplayOrder = _React$useState4[1];
@@ -3521,7 +3580,7 @@ var useDisplayOrder = function useDisplayOrder(group) {
       if (!(group in groupToDisplayedElements)) {
         groupToDisplayedElements[group] = [];
       }
-      var newDisplayOrder = groupToDisplayedElements[group].length;
+      var newDisplayOrder = groupToDisplayedElements[group].length + 1;
       groupToDisplayedElements[group].push(uid);
       setDisplayOrder(newDisplayOrder);
       return function () {
@@ -3603,7 +3662,7 @@ var globalEscKeyHandlingLogic = {
    */
   onGlobalKeyDown: function onGlobalKeyDown(event) {
     // Do nothing if not an "esc" key is pressed:
-    if (event.key !== 'Esc' && event.key !== 'Escape') return;
+    if (event.code !== 'Escape') return;
     var escKeyListeners = globalEscKeyHandlingLogic.escKeyListeners;
     var maxPrimaryPriority = Math.max.apply(Math, _toConsumableArray(escKeyListeners.keys()));
     var theMostImportantEscHandlersSet = escKeyListeners.get(maxPrimaryPriority);
@@ -3659,7 +3718,7 @@ var useGlobalOnEscapeKey = function useGlobalOnEscapeKey(_ref3) {
   React.useEffect(function () {
     if (!when) return;
     return globalEscKeyHandlingLogic.addListener(callback, priority);
-  }, [when, callback, priority]);
+  }, [callback, when, priority]);
 };
 
 var useIntersectionObserver = function useIntersectionObserver(ref) {
@@ -3741,6 +3800,26 @@ var useMatchMedia = function useMatchMedia(query) {
 };
 /* eslint-enable */
 
+function ownKeys$1Q(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$1Q(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1Q(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1Q(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+
+/**
+ * Hook to merge properties including custom merge function for things like Tailwind merge.
+ */
+var useMergeProps = function useMergeProps() {
+  var context = React.useContext(PrimeReactContext);
+  return function () {
+    var _context$ptOptions;
+    var options = _objectSpread$1Q({}, (context === null || context === void 0 || (_context$ptOptions = context.ptOptions) === null || _context$ptOptions === void 0 ? void 0 : _context$ptOptions.classNameMergeFunction) && {
+      classNameMergeFunction: context.classNameMergeFunction
+    });
+    for (var _len = arguments.length, props = new Array(_len), _key = 0; _key < _len; _key++) {
+      props[_key] = arguments[_key];
+    }
+    return _mergeProps(props, options);
+  };
+};
+
 /* eslint-disable */
 
 /**
@@ -4418,6 +4497,7 @@ var ComponentBase = {
       return ObjectUtils.getDiffProps(props, defaultProps);
     };
     var getPTValue = function getPTValue() {
+      var _ComponentBase$contex;
       var obj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
       var params = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -4465,7 +4545,9 @@ var ComponentBase = {
       var globalPT = searchInDefaultPT ? isNestedParam ? _useGlobalPT(getPTClassValue, originalkey, params) : _useDefaultPT(getPTClassValue, originalkey, params) : undefined;
       var self = isNestedParam ? undefined : _usePT(_getPT(obj, componentName), getPTClassValue, originalkey, params);
       var datasetProps = !isTransition && _objectSpread$1N(_objectSpread$1N({}, fkey === 'root' && _defineProperty({}, "".concat(datasetPrefix, "name"), params.props && params.props.__parentMetadata ? ObjectUtils.toFlatCase(params.props.__TYPE) : componentName)), {}, _defineProperty({}, "".concat(datasetPrefix, "section"), fkey));
-      return mergeSections || !mergeSections && self ? useMergeProps ? mergeProps(globalPT, self, Object.keys(datasetProps).length ? datasetProps : {}) : _objectSpread$1N(_objectSpread$1N(_objectSpread$1N({}, globalPT), self), Object.keys(datasetProps).length ? datasetProps : {}) : _objectSpread$1N(_objectSpread$1N({}, self), Object.keys(datasetProps).length ? datasetProps : {});
+      return mergeSections || !mergeSections && self ? useMergeProps ? _mergeProps([globalPT, self, Object.keys(datasetProps).length ? datasetProps : {}], {
+        classNameMergeFunction: (_ComponentBase$contex = ComponentBase.context.ptOptions) === null || _ComponentBase$contex === void 0 ? void 0 : _ComponentBase$contex.classNameMergeFunction
+      }) : _objectSpread$1N(_objectSpread$1N(_objectSpread$1N({}, globalPT), self), Object.keys(datasetProps).length ? datasetProps : {}) : _objectSpread$1N(_objectSpread$1N({}, self), Object.keys(datasetProps).length ? datasetProps : {});
     };
     var setMetaData = function setMetaData() {
       var metadata = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -4498,6 +4580,7 @@ var ComponentBase = {
         var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
         var when = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
         if (when) {
+          var _ComponentBase$contex2;
           var self = getOptionValue(css && css.inlineStyles, key, _objectSpread$1N({
             props: props,
             state: state
@@ -4506,7 +4589,9 @@ var ComponentBase = {
             props: props,
             state: state
           }, params));
-          return mergeProps(base, self);
+          return _mergeProps([base, self], {
+            classNameMergeFunction: (_ComponentBase$contex2 = ComponentBase.context.ptOptions) === null || _ComponentBase$contex2 === void 0 ? void 0 : _ComponentBase$contex2.classNameMergeFunction
+          });
         }
         return undefined;
       };
@@ -4563,11 +4648,14 @@ var _usePT = function _usePT(pt, callback, key, params) {
       _ref4$mergeSections = _ref4.mergeSections,
       mergeSections = _ref4$mergeSections === void 0 ? true : _ref4$mergeSections,
       _ref4$mergeProps = _ref4.mergeProps,
-      useMergeProps = _ref4$mergeProps === void 0 ? false : _ref4$mergeProps;
+      useMergeProps = _ref4$mergeProps === void 0 ? false : _ref4$mergeProps,
+      classNameMergeFunction = _ref4.classNameMergeFunction;
     var originalValue = fn(pt.originalValue);
     var value = fn(pt.value);
     if (originalValue === undefined && value === undefined) return undefined;else if (ObjectUtils.isString(value)) return value;else if (ObjectUtils.isString(originalValue)) return originalValue;
-    return mergeSections || !mergeSections && value ? useMergeProps ? mergeProps(originalValue, value) : _objectSpread$1N(_objectSpread$1N({}, originalValue), value) : value;
+    return mergeSections || !mergeSections && value ? useMergeProps ? _mergeProps([originalValue, value], {
+      classNameMergeFunction: classNameMergeFunction
+    }) : _objectSpread$1N(_objectSpread$1N({}, originalValue), value) : value;
   }
   return fn(pt);
 };
@@ -4865,6 +4953,7 @@ function ownKeys$1L(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySym
 function _objectSpread$1L(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1L(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1L(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var AccordionTab = function AccordionTab() {};
 var Accordion = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = AccordionBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -4894,6 +4983,9 @@ var Accordion = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
   useHandleStyle(AccordionBase.css.styles, isUnstyled, {
     name: 'accordion'
   });
+  var getTabProp = function getTabProp(tab, name) {
+    return AccordionTabBase.getCProp(tab, name);
+  };
   var getTabPT = function getTabPT(tab, key, index) {
     AccordionTabBase.getCProps(tab);
     var tabMetaData = {
@@ -4908,15 +5000,12 @@ var Accordion = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
         disabled: getTabProp(tab, 'disabled')
       }
     };
-    return mergeProps(ptm("accordion.".concat(key), {
+    return mergeProps(ptm("tab.".concat(key), {
       tab: tabMetaData
     }), ptm("tab.".concat(key), {
       accordiontab: tabMetaData
     }), ptm("tab.".concat(key), tabMetaData), ptmo(getTabProp(tab, 'pt'), key, tabMetaData));
   };
-  var getTabProp = function getTabProp(tab, name) {
-    return AccordionTabBase.getCProp(tab, name);
-  };
   var onTabHeaderClick = function onTabHeaderClick(event, tab, index) {
     changeActiveIndex(event, tab, index);
   };
@@ -6413,6 +6502,7 @@ var BadgeBase = ComponentBase.extend({
 function ownKeys$1K(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1K(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1K(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1K(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Badge = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = BadgeBase.getProps(inProps, context);
   var _BadgeBase$setMetaDat = BadgeBase.setMetaData(_objectSpread$1K({
@@ -6472,6 +6562,7 @@ var Ripple = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.f
     setMounted = _React$useState2[1];
   var inkRef = React__namespace.useRef(null);
   var targetRef = React__namespace.useRef(null);
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = RippleBase.getProps(inProps, context);
   var isRippleActive = context && context.ripple || PrimeReact.ripple;
@@ -6688,6 +6779,7 @@ var TooltipBase = ComponentBase.extend({
 function ownKeys$1I(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1I(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1I(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1I(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Tooltip = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = TooltipBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -7254,6 +7346,7 @@ var ButtonBase = ComponentBase.extend({
 function ownKeys$1H(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1H(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1H(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1H(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Button = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ButtonBase.getProps(inProps, context);
   var disabled = props.disabled || props.loading;
@@ -7460,6 +7553,7 @@ var InputTextBase = ComponentBase.extend({
 function ownKeys$1G(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1G(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1G(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1G(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var InputText = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = InputTextBase.getProps(inProps, context);
   var _InputTextBase$setMet = InputTextBase.setMetaData(_objectSpread$1G(_objectSpread$1G({
@@ -8521,6 +8615,7 @@ VirtualScroller.displayName = 'VirtualScroller';
 function ownKeys$1E(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1E(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1E(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1E(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var AutoCompletePanel = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx;
   var context = React__namespace.useContext(PrimeReactContext);
@@ -8720,6 +8815,7 @@ AutoCompletePanel.displayName = 'AutoCompletePanel';
 function ownKeys$1D(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1D(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1D(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1D(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var AutoComplete = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = AutoCompleteBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -9413,6 +9509,7 @@ var AvatarBase = ComponentBase.extend({
 function ownKeys$1C(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1C(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1C(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1C(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Avatar = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = AvatarBase.getProps(inProps, context);
   var elementRef = React__namespace.useRef(null);
@@ -9516,6 +9613,7 @@ var AvatarGroupBase = ComponentBase.extend({
 });
 
 var AvatarGroup = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = AvatarGroupBase.getProps(inProps, context);
   var _AvatarGroupBase$setM = AvatarGroupBase.setMetaData({
@@ -9584,6 +9682,7 @@ var BlockUIBase = ComponentBase.extend({
 function ownKeys$1B(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1B(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1B(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1B(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var BlockUI = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = BlockUIBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.blocked),
@@ -9739,6 +9838,7 @@ var BreadCrumbBase = ComponentBase.extend({
 function ownKeys$1A(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1A(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1A(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1A(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var BreadCrumb = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = BreadCrumbBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -9944,13 +10044,14 @@ var BreadCrumb = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespa
 }));
 BreadCrumb.displayName = 'BreadCrumb';
 
-var styles$Y = "\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$Y = "\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$11 = {
   root: function root(_ref) {
     var props = _ref.props,
       focusedState = _ref.focusedState,
-      isFilled = _ref.isFilled;
-    return 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 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',
@@ -10029,6 +10130,7 @@ var CalendarBase = ComponentBase.extend({
     __TYPE: 'Calendar',
     appendTo: null,
     ariaLabelledBy: null,
+    ariaLabel: null,
     autoZIndex: true,
     autoFocus: false,
     baseZIndex: 0,
@@ -10129,12 +10231,17 @@ var CalendarBase = ComponentBase.extend({
 
 var CalendarPanel = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
   var cx = props.cx;
+  var mergeProps = useMergeProps();
   var createElement = function createElement() {
     var panelProps = mergeProps({
       className: cx('panel', {
         panelClassName: props.className
       }),
       style: props.style,
+      role: props.inline ? null : 'dialog',
+      id: props.id,
+      'aria-label': localeOption('chooseDate', props.locale),
+      'aria-modal': props.inline ? null : 'true',
       onClick: props.onClick,
       onMouseUp: props.onMouseUp
     }, props.ptm('panel', {
@@ -10176,6 +10283,7 @@ function _createForOfIteratorHelper$e(o, allowArrayLike) { var it = typeof Symbo
 function _unsupportedIterableToArray$e(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$e(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$e(o, minLen); }
 function _arrayLikeToArray$e(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 = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = CalendarBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -10190,6 +10298,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: {
@@ -10218,26 +10330,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 = usePrevious(props.value);
   var visible = props.inline || (props.onVisibleChange ? props.visible : overlayVisibleState);
   var attributeSelector = UniqueComponentId();
+  var panelId = idState + '_panel';
   var _useOverlayListener = useOverlayListener({
       target: elementRef,
       overlay: overlayRef,
@@ -10245,7 +10360,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;
       },
@@ -10275,21 +10390,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) {
+            DomHandler.getFocusableElements(overlayRef.current).forEach(function (el) {
+              return el.tabIndex = '-1';
+            });
+            hide();
+            props.touchUI && disableModality();
+          }
+          break;
+        }
     }
   };
   var onUserInput = function onUserInput(event) {
@@ -10352,28 +10480,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 = 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();
@@ -10406,7 +10546,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 = DomHandler.find(overlayRef.current, '[data-pc-section="monthpicker"] [data-pc-section="month"]');
       var selectedCell = DomHandler.findSingle(overlayRef.current, '[data-pc-section="monthpicker"] [data-pc-section="month"][data-p-highlight="true"]');
       cells.forEach(function (cell) {
@@ -10424,6 +10564,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 = DomHandler.findSingle(overlayRef.current, 'span[data-p-highlight="true"]');
+        if (!cell) {
+          var todayCell = DomHandler.findSingle(overlayRef.current, 'td.p-datepicker-today span:not(.p-disabled)');
+          cell = todayCell || DomHandler.findSingle(overlayRef.current, 'table td span:not([data-p-disabled="true"])');
+        }
+      } else if (currentView === 'month' || currentView === 'year') {
+        cell = DomHandler.findSingle(overlayRef.current, 'span[data-p-highlight="true"]');
+        if (!cell) {
+          cell = 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();
@@ -10553,6 +10714,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();
@@ -11034,23 +11196,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 = DomHandler.index(cell);
+    switch (event.code) {
+      case 'ArrowDown':
         {
           cellContent.tabIndex = '-1';
-          var cellIndex = DomHandler.index(cell);
           var nextRow = cell.parentElement.nextElementSibling;
           if (nextRow) {
-            var focusCell = nextRow.children[cellIndex].children[0];
-            if (DomHandler.hasClass(focusCell, 'p-disabled')) {
+            var tableRowIndex = 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 !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 = {
@@ -11061,46 +11229,58 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
           event.preventDefault();
           break;
         }
-
-      //up arrow
-      case 38:
+      case 'ArrowUp':
         {
           cellContent.tabIndex = '-1';
-          var _cellIndex = DomHandler.index(cell);
-          var prevRow = cell.parentElement.previousElementSibling;
-          if (prevRow) {
-            var _focusCell = prevRow.children[_cellIndex].children[0];
-            if (DomHandler.hasClass(_focusCell, 'p-disabled')) {
+          if (event.altKey) {
+            hide(null, reFocusInputField);
+          } else {
+            var prevRow = cell.parentElement.previousElementSibling;
+            if (prevRow) {
+              var _tableRowIndex = 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 !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 (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 !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);
@@ -11108,19 +11288,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 (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 !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);
@@ -11128,27 +11312,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 (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 (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;
         }
     }
@@ -11175,18 +11407,18 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         navForward(event);
       } else {
         var nextMonthContainer = overlayRef.current.children[groupIndex + 1];
-        var _focusCell4 = DomHandler.findSingle(nextMonthContainer, 'table td span:not([data-p-disabled="true"])');
-        _focusCell4.tabIndex = '0';
-        _focusCell4.focus();
+        var _focusCell6 = 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;
@@ -11199,51 +11431,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 = 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;
@@ -11360,10 +11703,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();
   };
@@ -11389,6 +11738,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         month: month + 1,
         year: currentYear
       });
+      updateViewDate(event, currentDate);
     }
   };
   var onYearSelect = function onYearSelect(event, year) {
@@ -11503,7 +11853,6 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   var onOverlayEntered = function onOverlayEntered() {
     bindOverlayListener();
     props.onShow && props.onShow();
-    DomHandler.focusFirstElement(overlayRef.current);
     setFocusedState(false);
   };
   var onOverlayExit = function onOverlayExit() {
@@ -12179,8 +12528,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,
@@ -12369,6 +12723,10 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     setCurrentMonth(viewDate.getMonth());
     setCurrentYear(viewDate.getFullYear());
     setCurrentView(props.view);
+    if (!idState) {
+      var uniqueId = UniqueComponentId();
+      !idState && setIdState(uniqueId);
+    }
     if (props.inline) {
       overlayRef && overlayRef.current.setAttribute(attributeSelector, '');
       if (!props.disabled) {
@@ -12416,8 +12774,14 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [props.disabled, props.mask, props.readOnlyInput]);
   useUpdateEffect(function () {
-    setCurrentView(props.view);
+    if (viewChangedWithKeyDown.current) {
+      setCurrentView(props.view);
+    }
+    viewChangedWithKeyDown.current = false;
   }, [props.view]);
+  useUpdateEffect(function () {
+    focusToFirstCell();
+  }, [currentView]);
   useUpdateEffect(function () {
     if (!props.onViewDateChange && !viewStateChanged.current) {
       setValue(props.value);
@@ -12508,12 +12872,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 ? {
@@ -12533,9 +12901,15 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     var backwardNavigatorIcon = IconUtils.getJSXIcon(icon, _objectSpread$1z({}, previousIconProps), {
       props: props
     });
+    var _localeOptions4 = 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$1z({
       type: 'button',
-      className: cx('previousButton')
+      className: cx('previousButton'),
+      'aria-label': previousButtonLabel
     }, navigatorProps), ptm('previousButton'));
     return /*#__PURE__*/React__namespace.createElement("button", _extends({
       ref: previousButton
@@ -12559,9 +12933,15 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     var forwardNavigatorIcon = IconUtils.getJSXIcon(icon, _objectSpread$1z({}, nextIconProps), {
       props: props
     });
+    var _localeOptions5 = 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$1z({
       type: 'button',
-      className: cx('nextButton')
+      className: cx('nextButton'),
+      'aria-label': nextButtonLabel
     }, navigatorProps), ptm('nextButton'));
     return /*#__PURE__*/React__namespace.createElement("button", _extends({
       ref: nextButton
@@ -12618,6 +12998,8 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     }
     var monthTitleProps = mergeProps({
       className: cx('monthTitle'),
+      onKeyDown: onContainerButtonKeydown,
+      'aria-label': localeOption('chooseMonth', props.locale),
       onClick: switchToMonthView,
       disabled: switchViewButtonDisabled()
     }, ptm('monthTitle'));
@@ -12676,6 +13058,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     var displayYear = props.numberOfMonths > 1 ? metaYear : currentYear;
     var yearTitleProps = mergeProps({
       className: cx('yearTitle'),
+      'aria-label': localeOption('chooseYear', props.locale),
       onClick: function onClick(e) {
         return switchToYearView(e);
       },
@@ -12734,25 +13117,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 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) {
@@ -12766,6 +13157,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         className: cx('day', {
           date: date
         }),
+        'aria-label': date.day,
         'data-p-today': date.today,
         'data-p-other-month': date.otherMonth
       }, ptm('day', {
@@ -12814,6 +13206,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
       key: UniqueComponentId('calendar_container_')
     }, ptm('container'));
     var tableProps = mergeProps({
+      role: 'grid',
       className: cx('table')
     }, ptm('table'));
     var tableHeaderProps = mergeProps(ptm('tableHeader'));
@@ -12917,6 +13310,9 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
       if (hour === 0) hour = 12;else if (hour > 11 && hour !== 12) hour = hour - 12;
     }
     var hourProps = mergeProps(ptm('hour'));
+    var _localeOptions6 = localeOptions(props.locale),
+      nextHour = _localeOptions6.nextHour,
+      prevHour = _localeOptions6.prevHour;
     var hourDisplay = hour < 10 ? '0' + hour : hour;
     var hourPickerProps = mergeProps({
       className: cx('hourPicker')
@@ -12924,26 +13320,30 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     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 = 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, null)), /*#__PURE__*/React__namespace.createElement("span", hourProps, hourDisplay), /*#__PURE__*/React__namespace.createElement("button", decrementButtonProps, decrementIcon, /*#__PURE__*/React__namespace.createElement(Ripple, null)));
   };
@@ -12952,6 +13352,9 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     var minute = doStepMinute(currentTime.getMinutes());
     minute = minute > 59 ? minute - 60 : minute;
     var minuteProps = mergeProps(ptm('minute'));
+    var _localeOptions7 = localeOptions(props.locale),
+      nextMinute = _localeOptions7.nextMinute,
+      prevMinute = _localeOptions7.prevMinute;
     var minuteDisplay = minute < 10 ? '0' + minute : minute;
     var minutePickerProps = mergeProps({
       className: cx('minutePicker')
@@ -12959,32 +13362,39 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     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 = 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, null)), /*#__PURE__*/React__namespace.createElement("span", minuteProps, minuteDisplay), /*#__PURE__*/React__namespace.createElement("button", decrementButtonProps, decrementIcon, /*#__PURE__*/React__namespace.createElement(Ripple, null)));
   };
   var createSecondPicker = function createSecondPicker() {
     if (props.showSeconds) {
       var currentTime = getCurrentDateTime();
+      var _localeOptions8 = 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;
@@ -12994,26 +13404,30 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
       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 = 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, null)), /*#__PURE__*/React__namespace.createElement("span", secondProps, secondDisplay), /*#__PURE__*/React__namespace.createElement("button", decrementButtonProps, decrementIcon, /*#__PURE__*/React__namespace.createElement(Ripple, null)));
     }
@@ -13022,6 +13436,9 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   var createMiliSecondPicker = function createMiliSecondPicker() {
     if (props.showMillisec) {
       var currentTime = getCurrentDateTime();
+      var _localeOptions9 = 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;
@@ -13031,26 +13448,30 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
       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 = 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, null)), /*#__PURE__*/React__namespace.createElement("span", millisecondProps, millisecondDisplay), /*#__PURE__*/React__namespace.createElement("button", decrementButtonProps, decrementIcon, /*#__PURE__*/React__namespace.createElement(Ripple, null)));
     }
@@ -13059,6 +13480,9 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   var createAmPmPicker = function createAmPmPicker() {
     if (props.hourFormat === '12') {
       var currentTime = getCurrentDateTime();
+      var _localeOptions10 = localeOptions(props.locale),
+        am = _localeOptions10.am,
+        pm = _localeOptions10.pm;
       var hour = currentTime.getHours();
       var display = hour > 11 ? 'PM' : 'AM';
       var ampmProps = mergeProps(ptm('ampm'));
@@ -13068,6 +13492,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
       var incrementButtonProps = mergeProps({
         type: 'button',
         className: cx('incrementButton'),
+        'aria-label': am,
         onClick: function onClick(e) {
           return toggleAmPm(e);
         }
@@ -13075,6 +13500,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
       var decrementButtonProps = mergeProps({
         type: 'button',
         className: cx('decrementButton'),
+        'aria-label': pm,
         onClick: function onClick(e) {
           return toggleAmPm(e);
         }
@@ -13106,6 +13532,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,
@@ -13118,7 +13545,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,
@@ -13138,6 +13570,10 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         onClick: onButtonClick,
         tabIndex: "-1",
         disabled: props.disabled,
+        "aria-haspopup": "dialog",
+        "aria-label": localeOption('chooseDate', props.locale),
+        "aria-expanded": overlayVisibleState,
+        "aria-controls": panelId,
         className: cx('dropdownButton'),
         pt: ptm('dropdownButton'),
         __parentMetadata: {
@@ -13157,21 +13593,27 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   };
   var createButtonBar = function createButtonBar() {
     if (props.showButtonBar) {
-      var _localeOptions4 = localeOptions(props.locale),
-        today = _localeOptions4.today,
-        clear = _localeOptions4.clear;
+      var _localeOptions11 = 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, {
         type: "button",
-        label: today,
+        label: props.showTime ? now : today,
         onClick: onTodayButtonClick,
         onKeyDown: function onKeyDown(e) {
           return onContainerButtonKeydown(e);
         },
         className: classNames(props.todayButtonClassName, cx('todayButton')),
-        pt: ptm('todayButton')
+        pt: ptm('todayButton'),
+        style: isHidden ? {
+          visibility: 'hidden'
+        } : undefined
       }), /*#__PURE__*/React__namespace.createElement(Button, {
         type: "button",
         label: clear,
@@ -13201,6 +13643,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         className: cx('monthPicker')
       }, ptm('monthPicker'));
       return /*#__PURE__*/React__namespace.createElement("div", monthPickerProps, monthPickerValues().map(function (m, i) {
+        var selected = isMonthSelected(i);
         var monthProps = mergeProps({
           className: cx('month', {
             isMonthSelected: isMonthSelected,
@@ -13215,18 +13658,23 @@ 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;
@@ -13237,6 +13685,7 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         className: cx('yearPicker')
       }, ptm('yearPicker'));
       return /*#__PURE__*/React__namespace.createElement("div", yearPickerProps, yearPickerValues().map(function (y, i) {
+        var selected = isYearSelected(y);
         var yearProps = mergeProps({
           className: cx('year', {
             isYearSelected: isYearSelected,
@@ -13246,19 +13695,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;
@@ -13285,7 +13742,8 @@ var Calendar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     id: props.id,
     className: classNames(props.className, cx('root', {
       focusedState: focusedState,
-      isFilled: isFilled
+      isFilled: isFilled,
+      panelVisible: visible
     })),
     style: props.style
   }, CalendarBase.getOtherProps(props), ptm('root'));
@@ -13293,6 +13751,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,
@@ -13344,6 +13804,7 @@ var CardBase = ComponentBase.extend({
 });
 
 var Card = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = CardBase.getProps(inProps, context);
   var elementRef = React__namespace.useRef(ref);
@@ -14253,6 +14714,7 @@ var CascadeSelectBase = ComponentBase.extend({
 function ownKeys$1x(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1x(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1x(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1x(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var CascadeSelectSub = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = useMergeProps();
   var _React$useState = React__namespace.useState(null),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     activeOptionState = _React$useState2[0],
@@ -14485,6 +14947,7 @@ function _arrayLikeToArray$d(arr, len) { if (len == null || len > arr.length) le
 function ownKeys$1w(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1w(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1w(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1w(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var CascadeSelect = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = CascadeSelectBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -14538,7 +15001,7 @@ var CascadeSelect = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__name
     callback: function callback() {
       hide();
     },
-    when: overlayVisibleState,
+    when: overlayVisibleState && cascadeSelectOverlayDisplayOrder,
     priority: [ESC_KEY_HANDLING_PRIORITIES.CASCADE_SELECT, cascadeSelectOverlayDisplayOrder]
   });
   var onOptionSelect = function onOptionSelect(event) {
@@ -14938,6 +15401,7 @@ var ChartJS = function () {
   }
 }();
 var PrimeReactChart = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ChartBase.getProps(inProps, context);
   var _ChartBase$setMetaDat = ChartBase.setMetaData({
@@ -15101,6 +15565,7 @@ var CheckboxBase = ComponentBase.extend({
 function ownKeys$1v(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1v(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1v(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1v(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Checkbox = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = CheckboxBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -15313,6 +15778,7 @@ var ChipBase = ComponentBase.extend({
 function ownKeys$1u(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1u(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1u(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1u(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Chip = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ChipBase.getProps(inProps, context);
   var elementRef = React__namespace.useRef(null);
@@ -15330,7 +15796,7 @@ var Chip = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.for
     name: 'chip'
   });
   var onKeyDown = function onKeyDown(event) {
-    if (event.key === 'Enter' || event.key === 'Backspace') {
+    if (event.code === 'Enter' || event.code === 'Backspace') {
       close(event);
     }
   };
@@ -15473,6 +15939,7 @@ var ChipsBase = ComponentBase.extend({
 function ownKeys$1t(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1t(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1t(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1t(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Chips = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ChipsBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -15885,6 +16352,7 @@ ColorPickerPanel.displayName = 'ColorPickerPanel';
 function ownKeys$1s(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1s(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1s(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1s(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var ColorPicker = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ColorPickerBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -16575,6 +17043,7 @@ var DialogBase = ComponentBase.extend({
 function ownKeys$1q(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1q(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1q(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1q(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Dialog = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = DialogBase.getProps(inProps, context);
   var uniqueId = props.id ? props.id : UniqueComponentId();
@@ -16633,7 +17102,7 @@ var Dialog = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
         onClose(event);
       }
     },
-    when: visibleState,
+    when: visibleState && displayOrder,
     priority: [ESC_KEY_HANDLING_PRIORITIES.DIALOG, displayOrder]
   });
   var _useEventListener = useEventListener({
@@ -17303,6 +17772,7 @@ var confirmDialog = function confirmDialog() {
   };
 };
 var ConfirmDialog = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ConfirmDialogBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.visible),
@@ -17317,10 +17787,16 @@ var ConfirmDialog = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__name
   var isCallbackExecuting = React__namespace.useRef(false);
   var focusElementOnHide = React__namespace.useRef(null);
   var getCurrentProps = function getCurrentProps() {
-    return confirmProps.current || props;
+    var group = props.group;
+    if (confirmProps.current) {
+      group = confirmProps.current.group;
+    }
+    return Object.assign({}, props, confirmProps.current, {
+      group: group
+    });
   };
   var getPropValue = function getPropValue(key) {
-    return (confirmProps.current || props)[key];
+    return getCurrentProps()[key];
   };
   var callbackFromProp = function callbackFromProp(key) {
     for (var _len = arguments.length, param = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -17583,6 +18059,7 @@ var confirmPopup = function confirmPopup() {
   };
 };
 var ConfirmPopup = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ConfirmPopupBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.visible),
@@ -17636,7 +18113,7 @@ var ConfirmPopup = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__names
         hide('hide');
       }
     },
-    when: visibleState,
+    when: visibleState && displayOrder,
     priority: [ESC_KEY_HANDLING_PRIORITIES.DIALOG, displayOrder]
   });
   var _useOverlayListener = useOverlayListener({
@@ -17989,6 +18466,7 @@ var ContextMenuBase = ComponentBase.extend({
 function ownKeys$1n(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1n(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1n(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1n(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var ContextMenuSub = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var submenuRef = React__namespace.useRef(null);
   var active = props.root || !props.resetMenu;
   var ptm = props.ptm,
@@ -18271,6 +18749,7 @@ ContextMenuSub.displayName = 'ContextMenuSub';
 function ownKeys$1m(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1m(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1m(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1m(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var ContextMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ContextMenuBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -18483,7 +18962,7 @@ var ContextMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namesp
       menuRef.current.style.top = top + 'px';
     }
   };
-  var createProcessedItems = function createProcessedItems(items, level) {
+  var createProcessedItems = React__namespace.useCallback(function (items, level) {
     var parent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     var parentKey = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
     var processedItems = [];
@@ -18502,7 +18981,7 @@ var ContextMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namesp
       processedItems.push(newItem);
     });
     return processedItems;
-  };
+  }, []);
   var onLeafClick = function onLeafClick(event) {
     setResetMenuState(true);
     hide(event);
@@ -18550,11 +19029,11 @@ var ContextMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namesp
       show(currentEvent.current);
     }
   }, [reshowState]);
-  useUpdateEffect(function () {
+  React__namespace.useEffect(function () {
     var itemsToProcess = props.model || [];
     var processed = createProcessedItems(itemsToProcess, 0, null, '');
     setProcessedItems(processed);
-  }, [props.model]);
+  }, [props.model, createProcessedItems]);
   useUpdateEffect(function () {
     var _focusedItemId = focusedItemInfo.index !== -1 ? "".concat(idState).concat(ObjectUtils.isNotEmpty(focusedItemInfo.parentKey) ? '_' + focusedItemInfo.parentKey : '', "_").concat(focusedItemInfo.index) : null;
     setFocusedItemId(_focusedItemId);
@@ -19048,6 +19527,7 @@ var DataScrollerBase = ComponentBase.extend({
 });
 
 var DataScroller = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = DataScrollerBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState([]),
@@ -19500,6 +19980,7 @@ var RowsPerPageDropdownBase = ComponentBase.extend({
 function ownKeys$1l(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1l(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1l(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1l(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var CurrentPageReport = /*#__PURE__*/React__namespace.memo(function (inProps) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = CurrentPageReportBase.getProps(inProps, context);
   var report = {
@@ -19512,6 +19993,7 @@ var CurrentPageReport = /*#__PURE__*/React__namespace.memo(function (inProps) {
   };
   var text = props.reportTemplate.replace('{currentPage}', report.currentPage).replace('{totalPages}', report.totalPages).replace('{first}', report.first).replace('{last}', report.last).replace('{rows}', report.rows).replace('{totalRecords}', report.totalRecords);
   var currentProps = mergeProps({
+    'aria-live': 'polite',
     className: 'p-paginator-current'
   }, props.ptm('current', {
     hostName: props.hostName
@@ -19519,6 +20001,7 @@ var CurrentPageReport = /*#__PURE__*/React__namespace.memo(function (inProps) {
   var element = /*#__PURE__*/React__namespace.createElement("span", currentProps, text);
   if (props.template) {
     var defaultOptions = _objectSpread$1l(_objectSpread$1l({}, report), {
+      ariaLive: 'polite',
       className: 'p-paginator-current',
       element: element,
       props: props
@@ -19532,6 +20015,7 @@ CurrentPageReport.displayName = 'CurrentPageReport';
 function ownKeys$1k(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1k(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1k(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1k(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var FirstPageLink = /*#__PURE__*/React__namespace.memo(function (inProps) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = FirstPageLinkBase.getProps(inProps, context);
   var ptm = props.ptm,
@@ -19562,7 +20046,7 @@ var FirstPageLink = /*#__PURE__*/React__namespace.memo(function (inProps) {
     }),
     onClick: props.onClick,
     disabled: props.disabled,
-    'aria-label': ariaLabel('firstPageLabel')
+    'aria-label': ariaLabel$1('firstPageLabel')
   }, getPTOptions('firstPageButton'));
   var element = /*#__PURE__*/React__namespace.createElement("button", firstPageButtonProps, firstPageLinkIcon, /*#__PURE__*/React__namespace.createElement(Ripple, null));
   if (props.template) {
@@ -19678,6 +20162,7 @@ var InputNumberBase = ComponentBase.extend({
 function ownKeys$1j(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1j(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1j(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1j(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var InputNumber = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = InputNumberBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -20087,6 +20572,14 @@ var InputNumber = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namesp
           updateValue(event, newValueStr, null, 'delete-range');
         }
         break;
+
+      // End
+      case 35:
+      // Home/Pos1
+      case 36:
+        setTimeout(function () {
+          initCursor();
+        });
     }
   };
   var onInputKeyUp = function onInputKeyUp(event) {
@@ -20421,7 +20914,12 @@ var InputNumber = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namesp
         inputEl.setSelectionRange(_selectionEnd, _selectionEnd);
       } else if (newLength === currentLength) {
         if (operation === 'insert' || operation === 'delete-back-single') {
-          var newSelectionEnd = _selectionEnd + Number(isDecimalSign(value) || isDecimalSign(insertedValueStr));
+          var newSelectionEnd = _selectionEnd;
+          if (insertedValueStr === '0') {
+            newSelectionEnd = _selectionEnd + 1;
+          } else {
+            newSelectionEnd = newSelectionEnd + Number(isDecimalSign(value) || isDecimalSign(insertedValueStr));
+          }
           inputEl.setSelectionRange(newSelectionEnd, newSelectionEnd);
         } else if (operation === 'delete-single') {
           inputEl.setSelectionRange(_selectionEnd - 1, _selectionEnd - 1);
@@ -20714,8 +21212,10 @@ var InputNumber = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namesp
 InputNumber.displayName = 'InputNumber';
 
 var JumpToPageInput = /*#__PURE__*/React__namespace.memo(function (inProps) {
+  useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = JumpToPageInputBase.getProps(inProps, context);
+  var ariaLabelValue = ariaLabel('jumpToPageInputLabel');
   var onChange = function onChange(event) {
     if (props.onChange) {
       props.onChange(props.rows * (event.value - 1), props.rows);
@@ -20731,7 +21231,8 @@ var JumpToPageInput = /*#__PURE__*/React__namespace.memo(function (inProps) {
     unstyled: props.unstyled,
     __parentMetadata: {
       parent: props.metaData
-    }
+    },
+    "aria-label": ariaLabelValue
   });
   if (props.template) {
     var defaultOptions = {
@@ -20739,6 +21240,7 @@ var JumpToPageInput = /*#__PURE__*/React__namespace.memo(function (inProps) {
       onChange: onChange,
       disabled: props.disabled,
       className: 'p-paginator-page-input',
+      ariaLabel: ariaLabelValue,
       element: element,
       props: props
     };
@@ -20751,6 +21253,7 @@ JumpToPageInput.displayName = 'JumpToPageInput';
 function ownKeys$1i(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1i(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1i(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1i(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LastPageLink = /*#__PURE__*/React__namespace.memo(function (inProps) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = LastPageLinkBase.getProps(inProps, context);
   var ptm = props.ptm,
@@ -20781,7 +21284,7 @@ var LastPageLink = /*#__PURE__*/React__namespace.memo(function (inProps) {
     }),
     onClick: props.onClick,
     disabled: props.disabled,
-    'aria-label': ariaLabel('lastPageLabel')
+    'aria-label': ariaLabel$1('lastPageLabel')
   }, getPTOptions('lastPageButton'));
   var element = /*#__PURE__*/React__namespace.createElement("button", lastPageButtonProps, lastPageLinkIcon, /*#__PURE__*/React__namespace.createElement(Ripple, null));
   if (props.template) {
@@ -20802,6 +21305,7 @@ LastPageLink.displayName = 'LastPageLink';
 function ownKeys$1h(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1h(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1h(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1h(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var NextPageLink = /*#__PURE__*/React__namespace.memo(function (inProps) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = NextPageLinkBase.getProps(inProps, context);
   var ptm = props.ptm,
@@ -20832,7 +21336,7 @@ var NextPageLink = /*#__PURE__*/React__namespace.memo(function (inProps) {
     }),
     onClick: props.onClick,
     disabled: props.disabled,
-    'aria-label': ariaLabel('nextPageLabel')
+    'aria-label': ariaLabel$1('nextPageLabel')
   }, getPTOptions('nextPageButton'));
   var element = /*#__PURE__*/React__namespace.createElement("button", nextPageButtonProps, nextPageLinkIcon, /*#__PURE__*/React__namespace.createElement(Ripple, null));
   if (props.template) {
@@ -20852,6 +21356,7 @@ var NextPageLink = /*#__PURE__*/React__namespace.memo(function (inProps) {
 NextPageLink.displayName = 'NextPageLink';
 
 var PageLinks = /*#__PURE__*/React__namespace.memo(function (inProps) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = PageLinksBase.getProps(inProps, context);
   var ptm = props.ptm,
@@ -20895,9 +21400,10 @@ var PageLinks = /*#__PURE__*/React__namespace.memo(function (inProps) {
           page: props.page
         }),
         disabled: props.disabled,
-        'aria-label': ariaLabel('pageLabel', {
+        'aria-label': ariaLabel$1('pageLabel', {
           page: pageLink
-        })
+        }),
+        'aria-current': pageLink - 1 === props.page ? 'true' : undefined
       }, getPTOptions(pageLink, 'pageButton'));
       var element = /*#__PURE__*/React__namespace.createElement("button", pageButtonProps, pageLink, /*#__PURE__*/React__namespace.createElement(Ripple, null));
       if (props.template) {
@@ -20913,6 +21419,10 @@ var PageLinks = /*#__PURE__*/React__namespace.memo(function (inProps) {
           page: pageLink - 1,
           currentPage: props.page,
           totalPages: props.pageCount,
+          ariaLabel: ariaLabel$1('pageLabel', {
+            page: pageLink
+          }),
+          ariaCurrent: pageLink - 1 === props.page ? 'true' : undefined,
           element: element,
           props: props
         };
@@ -20935,6 +21445,7 @@ PageLinks.displayName = 'PageLinks';
 function ownKeys$1g(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1g(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1g(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1g(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var PrevPageLink = /*#__PURE__*/React__namespace.memo(function (inProps) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = PrevPageLinkBase.getProps(inProps, context);
   var ptm = props.ptm,
@@ -20965,7 +21476,7 @@ var PrevPageLink = /*#__PURE__*/React__namespace.memo(function (inProps) {
     }),
     onClick: props.onClick,
     disabled: props.disabled,
-    'aria-label': ariaLabel('previousPageLabel')
+    'aria-label': ariaLabel$1('previousPageLabel')
   }, getPTOptions('prevPageButton'));
   var element = /*#__PURE__*/React__namespace.createElement("button", prevPageButtonProps, prevPageLinkIcon, /*#__PURE__*/React__namespace.createElement(Ripple, null));
   if (props.template) {
@@ -21016,6 +21527,7 @@ var classes$O = {
   loadingIcon: 'p-dropdown-trigger-icon p-clickable',
   clearIcon: 'p-dropdown-clear-icon p-clickable',
   filterIcon: 'p-dropdown-filter-icon',
+  filterClearIcon: 'p-dropdown-filter-clear-icon',
   filterContainer: function filterContainer(_ref4) {
     var clearIcon = _ref4.clearIcon;
     return classNames('p-dropdown-filter-container', {
@@ -21137,6 +21649,7 @@ var DropdownBase = ComponentBase.extend({
 });
 
 var DropdownItem = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx,
     selected = props.selected,
@@ -21184,6 +21697,7 @@ DropdownItem.displayName = 'DropdownItem';
 function ownKeys$1f(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1f(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1f(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1f(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var DropdownPanel = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx,
     sx = props.sx;
@@ -21279,7 +21793,8 @@ var DropdownPanel = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__name
         className: cx('itemGroup', {
           optionGroupLabel: optionGroupLabel
         }),
-        style: style
+        style: style,
+        'data-p-highlight': props.selected
       }, getPTOptions('itemGroup'));
       return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, {
         key: key
@@ -21314,14 +21829,14 @@ var DropdownPanel = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__name
     if (props.showFilterClear && props.filterValue) {
       var ariaLabel = localeOption('clear');
       var clearIconProps = mergeProps({
-        className: cx('clearIcon'),
+        className: cx('filterClearIcon'),
         'aria-label': ariaLabel,
         onClick: function onClick() {
           return props.onFilterClearIconClick(function () {
             return DomHandler.focus(filterInputRef.current);
           });
         }
-      }, getPTOptions('clearIcon'));
+      }, getPTOptions('filterClearIcon'));
       var icon = props.filterClearIcon || /*#__PURE__*/React__namespace.createElement(TimesIcon, clearIconProps);
       var filterClearIcon = IconUtils.getJSXIcon(icon, _objectSpread$1f({}, clearIconProps), {
         props: props
@@ -21474,6 +21989,7 @@ function _arrayLikeToArray$c(arr, len) { if (len == null || len > arr.length) le
 function ownKeys$1e(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1e(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1e(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Dropdown = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = DropdownBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(''),
@@ -21560,7 +22076,7 @@ var Dropdown = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     }
   };
   var isClearClicked = function isClearClicked(event) {
-    return DomHandler.hasClass(event.target, 'p-dropdown-clear-icon') || DomHandler.hasClass(event.target, 'p-dropdown-filter-clear-icon');
+    return DomHandler.isAttributeEquals(event.target, 'data-pc-section', 'clearicon') || DomHandler.isAttributeEquals(event.target.parentElement || event.target, 'data-pc-section', 'filterclearicon');
   };
   var _onClick = function onClick(event) {
     if (props.disabled || props.loading) {
@@ -21572,7 +22088,7 @@ var Dropdown = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     if (event.defaultPrevented) {
       return;
     }
-    if (DomHandler.hasClass(event.target, 'p-dropdown-clear-icon') || event.target.tagName === 'INPUT') {
+    if (isClearClicked(event) || event.target.tagName === 'INPUT') {
       return;
     } else if (!overlayRef.current || !(overlayRef.current && overlayRef.current.contains(event.target))) {
       DomHandler.focus(focusInputRef.current);
@@ -21875,6 +22391,9 @@ var Dropdown = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
         }
       });
     }
+    if (props.filter) {
+      resetFilter();
+    }
     updateEditableLabel();
   };
   var selectItem = function selectItem(event) {
@@ -21966,7 +22485,7 @@ var Dropdown = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     DomHandler.alignOverlay(overlayRef.current, inputRef.current.parentElement, props.appendTo || context && context.appendTo || PrimeReact.appendTo);
   };
   var scrollInView = function scrollInView() {
-    var highlightItem = DomHandler.findSingle(overlayRef.current, 'li.p-highlight');
+    var highlightItem = DomHandler.findSingle(overlayRef.current, 'li[data-p-highlight="true"]');
     if (highlightItem && highlightItem.scrollIntoView) {
       highlightItem.scrollIntoView({
         block: 'nearest',
@@ -22273,6 +22792,7 @@ var Dropdown = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
 Dropdown.displayName = 'Dropdown';
 
 var RowsPerPageDropdown = /*#__PURE__*/React__namespace.memo(function (inProps) {
+  useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = RowsPerPageDropdownBase.getProps(inProps, context);
   var hasOptions = props.options && props.options.length > 0;
@@ -22282,21 +22802,22 @@ var RowsPerPageDropdown = /*#__PURE__*/React__namespace.memo(function (inProps)
       value: opt
     };
   }) : [];
-  var ariaLabel = localeOption('choose');
-  var element = hasOptions ? /*#__PURE__*/React__namespace.createElement(Dropdown, {
+  var placeholderValue = localeOption('choose');
+  var ariaLabelValue = ariaLabel$1('rowsPerPage');
+  var element = hasOptions ? /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(Dropdown, {
     value: props.value,
     options: options,
     onChange: props.onChange,
     appendTo: props.appendTo,
     disabled: props.disabled,
-    placeholder: ariaLabel,
-    "aria-label": ariaLabel,
+    placeholder: placeholderValue,
+    "aria-label": ariaLabelValue,
     pt: props.ptm('RPPDropdown'),
     unstyled: props.unstyled,
     __parentMetadata: {
       parent: props.metaData
     }
-  }) : null;
+  })) : null;
   if (props.template) {
     var defaultOptions = {
       value: props.value,
@@ -22307,6 +22828,7 @@ var RowsPerPageDropdown = /*#__PURE__*/React__namespace.memo(function (inProps)
       totalPages: props.pageCount,
       totalRecords: props.totalRecords,
       disabled: props.disabled,
+      ariaLabel: ariaLabelValue,
       element: element,
       props: props
     };
@@ -22319,6 +22841,7 @@ RowsPerPageDropdown.displayName = 'RowsPerPageDropdown';
 function ownKeys$1d(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1d(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1d(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1d(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Paginator = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = PaginatorBase.getProps(inProps, context);
   var metaData = _objectSpread$1d({
@@ -23011,6 +23534,7 @@ var RowCheckbox = /*#__PURE__*/React__namespace.memo(function (props) {
     _React$useState2 = _slicedToArray(_React$useState, 2),
     focusedState = _React$useState2[0],
     setFocusedState = _React$useState2[1];
+  var mergeProps = useMergeProps();
   var getColumnProps = function getColumnProps() {
     return ColumnBase.getCProps(props.column);
   };
@@ -23102,6 +23626,7 @@ var RowRadioButton = /*#__PURE__*/React__namespace.memo(function (props) {
     focusedState = _React$useState2[0],
     setFocusedState = _React$useState2[1];
   var inputRef = React__namespace.useRef(null);
+  var mergeProps = useMergeProps();
   var getColumnProps = function getColumnProps() {
     return ColumnBase.getCProps(props.column);
   };
@@ -23200,6 +23725,7 @@ RowRadioButton.displayName = 'RowRadioButton';
 function ownKeys$1a(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1a(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1a(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var BodyCell = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = useMergeProps();
   var _React$useState = React__namespace.useState(props.editing),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     editingState = _React$useState2[0],
@@ -23354,12 +23880,14 @@ var BodyCell = /*#__PURE__*/React__namespace.memo(function (props) {
         onCellEditCancel(params);
       }
       var valid = true;
-      if (cellEditValidator) {
+      if (!submit && cellEditValidator) {
         valid = cellEditValidator(params);
       }
       if (valid) {
         if (submit && onCellEditComplete) {
-          onCellEditComplete(params);
+          setTimeout(function () {
+            return onCellEditComplete(params);
+          });
         }
         closeCell(event);
       } else {
@@ -23500,21 +24028,18 @@ var BodyCell = /*#__PURE__*/React__namespace.memo(function (props) {
   };
   var _onKeyDown = function onKeyDown(event) {
     if (props.editMode !== 'row') {
-      if (event.which === 13 || event.which === 9) {
-        // tab || enter
+      if (event.code === 'Enter' || event.code === 'Tab') {
         switchCellToViewMode(event, true);
       }
-      if (event.which === 27) {
-        // escape
+      if (event.code === 'Escape') {
         switchCellToViewMode(event, false);
       }
     }
     if (props.allowCellSelection) {
       var target = event.target,
         cell = event.currentTarget;
-      switch (event.which) {
-        //left arrow
-        case 37:
+      switch (event.code) {
+        case 'ArrowLeft':
           var prevCell = findPrevSelectableCell(cell);
           if (prevCell) {
             changeTabIndex(cell, prevCell);
@@ -23522,9 +24047,7 @@ var BodyCell = /*#__PURE__*/React__namespace.memo(function (props) {
           }
           event.preventDefault();
           break;
-
-        //right arrow
-        case 39:
+        case 'ArrowRight':
           var nextCell = findNextSelectableCell(cell);
           if (nextCell) {
             changeTabIndex(cell, nextCell);
@@ -23532,9 +24055,7 @@ var BodyCell = /*#__PURE__*/React__namespace.memo(function (props) {
           }
           event.preventDefault();
           break;
-
-        //up arrow
-        case 38:
+        case 'ArrowUp':
           var upCell = findUpSelectableCell(cell);
           if (upCell) {
             changeTabIndex(cell, upCell);
@@ -23542,9 +24063,7 @@ var BodyCell = /*#__PURE__*/React__namespace.memo(function (props) {
           }
           event.preventDefault();
           break;
-
-        //down arrow
-        case 40:
+        case 'ArrowDown':
           var downCell = findDownSelectableCell(cell);
           if (downCell) {
             changeTabIndex(cell, downCell);
@@ -23552,17 +24071,14 @@ var BodyCell = /*#__PURE__*/React__namespace.memo(function (props) {
           }
           event.preventDefault();
           break;
-
-        //enter
-        case 13:
+        case 'Enter':
+        case 'NumpadEnter':
           if (event.shiftKey || event.ctrlKey) ; else if (!DomHandler.isClickable(target)) {
             _onClick(event);
             event.preventDefault();
           }
           break;
-
-        //space
-        case 32:
+        case 'Space':
           if (!DomHandler.isClickable(target) && !target.readOnly) {
             _onClick(event);
             event.preventDefault();
@@ -23720,7 +24236,7 @@ var BodyCell = /*#__PURE__*/React__namespace.memo(function (props) {
       if (showSelection) {
         var ariaLabelField = props.selectionAriaLabel || props.tableProps.dataKey;
         var ariaLabelText = ObjectUtils.resolveFieldData(props.rowData, ariaLabelField);
-        label = "".concat(props.selected ? ariaLabel('unselectLabel') : ariaLabel('selectLabel'), " ").concat(ariaLabelText);
+        label = "".concat(props.selected ? ariaLabel$1('unselectLabel') : ariaLabel$1('selectLabel'), " ").concat(ariaLabelText);
       }
       content = showSelection && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, selectionMode === 'single' && /*#__PURE__*/React__namespace.createElement(RowRadioButton, {
         hostName: props.hostName,
@@ -23775,7 +24291,7 @@ var BodyCell = /*#__PURE__*/React__namespace.memo(function (props) {
       var ariaControls = "".concat(props.tableSelector, "_content_").concat(props.rowIndex, "_expanded");
       var _ariaLabelField = props.selectionAriaLabel || props.tableProps.dataKey;
       var _ariaLabelText = ObjectUtils.resolveFieldData(props.rowData, _ariaLabelField);
-      var _label = "".concat(props.expanded ? ariaLabel('collapseLabel') : ariaLabel('expandLabel'), " ").concat(_ariaLabelText);
+      var _label = "".concat(props.expanded ? ariaLabel$1('collapseLabel') : ariaLabel$1('expandLabel'), " ").concat(_ariaLabelText);
       var expanderProps = {
         onClick: onRowToggle,
         className: cx('rowToggler')
@@ -23830,6 +24346,7 @@ var BodyCell = /*#__PURE__*/React__namespace.memo(function (props) {
         var rowEditorSaveButtonProps = mergeProps({
           type: 'button',
           name: 'row-save',
+          'aria-label': ariaLabel$1('saveEdit'),
           onClick: rowEditorProps.onSaveClick,
           className: rowEditorProps.saveClassName,
           tabIndex: props.tabIndex,
@@ -23838,6 +24355,7 @@ var BodyCell = /*#__PURE__*/React__namespace.memo(function (props) {
         var rowEditorCancelButtonProps = mergeProps({
           type: 'button',
           name: 'row-cancel',
+          'aria-label': ariaLabel$1('cancelEdit'),
           onClick: rowEditorProps.onCancelClick,
           className: rowEditorProps.cancelClassName,
           tabIndex: props.tabIndex
@@ -23852,6 +24370,7 @@ var BodyCell = /*#__PURE__*/React__namespace.memo(function (props) {
         var rowEditorInitButtonProps = mergeProps({
           type: 'button',
           name: 'row-edit',
+          'aria-label': ariaLabel$1('editRow'),
           onClick: rowEditorProps.onInitClick,
           className: rowEditorProps.initClassName,
           tabIndex: props.tabIndex,
@@ -23959,6 +24478,7 @@ BodyCell.displayName = 'BodyCell';
 function ownKeys$19(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$19(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$19(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$19(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var BodyRow = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = useMergeProps();
   var _React$useState = React__namespace.useState(false),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     editingState = _React$useState2[0],
@@ -24416,6 +24936,7 @@ BodyRow.displayName = 'BodyRow';
 function ownKeys$18(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$18(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$18(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$18(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var RowTogglerButton = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     ptmo = _props$ptCallbacks.ptmo,
@@ -24448,7 +24969,7 @@ var RowTogglerButton = /*#__PURE__*/React__namespace.memo(function (props) {
   var togglerIcon = IconUtils.getJSXIcon(icon, _objectSpread$18({}, rowGroupTogglerIconProps), {
     props: props
   });
-  var label = props.expanded ? ariaLabel('collapseLabel') : ariaLabel('expandLabel');
+  var label = props.expanded ? ariaLabel$1('collapseLabel') : ariaLabel$1('expandLabel');
   var rowGroupTogglerProps = mergeProps({
     type: 'button',
     onClick: function onClick(e) {
@@ -24466,6 +24987,7 @@ var _excluded = ["originalEvent"];
 function ownKeys$17(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$17(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$17(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$17(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TableBody = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     ptmo = _props$ptCallbacks.ptmo,
@@ -25517,6 +26039,7 @@ var FooterCell = /*#__PURE__*/React__namespace.memo(function (props) {
     styleObjectState = _React$useState2[0],
     setStyleObjectState = _React$useState2[1];
   var elementRef = React__namespace.useRef(null);
+  var mergeProps = useMergeProps();
   var getColumnProps = function getColumnProps() {
     return ColumnBase.getCProps(props.column);
   };
@@ -25607,6 +26130,7 @@ var TableFooter = /*#__PURE__*/React__namespace.memo(function (props) {
     ptm = _props$ptCallbacks.ptm,
     ptmo = _props$ptCallbacks.ptmo,
     cx = _props$ptCallbacks.cx;
+  var mergeProps = useMergeProps();
   var getRowProps = function getRowProps(row) {
     return ColumnGroupBase.getCProps(row);
   };
@@ -25704,6 +26228,7 @@ var ColumnFilter = /*#__PURE__*/React__namespace.memo(function (props) {
   var iconRef = React__namespace.useRef(null);
   var selfClick = React__namespace.useRef(false);
   var overlayEventListener = React__namespace.useRef(null);
+  var mergeProps = useMergeProps();
   var getColumnProp = function getColumnProp(name) {
     return ColumnBase.getCProp(props.column, name);
   };
@@ -26516,6 +27041,7 @@ var HeaderCheckbox = /*#__PURE__*/React__namespace.memo(function (props) {
     _React$useState2 = _slicedToArray(_React$useState, 2),
     focusedState = _React$useState2[0],
     setFocusedState = _React$useState2[1];
+  var mergeProps = useMergeProps();
   var getColumnProps = function getColumnProps() {
     return ColumnBase.getCProps(props.column);
   };
@@ -26608,6 +27134,7 @@ var HeaderCell = /*#__PURE__*/React__namespace.memo(function (props) {
     setStyleObjectState = _React$useState2[1];
   var elementRef = React__namespace.useRef(null);
   var prevColumn = usePrevious(props.column);
+  var mergeProps = useMergeProps();
   var parentMetaData = props.metaData,
     ptCallbacks = props.ptCallbacks,
     index = props.index;
@@ -26990,6 +27517,7 @@ var TableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
     _React$useState4 = _slicedToArray(_React$useState3, 2),
     allSortableDisabledState = _React$useState4[0],
     setAllSortableDisabledState = _React$useState4[1];
+  var mergeProps = useMergeProps();
   var isSingleSort = props.sortMode === 'single';
   var isMultipleSort = props.sortMode === 'multiple';
   var isAllSortableDisabled = isSingleSort && allSortableDisabledState;
@@ -27235,6 +27763,7 @@ function ownKeys$11(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySym
 function _objectSpread$11(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$11(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$11(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
   var context = React__namespace.useContext(PrimeReactContext);
+  var mergeProps = useMergeProps();
   var props = DataTableBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.first),
     _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -27320,6 +27849,7 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
   var dropPosition = React__namespace.useRef(null);
   var styleElement = React__namespace.useRef(null);
   var responsiveStyleElement = React__namespace.useRef(null);
+  var beforeResizeStyleElement = React__namespace.useRef(null);
   var columnWidthsState = React__namespace.useRef(null);
   var tableWidthState = React__namespace.useRef(null);
   var resizeColumn = React__namespace.useRef(null);
@@ -27693,6 +28223,7 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
     }
   };
   var onColumnResizeStart = function onColumnResizeStart(e) {
+    createBeforeResizeStyleElement();
     var event = e.originalEvent,
       column = e.column;
     var containerLeft = DomHandler.getOffset(elementRef.current).left;
@@ -27705,7 +28236,6 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
   var onColumnResize = function onColumnResize(event) {
     var containerLeft = DomHandler.getOffset(elementRef.current).left;
     elementRef.current.setAttribute('data-p-unselectable-text', true);
-    !ptCallbacks.isUnstyled() && DomHandler.addClass(elementRef.current, 'p-unselectable-text');
     resizeHelperRef.current.style.height = elementRef.current.offsetHeight + 'px';
     resizeHelperRef.current.style.top = 0 + 'px';
     resizeHelperRef.current.style.left = event.pageX - containerLeft + elementRef.current.scrollLeft + 'px';
@@ -27755,7 +28285,7 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
     resizeColumn.current = null;
     resizeColumnElement.current = null;
     elementRef.current.setAttribute('data-p-unselectable-text', 'true');
-    !ptCallbacks.isUnstyled() && DomHandler.removeClass(elementRef.current, 'p-unselectable-text');
+    destroyBeforeResizeStyleElement();
     unbindColumnResizeEvents();
   };
   var resizeTableCells = function resizeTableCells(newColumnWidth, nextColumnWidth) {
@@ -27944,6 +28474,11 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
       dropPosition.current = null;
     }
   };
+  var createBeforeResizeStyleElement = function createBeforeResizeStyleElement() {
+    beforeResizeStyleElement.current = DomHandler.createInlineStyle(context && context.nonce || PrimeReact.nonce, context && context.styleContainer);
+    var innerHTML = "\n[data-pc-name=\"datatable\"][".concat(attributeSelector.current, "] {\n    user-select:none;\n}\n        ");
+    beforeResizeStyleElement.current.innerHTML = innerHTML;
+  };
   var createStyleElement = function createStyleElement() {
     styleElement.current = DomHandler.createInlineStyle(context && context.nonce || PrimeReact.nonce, context && context.styleContainer);
   };
@@ -27963,6 +28498,9 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
   var destroyStyleElement = function destroyStyleElement() {
     styleElement.current = DomHandler.removeInlineStyle(styleElement.current);
   };
+  var destroyBeforeResizeStyleElement = function destroyBeforeResizeStyleElement() {
+    beforeResizeStyleElement.current = DomHandler.removeInlineStyle(beforeResizeStyleElement.current);
+  };
   var onPageChange = function onPageChange(e) {
     clearEditingMetaData();
     if (props.onPage) {
@@ -28540,6 +29078,7 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
     unbindColumnResizeEvents();
     destroyStyleElement();
     destroyResponsiveStyle();
+    destroyBeforeResizeStyleElement();
   });
   React__namespace.useImperativeHandle(ref, function () {
     return {
@@ -29023,7 +29562,7 @@ DataTable.displayName = 'DataTable';
 var classes$M = {
   loadingIcon: 'p-dataview-loading-icon',
   loadingOverlay: 'p-dataview-loading-overlay p-component-overlay',
-  emptyMessage: 'p-col-12 col-12 p-dataview-emptymessage',
+  emptyMessage: 'p-dataview-emptymessage',
   header: 'p-dataview-header',
   footer: 'p-dataview-footer',
   content: 'p-dataview-content',
@@ -29038,7 +29577,7 @@ var classes$M = {
     return classNames('p-dataview p-component', _defineProperty(_defineProperty({}, "p-dataview-".concat(props.layout), !!props.layout), 'p-dataview-loading', props.loading));
   }
 };
-var styles$I = "\n@layer primereact {\n    .p-dataview-loading {\n        position: relative;\n        min-height: 4rem;\n    }\n    \n    .p-dataview .p-dataview-loading-overlay {\n        position: absolute;\n        z-index: 1;\n        display: flex;\n        align-items: center;\n        justify-content: center;\n    }\n}\n";
+var styles$I = "\n@layer primereact {\n    .p-dataview-loading {\n        position: relative;\n        min-height: 4rem;\n    }\n\n    .p-dataview .p-dataview-loading-overlay {\n        position: absolute;\n        z-index: 1;\n        display: flex;\n        align-items: center;\n        justify-content: center;\n    }\n}\n";
 var DataViewBase = ComponentBase.extend({
   defaultProps: {
     __TYPE: 'DataView',
@@ -29072,6 +29611,7 @@ var DataViewBase = ComponentBase.extend({
     loadingIcon: null,
     gutter: false,
     itemTemplate: null,
+    listTemplate: null,
     onPage: null,
     children: undefined
   },
@@ -29094,7 +29634,7 @@ var DataViewLayoutOptionsBase = ComponentBase.extend({
   },
   css: {
     classes: {
-      root: 'p-dataview-layout-options p-selectbutton p-buttonset',
+      root: 'p-dataview p-component p-dataview-layout-options p-selectbutton p-buttonset',
       listButton: function listButton(_ref3) {
         var props = _ref3.props;
         return classNames('p-button p-button-icon-only', {
@@ -29229,6 +29769,15 @@ var DataView = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
       setRowsState(event.rows);
     }
   };
+  var getItems = function getItems(value) {
+    if (props.paginator) {
+      var currentFirst = props.lazy ? 0 : first;
+      var totalRecords = getTotalRecords();
+      var last = Math.min(rows + currentFirst, totalRecords);
+      return value.slice(currentFirst, last) || [];
+    }
+    return value;
+  };
   var sort = function sort() {
     if (props.value) {
       // performance optimization to prevent resolving field data in each loop
@@ -29316,23 +29865,8 @@ var DataView = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
   };
   var createItems = function createItems(value) {
     if (ObjectUtils.isNotEmpty(value)) {
-      if (props.paginator) {
-        var currentFirst = props.lazy ? 0 : first;
-        var totalRecords = getTotalRecords();
-        var last = Math.min(rows + currentFirst, totalRecords);
-        var items = [];
-        for (var i = currentFirst; i < last; i++) {
-          var val = value[i];
-          val && items.push( /*#__PURE__*/React__namespace.createElement(DataViewItem, {
-            key: getItemRenderKey(value) || i,
-            template: props.itemTemplate,
-            layout: props.layout,
-            item: val
-          }));
-        }
-        return items;
-      }
-      return value.map(function (item, index) {
+      var items = getItems(value);
+      return items.map(function (item, index) {
         return /*#__PURE__*/React__namespace.createElement(DataViewItem, {
           key: getItemRenderKey(item) || index,
           template: props.itemTemplate,
@@ -29344,14 +29878,21 @@ var DataView = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     return createEmptyMessage();
   };
   var createContent = function createContent(value) {
-    var items = createItems(value);
-    var gridProps = mergeProps({
-      className: cx('grid')
-    }, ptm('grid'));
     var contentProps = mergeProps({
       className: cx('content')
     }, ptm('content'));
-    return /*#__PURE__*/React__namespace.createElement("div", contentProps, /*#__PURE__*/React__namespace.createElement("div", gridProps, items));
+    var content = null;
+    if (props.listTemplate) {
+      var items = getItems(value);
+      content = ObjectUtils.getJSXElement(props.listTemplate, items, props.layout);
+    } else {
+      var _items = createItems(value);
+      var gridProps = mergeProps({
+        className: cx('grid')
+      }, ptm('grid'));
+      content = /*#__PURE__*/React__namespace.createElement("div", gridProps, _items);
+    }
+    return /*#__PURE__*/React__namespace.createElement("div", contentProps, content);
   };
   var processData = function processData() {
     var data = props.value;
@@ -29396,6 +29937,7 @@ var DeferredContentBase = ComponentBase.extend({
 });
 
 var DeferredContent = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = DeferredContentBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -29499,6 +30041,7 @@ var DividerBase = ComponentBase.extend({
 });
 
 var Divider = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = DividerBase.getProps(inProps, context);
   var _DividerBase$setMetaD = DividerBase.setMetaData({
@@ -29610,6 +30153,7 @@ var Dock = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.for
     _React$useState6 = _slicedToArray(_React$useState5, 2),
     focusedOptionIndex = _React$useState6[0],
     setFocusedOptionIndex = _React$useState6[1];
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = DockBase.getProps(inProps, context);
   var _React$useState7 = React__namespace.useState(props.id),
@@ -29931,6 +30475,7 @@ var QuillJS = function () {
   }
 }();
 var Editor = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = EditorBase.getProps(inProps, context);
   var _EditorBase$setMetaDa = EditorBase.setMetaData({
@@ -30197,6 +30742,7 @@ var FieldsetBase = ComponentBase.extend({
 });
 
 var Fieldset = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = FieldsetBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -30535,6 +31081,7 @@ function ownKeys$Y(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymb
 function _objectSpread$Y(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$Y(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$Y(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var messageIdx$1 = 0;
 var Messages = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = MessagesBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState([]),
@@ -30705,6 +31252,7 @@ var ProgressBarBase = ComponentBase.extend({
 function ownKeys$X(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$X(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$X(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$X(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var ProgressBar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ProgressBarBase.getProps(inProps, context);
   var _ProgressBarBase$setM = ProgressBarBase.setMetaData(_objectSpread$X({
@@ -30918,6 +31466,7 @@ function _createForOfIteratorHelper$9(o, allowArrayLike) { var it = typeof Symbo
 function _unsupportedIterableToArray$9(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$9(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$9(o, minLen); }
 function _arrayLikeToArray$9(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 FileUpload = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = FileUploadBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState([]),
@@ -31031,9 +31580,7 @@ var FileUpload = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespa
     for (var i = 0; i < selectedFiles.length; i++) {
       var file = selectedFiles[i];
       if (!isFileSelected(file) && validate(file)) {
-        if (isImage(file)) {
-          file.objectURL = window.URL.createObjectURL(file);
-        }
+        file.objectURL = window.URL.createObjectURL(file);
         currentFiles.push(file);
       }
     }
@@ -31730,6 +32277,7 @@ var GalleriaBase = ComponentBase.extend({
 function ownKeys$V(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$V(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$V(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$V(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var GalleriaItem = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var indicatorContent = React__namespace.useRef(null);
   var ptm = props.ptm,
     cx = props.cx;
@@ -32827,6 +33375,7 @@ var ImageBase = ComponentBase.extend({
 function ownKeys$S(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$S(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$S(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$S(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Image = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ImageBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -32849,7 +33398,6 @@ var Image = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.fo
   var imageRef = React__namespace.useRef(null);
   var maskRef = React__namespace.useRef(null);
   var previewRef = React__namespace.useRef(null);
-  var previewClick = React__namespace.useRef(false);
   var previewButton = React__namespace.useRef(null);
   var zoomOutDisabled = scaleState <= 0.5;
   var zoomInDisabled = scaleState >= 1.5;
@@ -32891,28 +33439,17 @@ var Image = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.fo
     }
   };
   var hide = function hide() {
-    if (!previewClick.current) {
-      setPreviewVisibleState(false);
-      DomHandler.unblockBodyScroll();
-      setRotateState(0);
-      setScaleState(1);
-    }
-    previewClick.current = false;
-  };
-  var onPreviewImageClick = function onPreviewImageClick() {
-    previewClick.current = true;
+    setPreviewVisibleState(false);
+    DomHandler.unblockBodyScroll();
+    setRotateState(0);
+    setScaleState(1);
   };
   var onMaskClick = function onMaskClick(event) {
     var isActionbarTarget = [event.target.classList].includes('p-image-action') || event.target.closest('.p-image-action');
     if (isActionbarTarget) {
       return;
     }
-    if (!previewClick.current) {
-      setPreviewVisibleState(false);
-      setRotateState(0);
-      setScaleState(0);
-    }
-    previewClick.current = false;
+    hide();
   };
   var onMaskKeydown = function onMaskKeydown(event) {
     switch (event.code) {
@@ -32932,33 +33469,28 @@ var Image = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.fo
       name: name,
       src: src
     });
-    previewClick.current = true;
   };
   var rotateRight = function rotateRight() {
     setRotateState(function (prevRotate) {
       return prevRotate + 90;
     });
-    previewClick.current = true;
   };
   var rotateLeft = function rotateLeft() {
     setRotateState(function (prevRotate) {
       return prevRotate - 90;
     });
-    previewClick.current = true;
   };
   var zoomIn = function zoomIn() {
     setScaleState(function (prevScale) {
       if (zoomInDisabled) return prevScale;
       return prevScale + 0.1;
     });
-    previewClick.current = true;
   };
   var zoomOut = function zoomOut() {
     setScaleState(function (prevScale) {
       if (zoomOutDisabled) return prevScale;
       return prevScale - 0.1;
     });
-    previewClick.current = true;
   };
   var onEntering = function onEntering() {
     ZIndexUtils.set('modal', maskRef.current, context && context.autoZIndex || PrimeReact.autoZIndex, context && context.zIndex['modal'] || PrimeReact.zIndex['modal']);
@@ -33095,7 +33627,6 @@ var Image = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.fo
         rotateState: rotateState,
         scaleState: scaleState
       }),
-      onClick: onPreviewImageClick,
       crossOrigin: crossOrigin,
       referrerPolicy: referrerPolicy,
       useMap: useMap,
@@ -33240,6 +33771,7 @@ var InplaceContent = function InplaceContent(props) {
   return props.children;
 };
 var Inplace = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = InplaceBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.active),
@@ -33423,7 +33955,7 @@ var InputMask = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespac
     var range, begin, end;
     var inputEl = elementRef.current;
     if (!inputEl || !inputEl.offsetParent || inputEl !== document.activeElement) {
-      return;
+      return null;
     }
     if (typeof first === 'number') {
       begin = first;
@@ -33446,11 +33978,11 @@ var InputMask = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespac
         begin = 0 - range.duplicate().moveStart('character', -100000);
         end = begin + range.text.length;
       }
-      return {
-        begin: begin,
-        end: end
-      };
     }
+    return {
+      begin: begin,
+      end: end
+    };
   };
   var isCompleted = function isCompleted() {
     for (var i = firstNonMaskPos.current; i <= lastRequiredNonMaskPos.current; i++) {
@@ -33514,6 +34046,9 @@ var InputMask = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespac
   var handleAndroidInput = function handleAndroidInput(e) {
     var curVal = elementRef.current.value;
     var pos = caret();
+    if (!pos) {
+      return;
+    }
     if (oldVal.current.length && oldVal.current.length > curVal.length) {
       // a deletion or backspace happened
       checkVal(true);
@@ -33560,6 +34095,9 @@ var InputMask = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespac
     //backspace, delete, and escape get special treatment
     if (k === 8 || k === 46 || DomHandler.isIOS() && k === 127) {
       pos = caret();
+      if (!pos) {
+        return;
+      }
       begin = pos.begin;
       end = pos.end;
       if (end - begin === 0) {
@@ -33586,8 +34124,11 @@ var InputMask = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespac
     if (props.readOnly) {
       return;
     }
+    var pos = caret();
+    if (!pos) {
+      return;
+    }
     var k = e.which || e.keyCode,
-      pos = caret(),
       p,
       c,
       next,
@@ -33953,6 +34494,7 @@ var InputSwitchBase = ComponentBase.extend({
 function ownKeys$R(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$R(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$R(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$R(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var InputSwitch = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = InputSwitchBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -34117,6 +34659,7 @@ var InputTextareaBase = ComponentBase.extend({
 function ownKeys$Q(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$Q(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$Q(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$Q(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var InputTextarea = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = InputTextareaBase.getProps(inProps, context);
   var elementRef = React__namespace.useRef(ref);
@@ -34277,6 +34820,7 @@ var midY = 50;
 var minRadians = 4 * Math.PI / 3;
 var maxRadians = -Math.PI / 3;
 var Knob = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = KnobBase.getProps(inProps, context);
   var _KnobBase$setMetaData = KnobBase.setMetaData({
@@ -34580,6 +35124,7 @@ var ListBoxBase = ComponentBase.extend({
 function ownKeys$P(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$P(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$P(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$P(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var ListBoxHeader = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     cx = _props$ptCallbacks.cx;
@@ -34655,6 +35200,7 @@ var ListBoxItem = /*#__PURE__*/React__namespace.memo(function (props) {
     _React$useState2 = _slicedToArray(_React$useState, 2),
     focusedState = _React$useState2[0],
     setFocusedState = _React$useState2[1];
+  var mergeProps = useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     cx = _props$ptCallbacks.cx;
@@ -34717,11 +35263,11 @@ var ListBoxItem = /*#__PURE__*/React__namespace.memo(function (props) {
   };
   var findNextItem = function findNextItem(item) {
     var nextItem = item.nextElementSibling;
-    return nextItem ? DomHandler.hasClass(nextItem, 'p-disabled') || DomHandler.hasClass(nextItem, 'p-listbox-item-group') ? findNextItem(nextItem) : nextItem : null;
+    return nextItem ? DomHandler.isAttributeEquals(nextItem, 'data-p-disabled', true) || DomHandler.isAttributeEquals(nextItem, 'data-pc-section', 'itemgroup') ? findNextItem(nextItem) : nextItem : null;
   };
   var findPrevItem = function findPrevItem(item) {
     var prevItem = item.previousElementSibling;
-    return prevItem ? DomHandler.hasClass(prevItem, 'p-disabled') || DomHandler.hasClass(prevItem, 'p-listbox-item-group') ? findPrevItem(prevItem) : prevItem : null;
+    return prevItem ? DomHandler.isAttributeEquals(prevItem, 'data-p-disabled', true) || DomHandler.isAttributeEquals(prevItem, 'data-pc-section', 'itemgroup') ? findPrevItem(prevItem) : prevItem : null;
   };
   var content = props.template ? ObjectUtils.getJSXElement(props.template, props.option) : props.label;
   var itemProps = mergeProps({
@@ -34739,7 +35285,8 @@ var ListBoxItem = /*#__PURE__*/React__namespace.memo(function (props) {
     key: props.label,
     role: 'option',
     'aria-selected': props.selected,
-    'aria-disabled': props.disabled
+    'aria-disabled': props.disabled,
+    'data-p-disabled': props.disabled
   }, getPTOptions('item'));
   return /*#__PURE__*/React__namespace.createElement("li", itemProps, content, /*#__PURE__*/React__namespace.createElement(Ripple, null));
 });
@@ -34751,6 +35298,7 @@ function _createForOfIteratorHelper$8(o, allowArrayLike) { var it = typeof Symbo
 function _unsupportedIterableToArray$8(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$8(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$8(o, minLen); }
 function _arrayLikeToArray$8(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 ListBox = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ListBoxBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(''),
@@ -35248,7 +35796,7 @@ var classes$z = {
   start: 'p-megamenu-start',
   end: 'p-megamenu-end'
 };
-var styles$v = "\n@layer primereact {\n    .p-megamenu {\n        display: flex;\n    }\n\n    .p-megamenu-root-list {\n        margin: 0;\n        padding: 0;\n        list-style: none;\n    }\n\n    .p-megamenu-root-list > .p-menuitem {\n        position: relative;\n    }\n\n    .p-megamenu .p-menuitem-link {\n        cursor: pointer;\n        display: flex;\n        align-items: center;\n        text-decoration: none;\n        overflow: hidden;\n        position: relative;\n    }\n\n    .p-megamenu .p-menuitem-text {\n        line-height: 1;\n    }\n\n    .p-megamenu-panel {\n        display: none;\n        position: absolute;\n        width: auto;\n        z-index: 1;\n    }\n\n    .p-megamenu-root-list > .p-menuitem-active > .p-megamenu-panel {\n        display: block;\n    }\n\n    .p-megamenu-submenu {\n        margin: 0;\n        padding: 0;\n        list-style: none;\n    }\n\n    /* Horizontal */\n    .p-megamenu-horizontal {\n        align-items: center;\n    }\n\n    .p-megamenu-horizontal .p-megamenu-root-list {\n        display: flex;\n        align-items: center;\n        flex-wrap: wrap;\n    }\n\n    .p-megamenu-horizontal .p-megamenu-custom,\n    .p-megamenu-horizontal .p-megamenu-end {\n        margin-left: auto;\n        align-self: center;\n    }\n\n    /* Vertical */\n    .p-megamenu-vertical {\n        flex-direction: column;\n    }\n\n    .p-megamenu-vertical .p-megamenu-root-list {\n        flex-direction: column;\n    }\n\n    .p-megamenu-vertical .p-megamenu-root-list > .p-menuitem-active > .p-megamenu-panel {\n        left: 100%;\n        top: 0;\n    }\n\n    .p-megamenu-vertical .p-megamenu-root-list > .p-menuitem > .p-menuitem-link > .p-submenu-icon {\n        margin-left: auto;\n    }\n\n    .p-megamenu-grid {\n        display: flex;\n    }\n\n    .p-megamenu-col-2,\n    .p-megamenu-col-3,\n    .p-megamenu-col-4,\n    .p-megamenu-col-6,\n    .p-megamenu-col-12 {\n        flex: 0 0 auto;\n        padding: 0.5rem;\n    }\n\n    .p-megamenu-col-2 {\n        width: 16.6667%;\n    }\n\n    .p-megamenu-col-3 {\n        width: 25%;\n    }\n\n    .p-megamenu-col-4 {\n        width: 33.3333%;\n    }\n\n    .p-megamenu-col-6 {\n        width: 50%;\n    }\n\n    .p-megamenu-col-12 {\n        width: 100%;\n    }\n\n    .p-megamenu-button {\n        display: none;\n        cursor: pointer;\n        align-items: center;\n        justify-content: center;\n        text-decoration: none;\n    }\n}\n";
+var styles$v = "\n@layer primereact {\n    .p-megamenu {\n        display: flex;\n    }\n\n    .p-megamenu-root-list {\n        margin: 0;\n        padding: 0;\n        list-style: none;\n    }\n\n    .p-megamenu-root-list > .p-menuitem {\n        position: relative;\n    }\n\n    .p-megamenu .p-menuitem-link {\n        cursor: pointer;\n        display: flex;\n        align-items: center;\n        text-decoration: none;\n        overflow: hidden;\n        position: relative;\n    }\n\n    .p-megamenu .p-menuitem-text {\n        line-height: 1;\n    }\n\n    .p-megamenu-panel {\n        display: none;\n        position: absolute;\n        width: auto;\n        z-index: 1;\n    }\n\n    .p-megamenu-root-list > .p-menuitem-active > .p-megamenu-panel {\n        display: block;\n    }\n\n    .p-megamenu-submenu {\n        margin: 0;\n        padding: 0;\n        list-style: none;\n    }\n\n    /* Horizontal */\n    .p-megamenu-horizontal {\n        align-items: center;\n    }\n\n    .p-megamenu-horizontal .p-megamenu-root-list {\n        display: flex;\n        align-items: center;\n        flex-wrap: wrap;\n    }\n\n    .p-megamenu-horizontal .p-megamenu-custom,\n    .p-megamenu-horizontal .p-megamenu-end {\n        margin-left: auto;\n        align-self: center;\n    }\n\n    /* Vertical */\n    .p-megamenu-vertical {\n        flex-direction: column;\n    }\n\n    .p-megamenu-vertical .p-megamenu-root-list {\n        flex-direction: column;\n    }\n\n    .p-megamenu-vertical .p-megamenu-root-list > .p-menuitem-active > .p-megamenu-panel {\n        left: 100%;\n        top: 0;\n    }\n\n    .p-megamenu-vertical .p-megamenu-root-list > .p-menuitem > .p-menuitem-content > .p-menuitem-link  > .p-submenu-icon {\n        margin-left: auto;\n    }\n\n    .p-megamenu-grid {\n        display: flex;\n    }\n\n    .p-megamenu-col-2,\n    .p-megamenu-col-3,\n    .p-megamenu-col-4,\n    .p-megamenu-col-6,\n    .p-megamenu-col-12 {\n        flex: 0 0 auto;\n        padding: 0.5rem;\n    }\n\n    .p-megamenu-col-2 {\n        width: 16.6667%;\n    }\n\n    .p-megamenu-col-3 {\n        width: 25%;\n    }\n\n    .p-megamenu-col-4 {\n        width: 33.3333%;\n    }\n\n    .p-megamenu-col-6 {\n        width: 50%;\n    }\n\n    .p-megamenu-col-12 {\n        width: 100%;\n    }\n\n    .p-megamenu-button {\n        display: none;\n        cursor: pointer;\n        align-items: center;\n        justify-content: center;\n        text-decoration: none;\n    }\n}\n";
 var MegaMenuBase = ComponentBase.extend({
   defaultProps: {
     __TYPE: 'MegaMenu',
@@ -35277,6 +35825,7 @@ var MegaMenuBase = ComponentBase.extend({
 function ownKeys$N(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$N(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$N(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$N(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var MegaMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = MegaMenuBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -36210,7 +36759,7 @@ var MegaMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     if (!styleElementRef.current) {
       styleElementRef.current = DomHandler.createInlineStyle(context && context.nonce || PrimeReact.nonce, context && context.styleContainer);
       var selector = "".concat(attributeSelectorState);
-      var innerHTML = "\n@media screen and (max-width: ".concat(props.breakpoint, ") {\n    .p-megamenu[").concat(selector, "] > .p-megamenu-root-list .p-menuitem-active .p-megamenu-panel {\n        position: relative;\n        left: 0;\n        box-shadow: none;\n        border-radius: 0;\n        background: inherit;\n    }\n\n    .p-megamenu[").concat(selector, "] .p-menuitem-active > .p-menuitem-link > .p-submenu-icon {\n        transform: rotate(-180deg);\n    }\n\n    .p-megamenu[").concat(selector, "] .p-megamenu-grid {\n        flex-wrap: wrap;\n    }\n\n    ").concat(horizontal ? "\n.p-megamenu[".concat(selector, "] .p-megamenu-button {\n    display: flex;\n}\n\n.p-megamenu[").concat(selector, "].p-megamenu-horizontal {\n    position: relative;\n}\n\n.p-megamenu[").concat(selector, "].p-megamenu-horizontal .p-megamenu-root-list {\n    display: none;\n}\n\n.p-megamenu-horizontal[").concat(selector, "] div[class*=\"p-megamenu-col-\"] {\n    width: auto;\n    flex: 1;\n    padding: 0;\n}\n\n.p-megamenu[").concat(selector, "].p-megamenu-mobile-active .p-megamenu-root-list {\n    display: flex;\n    flex-direction: column;\n    position: absolute;\n    width: 100%;\n    top: 100%;\n    left: 0;\n    z-index: 1;\n}\n        ") : '', "\n\n    ").concat(vertical ? "\n.p-megamenu-vertical[".concat(selector, "] {\n    width: 100%;\n}\n\n.p-megamenu-vertical[").concat(selector, "] .p-megamenu-root-list {\n    max-height: ").concat(props.scrollHeight, ";\n    overflow: ").concat(props.scrollHeight ? 'auto' : '', ";\n}\n.p-megamenu-vertical[").concat(selector, "] div[class*=\"p-megamenu-col-\"] {\n    width: 100%;\n    padding: 0;\n}\n\n.p-megamenu-vertical[").concat(selector, "] .p-megamenu-submenu {\n    width: 100%;\n}\n\n.p-megamenu-vertical[").concat(selector, "] div[class*=\"p-megamenu-col-\"] .p-megamenu-submenu-header {\n    background: inherit;\n}\n\n.p-megamenu-vertical[").concat(selector, "] .p-submenu-icon:before {\n    content: \"\\e930\";\n}\n        ") : '', "\n}\n");
+      var innerHTML = "\n                    @media screen and (max-width: ".concat(props.breakpoint, ") {\n                        .p-megamenu[").concat(selector, "] > .p-megamenu-root-list .p-menuitem-active .p-megamenu-panel {\n                            position: relative;\n                            left: 0;\n                            box-shadow: none;\n                            border-radius: 0;\n                            background: inherit;\n                        }\n\n                        .p-megamenu[").concat(selector, "] {\n                            width: 100%;\n                            position: relative;\n                            padding: 0.5rem;\n                        }\n\n                        .p-megamenu[").concat(selector, "] .p-megamenu-grid {\n                            flex-wrap: wrap;\n                        }\n\n                        .p-megamenu[").concat(selector, "] .p-megamenu-button {\n                            display: flex;\n                        }\n\n                        .p-megamenu[").concat(selector, "] .p-megamenu-root-list {\n                            display: none;\n                        }\n\n                        .p-megamenu[").concat(selector, "] div[class*=\"p-megamenu-col-\"] {\n                            width: 100%;\n                        }\n\n                        .p-megamenu[").concat(selector, "].p-megamenu-mobile-active .p-megamenu-root-list {\n                            left: 0;\n                            top: 100%;\n                            z-index: 1;\n                            width: 100%;\n                            display: flex;\n                            padding: 0.5rem 0;\n                            position: absolute;\n                            flex-direction: column;\n                        }\n\n                        .p-megamenu[").concat(selector, "] .p-menuitem  > .p-menuitem-content >  .p-menuitem-link > .p-submenu-icon {\n                            margin-left: auto;\n                        }\n                        \n                        .p-megamenu[").concat(selector, "] .p-submenu-list .p-menuitem-content .p-menuitem-link {\n                            padding-left: 2.25rem;\n                        }\n\n                        ").concat(horizontal ? "\n                                    .p-megamenu[".concat(selector, "] .p-menuitem-active  > .p-menuitem-content >  .p-menuitem-link > .p-submenu-icon {\n                                        transform: rotate(-180deg);\n                                    }\n                            ") : '', "\n\n                        ").concat(vertical ? "                                                                   \n                                    .p-megamenu[".concat(selector, "] .p-menuitem  > .p-menuitem-content >  .p-menuitem-link > .p-submenu-icon {\n                                        transform: rotate(90deg);\n                                    }\n\n                                    .p-megamenu[").concat(selector, "] .p-menuitem-active  > .p-menuitem-content >  .p-menuitem-link > .p-submenu-icon {\n                                        transform: rotate(-90deg);\n                                    }\n                            ") : '', "\n                    }\n                ");
       styleElementRef.current.innerHTML = innerHTML;
     }
   };
@@ -36329,7 +36878,7 @@ var MegaMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     return null;
   };
   var createMenuButton = function createMenuButton() {
-    if (vertical || props.model && props.model.length < 1) {
+    if (props.model && props.model.length < 1) {
       return null;
     }
     var menuButtonProps = mergeProps({
@@ -36339,7 +36888,7 @@ var MegaMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
       'aria-haspopup': props.model && props.model.length > 0 ? true : false,
       'aria-expanded': mobileActiveState,
       'aria-controls': idState,
-      'aria-label': ariaLabel('navigation'),
+      'aria-label': ariaLabel$1('navigation'),
       tabIndex: 0,
       onClick: function onClick(e) {
         return toggle(e);
@@ -36377,20 +36926,25 @@ var MegaMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
 MegaMenu.displayName = 'MegaMenu';
 
 var classes$y = {
-  item: 'p-mention-item',
+  item: function item(_ref) {
+    var isSelected = _ref.isSelected;
+    return classNames('p-mention-item', {
+      'p-highlight': isSelected
+    });
+  },
   items: 'p-mention-items',
-  panel: function panel(_ref) {
-    var props = _ref.props;
+  panel: function panel(_ref2) {
+    var props = _ref2.props;
     return classNames('p-mention-panel p-component', props.panelClassName);
   },
-  input: function input(_ref2) {
-    var props = _ref2.props;
+  input: function input(_ref3) {
+    var props = _ref3.props;
     return classNames('p-mention-input', props.inputClassName);
   },
-  root: function root(_ref3) {
-    var props = _ref3.props,
-      isFilled = _ref3.isFilled,
-      focusedState = _ref3.focusedState;
+  root: function root(_ref4) {
+    var props = _ref4.props,
+      isFilled = _ref4.isFilled,
+      focusedState = _ref4.focusedState;
     return classNames('p-mention p-component p-inputwrapper', {
       'p-inputwrapper-filled': isFilled,
       'p-inputwrapper-focus': focusedState
@@ -36440,6 +36994,7 @@ var MentionBase = ComponentBase.extend({
 function ownKeys$M(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$M(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$M(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$M(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Mention = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = MentionBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -36458,6 +37013,10 @@ var Mention = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
     _React$useState8 = _slicedToArray(_React$useState7, 2),
     triggerState = _React$useState8[0],
     setTriggerState = _React$useState8[1];
+  var _React$useState9 = React__namespace.useState([]),
+    _React$useState10 = _slicedToArray(_React$useState9, 2),
+    highlightState = _React$useState10[0],
+    setHighlightState = _React$useState10[1];
   var elementRef = React__namespace.useRef(null);
   var overlayRef = React__namespace.useRef(null);
   var inputRef = React__namespace.useRef(props.inputRef);
@@ -36480,11 +37039,12 @@ var Mention = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
   useHandleStyle(MentionBase.css.styles, isUnstyled, {
     name: 'mention'
   });
-  var getPTOptions = function getPTOptions(item, suggestion) {
+  var getPTOptions = function getPTOptions(item, suggestion, options) {
     return ptm(suggestion, {
       context: {
         trigger: triggerState ? triggerState.key : ''
-      }
+      },
+      state: _objectSpread$M({}, options)
     });
   };
   var _useOverlayListener = useOverlayListener({
@@ -36518,7 +37078,11 @@ var Mention = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
   };
   var onOverlayEntering = function onOverlayEntering() {
     if (props.autoHighlight && props.suggestions && props.suggestions.length) {
-      DomHandler.addClass(listRef.current.firstChild, 'p-highlight');
+      setHighlightState(function (prevState) {
+        var newState = _toConsumableArray(prevState);
+        newState[0] = true;
+        return newState;
+      });
     }
   };
   var onOverlayEntered = function onOverlayEntered() {
@@ -36533,13 +37097,15 @@ var Mention = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
     props.onHide && props.onHide();
   };
   var alignOverlay = function alignOverlay() {
-    var key = triggerState.key,
-      index = triggerState.index;
-    var value = inputRef.current.value;
-    var position = DomHandler.getCursorOffset(inputRef.current, value.substring(0, index - 1), value.substring(index), key);
-    overlayRef.current.style.transformOrigin = 'top';
-    overlayRef.current.style.left = "calc(".concat(position.left, "px + 1rem)");
-    overlayRef.current.style.top = "calc(".concat(position.top, "px + 1.2rem)");
+    if (triggerState) {
+      var key = triggerState.key,
+        index = triggerState.index;
+      var value = inputRef.current.value;
+      var position = DomHandler.getCursorOffset(inputRef.current, value.substring(0, index - 1), value.substring(index), key);
+      overlayRef.current.style.transformOrigin = 'top';
+      overlayRef.current.style.left = "calc(".concat(position.left, "px + 1rem)");
+      overlayRef.current.style.top = "calc(".concat(position.top, "px + 1.2rem)");
+    }
   };
   var onPanelClick = function onPanelClick(event) {
     OverlayService.emit('overlay-click', {
@@ -36661,7 +37227,18 @@ var Mention = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
   };
   var onInput = function onInput(event) {
     props.onInput && props.onInput(event);
-    if (event.target.value.length > 0) DomHandler.addClass(elementRef.current, 'p-inputwrapper-filled');else DomHandler.removeClass(elementRef.current, 'p-inputwrapper-filled');
+    var isFilled = event.target.value.length > 0;
+    if (isUnstyled()) {
+      DomHandler.setAttributes(elementRef.current, {
+        'data-p-inputwrapper-filled': isFilled
+      });
+    } else {
+      if (isFilled) {
+        DomHandler.addClass(elementRef.current, 'p-inputwrapper-filled');
+      } else {
+        DomHandler.removeClass(elementRef.current, 'p-inputwrapper-filled');
+      }
+    }
   };
   var onKeyUp = function onKeyUp(event) {
     if (event.which === 37 || event.which === 39) {
@@ -36674,21 +37251,32 @@ var Mention = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
   };
   var onKeyDown = function onKeyDown(event) {
     if (overlayVisibleState) {
-      var highlightItem = DomHandler.findSingle(overlayRef.current, 'li.p-highlight');
+      var highlightItem = DomHandler.findSingle(overlayRef.current, 'li[data-p-highlight="true"]');
       switch (event.which) {
         //down
         case 40:
           if (highlightItem) {
             var nextElement = highlightItem.nextElementSibling;
             if (nextElement) {
-              DomHandler.addClass(nextElement, 'p-highlight');
-              DomHandler.removeClass(highlightItem, 'p-highlight');
+              var nextElementIndex = DomHandler.index(nextElement);
+              var highlightItemIndex = DomHandler.index(highlightItem);
+              setHighlightState(function (prevState) {
+                var newState = _toConsumableArray(prevState);
+                newState[nextElementIndex] = true;
+                newState[highlightItemIndex] = false;
+                return newState;
+              });
               DomHandler.scrollInView(overlayRef.current, nextElement);
             }
           } else {
             highlightItem = DomHandler.findSingle(overlayRef.current, 'li');
             if (highlightItem) {
-              DomHandler.addClass(highlightItem, 'p-highlight');
+              var _highlightItemIndex = DomHandler.index(highlightItem);
+              setHighlightState(function (prevState) {
+                var newState = _toConsumableArray(prevState);
+                newState[_highlightItemIndex] = true;
+                return newState;
+              });
             }
           }
           event.preventDefault();
@@ -36699,8 +37287,14 @@ var Mention = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
           if (highlightItem) {
             var previousElement = highlightItem.previousElementSibling;
             if (previousElement) {
-              DomHandler.addClass(previousElement, 'p-highlight');
-              DomHandler.removeClass(highlightItem, 'p-highlight');
+              var previousElementIndex = DomHandler.index(previousElement);
+              var _highlightItemIndex2 = DomHandler.index(highlightItem);
+              setHighlightState(function (prevState) {
+                var newState = _toConsumableArray(prevState);
+                newState[previousElementIndex] = true;
+                newState[_highlightItemIndex2] = false;
+                return newState;
+              });
               DomHandler.scrollInView(overlayRef.current, previousElement);
             }
           }
@@ -36761,15 +37355,26 @@ var Mention = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
     ObjectUtils.combinedRefs(inputRef, props.inputRef);
   }, [inputRef, props.inputRef]);
   useUpdateEffect(function () {
+    var hasSuggestions = props.suggestions && props.suggestions.length;
+    if (hasSuggestions) {
+      var newState = props.suggestions.map(function () {
+        return false;
+      });
+      setHighlightState(newState);
+    }
     if (searchingState) {
-      props.suggestions && props.suggestions.length ? show() : hide();
+      hasSuggestions ? show() : hide();
       overlayVisibleState && alignOverlay();
       setSearchingState(false);
     }
   }, [props.suggestions]);
   useUpdateEffect(function () {
-    if (!isFilled && DomHandler.hasClass(elementRef.current, 'p-inputwrapper-filled')) {
-      DomHandler.removeClass(elementRef.current, 'p-inputwrapper-filled');
+    var _isUnstyled = isUnstyled();
+    var isInputWrapperFilled = _isUnstyled ? DomHandler.isAttributeEquals(elementRef.current, 'data-p-inputwrapper-filled', true) : DomHandler.hasClass(elementRef.current, 'p-inputwrapper-filled');
+    if (!isFilled && isInputWrapperFilled) {
+      _isUnstyled ? DomHandler.setAttributes(elementRef.current, {
+        'data-p-inputwrapper-filled': false
+      }) : DomHandler.removeClass(elementRef.current, 'p-inputwrapper-filled');
     }
   }, [isFilled]);
   useUnmountEffect(function () {
@@ -36781,13 +37386,19 @@ var Mention = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
       trigger: triggerState ? triggerState.key : '',
       index: index
     }) : formatValue(suggestion);
+    var isSelected = highlightState[index];
     var itemProps = mergeProps({
       key: key,
-      className: cx('item'),
+      className: cx('item', {
+        isSelected: isSelected
+      }),
       onClick: function onClick(e) {
         return onItemClick(e, suggestion);
-      }
-    }, getPTOptions(suggestion, 'item'));
+      },
+      'data-p-highlight': isSelected
+    }, getPTOptions(suggestion, 'item', {
+      selected: isSelected
+    }));
     return /*#__PURE__*/React__namespace.createElement("li", itemProps, content, /*#__PURE__*/React__namespace.createElement(Ripple, null));
   };
   var createList = function createList() {
@@ -36946,6 +37557,7 @@ var MenuBase = ComponentBase.extend({
 function ownKeys$L(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$L(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$L(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$L(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Menu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = MenuBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -36990,7 +37602,7 @@ var Menu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.for
     callback: function callback(event) {
       hide(event);
     },
-    when: visibleState && props.popup && props.closeOnEscape,
+    when: visibleState && props.popup && props.closeOnEscape && popupMenuDisplayOrder,
     priority: [ESC_KEY_HANDLING_PRIORITIES.MENU, popupMenuDisplayOrder]
   });
   var _useOverlayListener = useOverlayListener({
@@ -37021,9 +37633,6 @@ var Menu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.for
       event.preventDefault();
       return;
     }
-    if (!item.url) {
-      event.preventDefault();
-    }
     if (item.command) {
       item.command({
         originalEvent: event,
@@ -37036,8 +37645,10 @@ var Menu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.for
     if (!props.popup && focusedOptionIndex !== key) {
       setFocusedOptionIndex(key);
     }
-    event.preventDefault();
-    event.stopPropagation();
+    if (!item.url) {
+      event.preventDefault();
+      event.stopPropagation();
+    }
   };
   var onListFocus = function onListFocus(event) {
     setFocused(true);
@@ -37427,6 +38038,7 @@ var MenubarBase = ComponentBase.extend({
 function ownKeys$K(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$K(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$K(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$K(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var MenubarSub = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx;
   var getPTOptions = function getPTOptions(processedItem, key, index) {
@@ -37667,6 +38279,7 @@ MenubarSub.displayName = 'MenubarSub';
 function ownKeys$J(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$J(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$J(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$J(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Menubar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = MenubarBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -38205,7 +38818,7 @@ var Menubar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
       });
     }
   };
-  var createProcessedItems = function createProcessedItems(items) {
+  var createProcessedItems = React__namespace.useCallback(function (items) {
     var level = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
     var parent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     var parentKey = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
@@ -38224,7 +38837,7 @@ var Menubar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
       _processedItems.push(newItem);
     });
     return _processedItems;
-  };
+  }, []);
   useMountEffect(function () {
     if (!idState) {
       setIdState(UniqueComponentId());
@@ -38241,11 +38854,11 @@ var Menubar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
       ZIndexUtils.clear(rootMenuRef.current);
     }
   }, [mobileActiveState]);
-  useUpdateEffect(function () {
+  React__namespace.useEffect(function () {
     var itemsToProcess = props.model || [];
     var processed = createProcessedItems(itemsToProcess, 0, null, '');
     setProcessedItems(processed);
-  }, [props.model]);
+  }, [props.model, createProcessedItems]);
   useUpdateEffect(function () {
     var processedItem = activeItemPath.find(function (p) {
       return p.key === focusedItemInfo.parentKey;
@@ -38321,7 +38934,7 @@ var Menubar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
       tabIndex: '0',
       'aria-haspopup': mobileActiveState && props.model && props.model.lentgh > 0 ? true : false,
       'aria-expanded': mobileActiveState,
-      'aria-label': ariaLabel('navigation'),
+      'aria-label': ariaLabel$1('navigation'),
       'aria-controls': idState,
       role: 'button'
     }, "tabIndex", 0), "className", cx('button')), "onKeyDown", function onKeyDown(e) {
@@ -38410,6 +39023,7 @@ var MessageBase = ComponentBase.extend({
 function ownKeys$I(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$I(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$I(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$I(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Message = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = MessageBase.getProps(inProps, context);
   var elementRef = React__namespace.useRef(null);
@@ -38652,6 +39266,7 @@ var MultiSelectBase = ComponentBase.extend({
 function ownKeys$H(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$H(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$H(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$H(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var MultiSelectHeader = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx,
     isUnstyled = props.isUnstyled;
@@ -38799,6 +39414,7 @@ var MultiSelectItem = /*#__PURE__*/React__namespace.memo(function (props) {
     _React$useState2 = _slicedToArray(_React$useState, 2),
     focusedState = _React$useState2[0],
     setFocusedState = _React$useState2[1];
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx;
   var getPTOptions = function getPTOptions(key) {
@@ -38877,6 +39493,7 @@ function _objectSpread$F(e) { for (var r = 1; r < arguments.length; r++) { var t
 var MultiSelectPanel = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
   var virtualScrollerRef = React__namespace.useRef(null);
   var filterInputRef = React__namespace.useRef(null);
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var ptm = props.ptm,
     cx = props.cx,
@@ -39150,6 +39767,7 @@ function _createForOfIteratorHelper$7(o, allowArrayLike) { var it = typeof Symbo
 function _unsupportedIterableToArray$7(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$7(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$7(o, minLen); }
 function _arrayLikeToArray$7(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 MultiSelect = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = MultiSelectBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(''),
@@ -39390,7 +40008,7 @@ var MultiSelect = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namesp
     });
   };
   var scrollInView = function scrollInView() {
-    var highlightItem = DomHandler.findSingle(overlayRef.current, 'li.p-highlight');
+    var highlightItem = DomHandler.findSingle(overlayRef.current, 'li[data-p-highlight="true"]');
     if (highlightItem && highlightItem.scrollIntoView) {
       highlightItem.scrollIntoView({
         block: 'nearest',
@@ -39928,6 +40546,7 @@ var MultiStateCheckboxBase = ComponentBase.extend({
 function ownKeys$D(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$D(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$D(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$D(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var MultiStateCheckbox = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = MultiStateCheckboxBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -40063,7 +40682,7 @@ var MultiStateCheckbox = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React_
   var otherProps = MultiStateCheckboxBase.getOtherProps(props);
   var ariaProps = ObjectUtils.reduceKeys(otherProps, DomHandler.ARIA_PROPS);
   var icon = createIcon();
-  var ariaValueLabel = !!selectedOption ? getOptionAriaLabel(selectedOption) : ariaLabel('nullLabel');
+  var ariaValueLabel = !!selectedOption ? getOptionAriaLabel(selectedOption) : ariaLabel$1('nullLabel');
   var ariaChecked = !!selectedOption ? 'true' : 'false';
   var rootProps = mergeProps({
     ref: elementRef,
@@ -40160,6 +40779,7 @@ var OrderListBase = ComponentBase.extend({
 });
 
 var OrderListControls = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = useMergeProps();
   var moveUpIcon = props.moveUpIcon || /*#__PURE__*/React__namespace.createElement(AngleUpIcon, null);
   var moveTopIcon = props.moveTopIcon || /*#__PURE__*/React__namespace.createElement(AngleDoubleUpIcon, null);
   var moveDownIcon = props.moveDownIcon || /*#__PURE__*/React__namespace.createElement(AngleDownIcon, null);
@@ -40271,7 +40891,7 @@ var OrderListControls = /*#__PURE__*/React__namespace.memo(function (props) {
     icon: moveUpIcon,
     onClick: moveUp,
     disabled: isMoveDisabled,
-    'aria-label': ariaLabel('moveUp'),
+    'aria-label': ariaLabel$1('moveUp'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -40282,7 +40902,7 @@ var OrderListControls = /*#__PURE__*/React__namespace.memo(function (props) {
     icon: moveTopIcon,
     onClick: moveTop,
     disabled: isMoveDisabled,
-    'aria-label': ariaLabel('moveTop'),
+    'aria-label': ariaLabel$1('moveTop'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -40293,7 +40913,7 @@ var OrderListControls = /*#__PURE__*/React__namespace.memo(function (props) {
     icon: moveDownIcon,
     onClick: moveDown,
     disabled: isMoveDisabled,
-    'aria-label': ariaLabel('moveDown'),
+    'aria-label': ariaLabel$1('moveDown'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -40304,7 +40924,7 @@ var OrderListControls = /*#__PURE__*/React__namespace.memo(function (props) {
     icon: moveBottomIcon,
     onClick: moveBottom,
     disabled: isMoveDisabled,
-    'aria-label': ariaLabel('moveBottom'),
+    'aria-label': ariaLabel$1('moveBottom'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -40324,6 +40944,7 @@ OrderListControls.displayName = 'OrderListControls';
 function ownKeys$C(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$C(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$C(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$C(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var OrderListSubList = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx;
   var _ptm = function _ptm(key, options) {
@@ -40573,6 +41194,7 @@ var OrderListSubList = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__n
 OrderListSubList.displayName = 'OrderListSubList';
 
 var OrderList = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = OrderListBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState([]),
@@ -40996,6 +41618,7 @@ var OrganizationChartBase = ComponentBase.extend({
 function ownKeys$B(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$B(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$B(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$B(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var OrganizationChartNode = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = useMergeProps();
   var node = props.node;
   var _React$useState = React__namespace.useState(node.expanded),
     _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -41190,6 +41813,7 @@ var OrganizationChartNode = /*#__PURE__*/React__namespace.memo(function (props)
 OrganizationChartNode.displayName = 'OrganizationChartNode';
 
 var OrganizationChart = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = OrganizationChartBase.getProps(inProps, context);
   var _OrganizationChartBas = OrganizationChartBase.setMetaData({
@@ -41334,6 +41958,7 @@ var OverlayPanelBase = ComponentBase.extend({
 function ownKeys$A(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$A(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$A(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$A(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var OverlayPanel = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = OverlayPanelBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -41389,7 +42014,7 @@ var OverlayPanel = /*#__PURE__*/React__namespace.forwardRef(function (inProps, r
     callback: function callback() {
       hide();
     },
-    when: visibleState && props.closeOnEscape,
+    when: visibleState && props.closeOnEscape && overlayPanelDisplayOrder,
     priority: [ESC_KEY_HANDLING_PRIORITIES.OVERLAY_PANEL, overlayPanelDisplayOrder]
   });
   var isOutsideClicked = function isOutsideClicked(target) {
@@ -41632,6 +42257,7 @@ var PanelBase = ComponentBase.extend({
 });
 
 var Panel = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = PanelBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -41909,6 +42535,7 @@ var PanelMenuBase = ComponentBase.extend({
 function ownKeys$z(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$z(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$z(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$z(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var PanelMenuSub = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx;
   var elementRef = React__namespace.useRef(null);
@@ -41935,7 +42562,7 @@ var PanelMenuSub = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__names
     return processedItem && processedItem.item ? ObjectUtils.getItemValue(processedItem.item[name], params) : undefined;
   };
   var isItemActive = function isItemActive(processedItem) {
-    return props.activeItemPath.some(function (path) {
+    return props.activeItemPath && props.activeItemPath.some(function (path) {
       return path.key === processedItem.key;
     });
   };
@@ -42153,7 +42780,7 @@ var PanelMenuList = /*#__PURE__*/React__namespace.memo(function (props) {
     _React$useState6 = _slicedToArray(_React$useState5, 2),
     focusedItemId = _React$useState6[0],
     setFocusedItemId = _React$useState6[1];
-  var _React$useState7 = React__namespace.useState(null),
+  var _React$useState7 = React__namespace.useState([]),
     _React$useState8 = _slicedToArray(_React$useState7, 2),
     activeItemPath = _React$useState8[0],
     setActiveItemPath = _React$useState8[1];
@@ -42181,7 +42808,7 @@ var PanelMenuList = /*#__PURE__*/React__namespace.memo(function (props) {
     return getItemProp(processedItem, 'disabled');
   };
   var isItemActive = function isItemActive(processedItem) {
-    return activeItemPath.some(function (path) {
+    return activeItemPath && activeItemPath.some(function (path) {
       return path.key === processedItem.parentKey;
     });
   };
@@ -42508,21 +43135,24 @@ var PanelMenuList = /*#__PURE__*/React__namespace.memo(function (props) {
     });
     return processedFlattenItems;
   };
-  useUpdateEffect(function () {
+  React__namespace.useEffect(function () {
     var processed = createProcessedItems(props.model);
     setProcessedItems(processed);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [props.model]);
-  useUpdateEffect(function () {
+  React__namespace.useEffect(function () {
     var _visibleItems = flatItems(processedItems);
     setVisibleItems(_visibleItems);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [processedItems, activeItemPath]);
+  React__namespace.useEffect(function () {
+    autoUpdateActiveItemPath(props.expandedKeys);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [props.expandedKeys]);
   useUpdateEffect(function () {
     var _id = ObjectUtils.isNotEmpty(focusedItem) ? "".concat(props.panelId, "_").concat(focusedItem.key) : null;
     setFocusedItemId(_id);
   }, [props.panelId, focusedItem]);
-  useUpdateEffect(function () {
-    autoUpdateActiveItemPath(props.expandedKeys);
-  }, [props.expandedKeys]);
   return /*#__PURE__*/React__namespace.createElement(PanelMenuSub, {
     hostName: "PanelMenu",
     id: props.panelId + '_list',
@@ -42552,6 +43182,7 @@ PanelMenuList.displayName = 'PanelMenuList';
 function ownKeys$y(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$y(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$y(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$y(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var PanelMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = PanelMenuBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -42598,7 +43229,9 @@ var PanelMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespac
         item: item
       });
     }
-    changeActiveItem(event, item);
+    if (item.items) {
+      changeActiveItem(event, item);
+    }
   };
   var getItemProp = function getItemProp(item, name) {
     return item ? ObjectUtils.getItemValue(item[name]) : undefined;
@@ -42767,9 +43400,7 @@ var PanelMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespac
     };
   });
   useMountEffect(function () {
-    if (!idState) {
-      setIdState(UniqueComponentId());
-    }
+    !idState && setIdState(UniqueComponentId());
   });
   useUpdateEffect(function () {
     setAnimationDisabled(true);
@@ -42991,6 +43622,7 @@ var PasswordBase = ComponentBase.extend({
 function ownKeys$x(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$x(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$x(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$x(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Password = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = PasswordBase.getProps(inProps, context);
   var promptLabel = props.promptLabel || localeOption('passwordPrompt');
@@ -43045,7 +43677,7 @@ var Password = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace
     callback: function callback() {
       hide();
     },
-    when: overlayVisibleState && props.feedback,
+    when: overlayVisibleState && props.feedback && passwordDisplayOrder,
     priority: [ESC_KEY_HANDLING_PRIORITIES.PASSWORD, passwordDisplayOrder]
   });
   var _useOverlayListener = useOverlayListener({
@@ -43454,6 +44086,7 @@ var PickListBase = ComponentBase.extend({
 });
 
 var PickListControls = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx,
     unstyled = props.unstyled;
@@ -43570,7 +44203,7 @@ var PickListControls = /*#__PURE__*/React__namespace.memo(function (props) {
     onClick: moveUp,
     pt: ptm('moveUpButton'),
     unstyled: unstyled,
-    "aria-label": ariaLabel('moveUp'),
+    "aria-label": ariaLabel$1('moveUp'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -43581,7 +44214,7 @@ var PickListControls = /*#__PURE__*/React__namespace.memo(function (props) {
     onClick: moveTop,
     pt: ptm('moveTopButton'),
     unstyled: unstyled,
-    "aria-label": ariaLabel('moveTop'),
+    "aria-label": ariaLabel$1('moveTop'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -43592,7 +44225,7 @@ var PickListControls = /*#__PURE__*/React__namespace.memo(function (props) {
     onClick: moveDown,
     pt: ptm('moveDownButton'),
     unstyled: unstyled,
-    "aria-label": ariaLabel('moveDown'),
+    "aria-label": ariaLabel$1('moveDown'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -43603,7 +44236,7 @@ var PickListControls = /*#__PURE__*/React__namespace.memo(function (props) {
     onClick: moveBottom,
     pt: ptm('moveBottomButton'),
     unstyled: unstyled,
-    "aria-label": ariaLabel('moveBottom'),
+    "aria-label": ariaLabel$1('moveBottom'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -43612,6 +44245,7 @@ var PickListControls = /*#__PURE__*/React__namespace.memo(function (props) {
 PickListControls.displayName = 'PickListControls';
 
 var PickListItem = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx;
   var getPTOptions = function getPTOptions(key) {
@@ -43672,6 +44306,7 @@ PickListItem.displayName = 'PickListItem';
 function ownKeys$w(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$w(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$w(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$w(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var PickListSubList = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var listElementRef = React__namespace.useRef(null);
   var ptm = props.ptm,
     cx = props.cx;
@@ -43816,6 +44451,7 @@ var PickListSubList = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__na
 PickListSubList.displayName = 'PickListSubList';
 
 var PickListTransferControls = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = useMergeProps();
   var viewChanged = useMatchMedia("(max-width: ".concat(props.breakpoint, ")"), props.breakpoint);
   var ptm = props.ptm,
     cx = props.cx,
@@ -43944,7 +44580,7 @@ var PickListTransferControls = /*#__PURE__*/React__namespace.memo(function (prop
     onClick: moveRight,
     pt: ptm('moveToTargetButton'),
     unstyled: unstyled,
-    "aria-label": ariaLabel('moveToTarget'),
+    "aria-label": ariaLabel$1('moveToTarget'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -43955,7 +44591,7 @@ var PickListTransferControls = /*#__PURE__*/React__namespace.memo(function (prop
     onClick: moveAllRight,
     pt: ptm('moveAllToTargetButton'),
     unstyled: unstyled,
-    "aria-label": ariaLabel('moveAllToTarget'),
+    "aria-label": ariaLabel$1('moveAllToTarget'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -43966,7 +44602,7 @@ var PickListTransferControls = /*#__PURE__*/React__namespace.memo(function (prop
     onClick: moveLeft,
     pt: ptm('moveToSourceButton'),
     unstyled: unstyled,
-    "aria-label": ariaLabel('moveToSource'),
+    "aria-label": ariaLabel$1('moveToSource'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -43977,7 +44613,7 @@ var PickListTransferControls = /*#__PURE__*/React__namespace.memo(function (prop
     onClick: moveAllLeft,
     pt: ptm('moveAllToSourceButton'),
     unstyled: unstyled,
-    "aria-label": ariaLabel('moveAllToSource'),
+    "aria-label": ariaLabel$1('moveAllToSource'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -43988,6 +44624,7 @@ PickListTransferControls.displayName = 'PickListTransferControls';
 function ownKeys$v(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$v(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$v(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$v(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var PickList = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = PickListBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState([]),
@@ -44683,6 +45320,7 @@ var ProgressSpinnerBase = ComponentBase.extend({
 });
 
 var ProgressSpinner = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ProgressSpinnerBase.getProps(inProps, context);
   var elementRef = React__namespace.useRef(null);
@@ -44782,6 +45420,7 @@ var RadioButtonBase = ComponentBase.extend({
 function ownKeys$u(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$u(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$u(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$u(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var RadioButton = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = RadioButtonBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -44989,6 +45628,7 @@ var RatingBase = ComponentBase.extend({
 function ownKeys$t(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$t(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$t(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$t(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Rating = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = RatingBase.getProps(inProps, context);
   var elementRef = React__namespace.useRef(null);
@@ -45145,6 +45785,7 @@ var Rating = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.f
 Rating.displayName = 'Rating';
 
 var Row = function Row(inProps) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = RowBase.getProps(inProps, context);
   //@todo Pass Parent MetaData
@@ -45185,6 +45826,7 @@ var ScrollPanelBase = ComponentBase.extend({
 });
 
 var ScrollPanel = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ScrollPanelBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -45525,6 +46167,7 @@ var ScrollTop = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespac
     _React$useState2 = _slicedToArray(_React$useState, 2),
     visibleState = _React$useState2[0],
     setVisibleState = _React$useState2[1];
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ScrollTopBase.getProps(inProps, context);
   var _ScrollTopBase$setMet = ScrollTopBase.setMetaData({
@@ -45684,6 +46327,7 @@ var SelectButtonItem = /*#__PURE__*/React__namespace.memo(function (props) {
     _React$useState2 = _slicedToArray(_React$useState, 2),
     focusedState = _React$useState2[0],
     setFocusedState = _React$useState2[1];
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx;
   var getPTOptions = function getPTOptions(key) {
@@ -45743,6 +46387,7 @@ var SelectButtonItem = /*#__PURE__*/React__namespace.memo(function (props) {
 SelectButtonItem.displayName = 'SelectButtonItem';
 
 var SelectButton = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = SelectButtonBase.getProps(inProps, context);
   var elementRef = React__namespace.useRef(null);
@@ -45954,6 +46599,7 @@ var SidebarBase = ComponentBase.extend({
 function ownKeys$r(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$r(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$r(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$r(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Sidebar = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = SidebarBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -45985,7 +46631,7 @@ var Sidebar = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
     callback: function callback(event) {
       onClose(event);
     },
-    when: visibleState && props.closeOnEscape,
+    when: visibleState && props.closeOnEscape && sidebarDisplayOrder,
     priority: [ESC_KEY_HANDLING_PRIORITIES.SIDEBAR, sidebarDisplayOrder]
   });
   var _useEventListener = useEventListener({
@@ -46237,6 +46883,7 @@ var SkeletonBase = ComponentBase.extend({
 function ownKeys$q(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$q(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$q(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$q(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Skeleton = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = SkeletonBase.getProps(inProps, context);
   var _SkeletonBase$setMeta = SkeletonBase.setMetaData({
@@ -46373,6 +47020,7 @@ var SlideMenuSub = /*#__PURE__*/React__namespace.memo(function (props) {
     _React$useState4 = _slicedToArray(_React$useState3, 2),
     renderSubMenu = _React$useState4[0],
     setRenderSubMenu = _React$useState4[1];
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx,
     sx = props.sx;
@@ -46524,6 +47172,7 @@ SlideMenuSub.displayName = 'SlideMenuSub';
 function ownKeys$o(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$o(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$o(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$o(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SlideMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = SlideMenuBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -46562,7 +47211,7 @@ var SlideMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespac
     callback: function callback(event) {
       hide(event);
     },
-    when: visibleState && props.popup && props.closeOnEscape,
+    when: visibleState && props.popup && props.closeOnEscape && slideMenuDisplayOrder,
     priority: [ESC_KEY_HANDLING_PRIORITIES.SLIDE_MENU, slideMenuDisplayOrder]
   });
   var _useOverlayListener = useOverlayListener({
@@ -46805,6 +47454,7 @@ var SliderBase = ComponentBase.extend({
 function ownKeys$n(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$n(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$n(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$n(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Slider = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = SliderBase.getProps(inProps, context);
   var elementRef = React__namespace.useRef(null);
@@ -47201,6 +47851,7 @@ var SpeedDial = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespac
   var isItemClicked = React__namespace.useRef(false);
   var elementRef = React__namespace.useRef(null);
   var listRef = React__namespace.useRef(null);
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = SpeedDialBase.getProps(inProps, context);
   var visible = props.onVisibleChange ? props.visible : visibleState;
@@ -47223,7 +47874,7 @@ var SpeedDial = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespac
     callback: function callback() {
       hide();
     },
-    when: visible,
+    when: visible && speedDialDisplayOrder,
     priority: [ESC_KEY_HANDLING_PRIORITIES.SPEED_DIAL, speedDialDisplayOrder]
   });
   var _useEventListener = useEventListener({
@@ -47791,6 +48442,7 @@ function ownKeys$l(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymb
 function _objectSpread$l(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$l(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$l(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TieredMenuSub = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
   var elementRef = React__namespace.useRef(null);
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx,
     sx = props.sx;
@@ -47909,7 +48561,7 @@ var TieredMenuSub = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__name
         menuProps: props.menuProps,
         model: processedItem.items,
         menuId: props.menuId,
-        ariaLabelledby: getItemId(item),
+        ariaLabelledby: getItemId(processedItem),
         focusedItemId: props.focusedItemId,
         activeItemPath: props.activeItemPath,
         level: props.level + 1,
@@ -48056,6 +48708,7 @@ TieredMenuSub.displayName = 'TieredMenuSub';
 function ownKeys$k(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$k(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$k(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$k(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TieredMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = TieredMenuBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -48571,7 +49224,7 @@ var TieredMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespa
       });
     }
   };
-  var createProcessedItems = function createProcessedItems(items) {
+  var createProcessedItems = React__namespace.useCallback(function (items) {
     var level = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
     var parent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     var parentKey = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
@@ -48590,7 +49243,7 @@ var TieredMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespa
       processedItems.push(newItem);
     });
     return processedItems;
-  };
+  }, []);
   var createStyle = function createStyle() {
     if (!styleElementRef.current) {
       styleElementRef.current = DomHandler.createInlineStyle(context && context.nonce || PrimeReact.nonce, context && context.styleContainer);
@@ -48646,11 +49299,11 @@ var TieredMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespa
       !attributeSelectorState && setAttributeSelectorState(uniqueId);
     }
   });
-  useUpdateEffect(function () {
+  React__namespace.useEffect(function () {
     var itemsToProcess = props.model || [];
     var processed = createProcessedItems(itemsToProcess);
     setProcessedItems(processed);
-  }, props.model);
+  }, [props.model, createProcessedItems]);
   useUpdateEffect(function () {
     var processedItem = activeItemPath.find(function (p) {
       return p.key === focusedItemInfo.parentKey;
@@ -48846,6 +49499,7 @@ var SplitButtonBase = ComponentBase.extend({
 function ownKeys$j(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$j(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$j(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$j(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SplitButton = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = SplitButtonBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -48879,7 +49533,7 @@ var SplitButton = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namesp
     callback: function callback() {
       hide();
     },
-    when: overlayVisibleState,
+    when: overlayVisibleState && overlayDisplayOrder,
     priority: [ESC_KEY_HANDLING_PRIORITIES.SPLIT_BUTTON, overlayDisplayOrder]
   });
   var onPanelClick = function onPanelClick(event) {
@@ -49086,6 +49740,7 @@ function ownKeys$i(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymb
 function _objectSpread$i(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$i(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$i(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SplitterPanel = function SplitterPanel() {};
 var Splitter = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = SplitterBase.getProps(inProps, context);
   var elementRef = React__namespace.useRef(null);
@@ -49498,6 +50153,7 @@ var StepsBase = ComponentBase.extend({
 function ownKeys$h(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$h(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$h(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$h(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Steps = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = StepsBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -49979,6 +50635,7 @@ var TabMenuBase = ComponentBase.extend({
 function ownKeys$g(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$g(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$g(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$g(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TabMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = TabMenuBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -50378,6 +51035,7 @@ function ownKeys$e(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymb
 function _objectSpread$e(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$e(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TabPanel = function TabPanel() {};
 var TabView = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = TabViewBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.id),
@@ -50662,6 +51320,7 @@ var TabView = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
   };
   React__namespace.useEffect(function () {
     updateInkBar();
+    updateButtonState();
   });
   useMountEffect(function () {
     if (!idState) {
@@ -50871,7 +51530,7 @@ var TabView = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
       ref: prevBtnRef,
       type: 'button',
       className: cx('prevbutton'),
-      'aria-label': ariaLabel('previousPageLabel'),
+      'aria-label': ariaLabel$1('previousPageLabel'),
       onClick: function onClick(e) {
         return navBackward();
       }
@@ -50893,7 +51552,7 @@ var TabView = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
       ref: nextBtnRef,
       type: 'button',
       className: cx('nextbutton'),
-      'aria-label': ariaLabel('nextPageLabel'),
+      'aria-label': ariaLabel$1('nextPageLabel'),
       onClick: function onClick(e) {
         return navForward();
       }
@@ -50949,6 +51608,7 @@ var TagBase = ComponentBase.extend({
 function ownKeys$d(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$d(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$d(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$d(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Tag = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = TagBase.getProps(inProps, context);
   var _TagBase$setMetaData = TagBase.setMetaData({
@@ -51016,6 +51676,7 @@ var TerminalBase = ComponentBase.extend({
 });
 
 var Terminal = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = TerminalBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(''),
@@ -51215,6 +51876,7 @@ var TimelineBase = ComponentBase.extend({
 });
 
 var Timeline = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = TimelineBase.getProps(inProps, context);
   var _TimelineBase$setMeta = TimelineBase.setMetaData({
@@ -51348,6 +52010,7 @@ var ToastBase = ComponentBase.extend({
 function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var ToastMessage = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var messageInfo = props.messageInfo,
     parentMetaData = props.metaData,
     _props$ptCallbacks = props.ptCallbacks,
@@ -51528,6 +52191,7 @@ ToastMessage.displayName = 'ToastMessage';
 
 var messageIdx = 0;
 var Toast = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ToastBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState([]),
@@ -51730,6 +52394,7 @@ var ToggleButton = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__names
     _React$useState2 = _slicedToArray(_React$useState, 2),
     focusedState = _React$useState2[0],
     setFocusedState = _React$useState2[1];
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ToggleButtonBase.getProps(inProps, context);
   var elementRef = React__namespace.useRef(null);
@@ -51870,6 +52535,7 @@ var ToolbarBase = ComponentBase.extend({
 });
 
 var Toolbar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = ToolbarBase.getProps(inProps, context);
   var elementRef = React__namespace.useRef(null);
@@ -52037,6 +52703,7 @@ var UITreeNode = /*#__PURE__*/React__namespace.memo(function (props) {
   var contentRef = React__namespace.useRef(null);
   var elementRef = React__namespace.useRef(null);
   var nodeTouched = React__namespace.useRef(false);
+  var mergeProps = useMergeProps();
   var isLeaf = props.isNodeLeaf(props.node);
   var label = props.node.label;
   var expanded = (props.expandedKeys ? props.expandedKeys[props.node.key] !== undefined : false) || props.node.expanded;
@@ -52689,7 +53356,8 @@ var UITreeNode = /*#__PURE__*/React__namespace.memo(function (props) {
       onDragEnter: onDragEnter,
       onDragLeave: onDragLeave,
       onDragStart: onDragStart,
-      onDragEnd: onDragEnd
+      onDragEnd: onDragEnd,
+      'data-p-highlight': isCheckboxSelectionMode() ? checked : selected
     }, getPTOptions('content'));
     return /*#__PURE__*/React__namespace.createElement("div", contentProps, toggler, checkbox, icon, label);
   };
@@ -52785,6 +53453,7 @@ function _createForOfIteratorHelper$5(o, allowArrayLike) { var it = typeof Symbo
 function _unsupportedIterableToArray$5(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$5(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$5(o, minLen); }
 function _arrayLikeToArray$5(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 Tree = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = TreeBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(''),
@@ -52839,7 +53508,7 @@ var Tree = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.for
       if (navigateFocusToChild) {
         childFocusEvent.current = originalEvent;
       }
-      setExpandedKeysState(event.value);
+      setExpandedKeysState(value);
     }
   };
   useUpdateEffect(function () {
@@ -53410,6 +54079,7 @@ var TreeSelectBase = ComponentBase.extend({
 function ownKeys$8(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$8(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$8(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$8(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TreeSelectPanel = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var ptm = props.ptm,
     cx = props.cx;
@@ -53475,6 +54145,7 @@ function _createForOfIteratorHelper$4(o, allowArrayLike) { var it = typeof Symbo
 function _unsupportedIterableToArray$4(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$4(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$4(o, minLen); }
 function _arrayLikeToArray$4(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 TreeSelect = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = TreeSelectBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -53568,7 +54239,7 @@ var TreeSelect = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespa
     props.onBlur && props.onBlur();
   };
   var onClick = function onClick(event) {
-    if (!props.disabled && (!overlayRef.current || !overlayRef.current.contains(event.target)) && !DomHandler.hasClass(event.target, 'p-treeselect-close')) {
+    if (!props.disabled && (!overlayRef.current || !overlayRef.current.contains(event.target)) && !DomHandler.isAttributeEquals(event.target, 'data-pc-section', 'closebutton')) {
       DomHandler.focus(focusInputRef.current);
       overlayVisibleState ? hide() : show();
     }
@@ -53765,7 +54436,7 @@ var TreeSelect = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespa
     DomHandler.alignOverlay(overlayRef.current, triggerRef.current.parentElement, props.appendTo || context && context.appendTo || PrimeReact.appendTo);
   };
   var scrollInView = function scrollInView() {
-    var highlightItem = DomHandler.findSingle(overlayRef.current, '.p-treenode-content.p-highlight');
+    var highlightItem = DomHandler.findSingle(overlayRef.current, '[data-pc-section="content"][data-p-highlight="true"]');
     if (highlightItem && highlightItem.scrollIntoView) {
       highlightItem.scrollIntoView({
         block: 'nearest',
@@ -54218,7 +54889,7 @@ var TreeSelect = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespa
 }));
 TreeSelect.displayName = 'TreeSelect';
 
-var styles = "\n@layer primereact {\n    .p-treetable {\n        position: relative;\n    }\n    \n    .p-treetable > .p-treetable-wrapper {\n        overflow: auto;\n    }\n    \n    .p-treetable table {\n        border-collapse: collapse;\n        width: 100%;\n        table-layout: fixed;\n    }\n    \n    .p-treetable .p-sortable-column {\n        cursor: pointer;\n        user-select: none;\n    }\n    \n    .p-treetable-selectable .p-treetable-tbody > tr {\n        cursor: pointer;\n    }\n    \n    .p-treetable-toggler {\n        cursor: pointer;\n        user-select: none;\n        display: inline-flex;\n        align-items: center;\n        justify-content: center;\n        flex-shrink: 0;\n        vertical-align: middle;\n        overflow: hidden;\n        position: relative;\n    }\n    \n    .p-treetable-toggler + .p-checkbox {\n        vertical-align: middle;\n    }\n    \n    .p-treetable-toggler + .p-checkbox + span {\n        vertical-align: middle;\n    }\n    \n    /* Resizable */\n    .p-treetable-resizable > .p-treetable-wrapper {\n        overflow-x: auto;\n    }\n    \n    .p-treetable-resizable .p-treetable-thead > tr > th,\n    .p-treetable-resizable .p-treetable-tfoot > tr > td,\n    .p-treetable-resizable .p-treetable-tbody > tr > td {\n        overflow: hidden;\n    }\n    \n    .p-treetable-resizable .p-resizable-column {\n        background-clip: padding-box;\n        position: relative;\n    }\n    \n    .p-treetable-resizable-fit .p-resizable-column:last-child .p-column-resizer {\n        display: none;\n    }\n    \n    .p-treetable .p-column-resizer {\n        display: block;\n        position: absolute;\n        top: 0;\n        right: 0;\n        margin: 0;\n        width: 0.5rem;\n        height: 100%;\n        padding: 0px;\n        cursor: col-resize;\n        border: 1px solid transparent;\n    }\n    \n    .p-treetable .p-column-resizer-helper {\n        width: 1px;\n        position: absolute;\n        z-index: 10;\n        display: none;\n    }\n    \n    /* Scrollable */\n    .p-treetable-scrollable-wrapper {\n        position: relative;\n    }\n    .p-treetable-scrollable-header,\n    .p-treetable-scrollable-footer {\n        overflow: hidden;\n        border: 0 none;\n    }\n    \n    .p-treetable-scrollable-body {\n        overflow: auto;\n        position: relative;\n    }\n    \n    .p-treetable-virtual-table {\n        position: absolute;\n    }\n    \n    /* Frozen Columns */\n    .p-treetable-frozen-view .p-treetable-scrollable-body {\n        overflow: hidden;\n    }\n    \n    .p-treetable-unfrozen-view {\n        position: absolute;\n        top: 0px;\n        left: 0px;\n    }\n    \n    /* Reorder */\n    .p-treetable-reorder-indicator-up,\n    .p-treetable-reorder-indicator-down {\n        position: absolute;\n        display: none;\n    }\n    \n    /* Loader */\n    .p-treetable .p-treetable-loading-overlay {\n        position: absolute;\n        display: flex;\n        align-items: center;\n        justify-content: center;\n        z-index: 2;\n    }\n}\n";
+var styles = "\n@layer primereact {\n    .p-treetable {\n        position: relative;\n    }\n    \n    .p-treetable > .p-treetable-wrapper {\n        overflow: auto;\n    }\n    \n    .p-treetable table {\n        border-collapse: collapse;\n        width: 100%;\n        table-layout: fixed;\n    }\n    \n    .p-treetable .p-sortable-column {\n        cursor: pointer;\n        user-select: none;\n    }\n    \n    .p-treetable-selectable .p-treetable-tbody > tr {\n        cursor: pointer;\n    }\n    \n    .p-treetable-toggler {\n        cursor: pointer;\n        user-select: none;\n        display: inline-flex;\n        align-items: center;\n        justify-content: center;\n        flex-shrink: 0;\n        vertical-align: middle;\n        overflow: hidden;\n        position: relative;\n    }\n    \n    .p-treetable-toggler + .p-checkbox {\n        vertical-align: middle;\n    }\n    \n    .p-treetable-toggler + .p-checkbox + span {\n        vertical-align: middle;\n    }\n    \n    /* Resizable */\n    .p-treetable-resizable > .p-treetable-wrapper {\n        overflow-x: auto;\n    }\n    \n    .p-treetable-resizable .p-treetable-thead > tr > th,\n    .p-treetable-resizable .p-treetable-tfoot > tr > td,\n    .p-treetable-resizable .p-treetable-tbody > tr > td {\n        overflow: hidden;\n    }\n    \n    .p-treetable-resizable .p-resizable-column {\n        background-clip: padding-box;\n        position: relative;\n    }\n    \n    .p-treetable-resizable-fit .p-resizable-column:last-child .p-column-resizer {\n        display: none;\n    }\n    \n    .p-treetable .p-column-resizer {\n        display: block;\n        position: absolute;\n        top: 0;\n        right: 0;\n        margin: 0;\n        width: 0.5rem;\n        height: 100%;\n        padding: 0px;\n        cursor: col-resize;\n        border: 1px solid transparent;\n    }\n    \n    .p-treetable .p-column-resizer-helper {\n        width: 1px;\n        position: absolute;\n        z-index: 10;\n        display: none;\n    }\n    \n    /* Scrollable */\n    .p-treetable-scrollable-wrapper {\n        position: relative;\n    }\n    .p-treetable-scrollable-header,\n    .p-treetable-scrollable-footer {\n        overflow: hidden;\n        border: 0 none;\n    }\n    \n    .p-treetable-scrollable-body {\n        overflow: auto;\n        position: relative;\n    }\n    \n    .p-treetable-virtual-table {\n        position: absolute;\n    }\n    \n    /* Frozen Columns */\n    .p-treetable-frozen-view .p-treetable-scrollable-body {\n        overflow: hidden;\n    }\n    \n    .p-treetable-unfrozen-view {\n        position: absolute;\n        top: 0px;\n        left: 0px;\n    }\n    \n    /* Reorder */\n    .p-treetable-reorder-indicator-up,\n    .p-treetable-reorder-indicator-down {\n        position: absolute;\n        display: none;\n    }\n    \n    /* Loader */\n    .p-treetable .p-treetable-loading-overlay {\n        position: absolute;\n        display: flex;\n        align-items: center;\n        justify-content: center;\n        z-index: 2;\n    }\n\n    /* Alignment */\n    .p-treetable .p-treetable-thead > tr > th.p-align-left > .p-column-header-content,\n    .p-treetable .p-treetable-tbody > tr > td.p-align-left,\n    .p-treetable .p-treetable-tfoot > tr > td.p-align-left {\n        text-align: left;\n        justify-content: flex-start;\n    }\n    .p-treetable .p-treetable-thead > tr > th.p-align-right > .p-column-header-content,\n    .p-treetable .p-treetable-tbody > tr > td.p-align-right,\n    .p-treetable .p-treetable-tfoot > tr > td.p-align-right {\n        text-align: right;\n        justify-content: flex-end;\n    }\n    .p-treetable .p-treetable-thead > tr > th.p-align-center > .p-column-header-content,\n    .p-treetable .p-treetable-tbody > tr > td.p-align-center,\n    .p-treetable .p-treetable-tfoot > tr > td.p-align-center {\n        text-align: center;\n        justify-content: center;\n    }\n}\n";
 var classes$1 = {
   root: function root(_ref) {
     var props = _ref.props,
@@ -54238,8 +54909,8 @@ var classes$1 = {
   header: 'p-treetable-header',
   footer: 'p-treetable-footer',
   resizeHelper: 'p-column-resizer-helper',
-  reorderIndicatorUp: 'p-datatable-reorder-indicator-up',
-  reorderIndicatorDown: 'p-datatable-reorder-indicator-down',
+  reorderIndicatorUp: 'p-treetable-reorder-indicator-up',
+  reorderIndicatorDown: 'p-treetable-reorder-indicator-down',
   wrapper: 'p-treetable-wrapper',
   table: function table(_ref2) {
     var props = _ref2.props;
@@ -54265,22 +54936,24 @@ var classes$1 = {
   },
   sortBadge: 'p-sortable-column-badge',
   headerTitle: 'p-column-title',
+  headerContent: 'p-column-header-content',
   headerCell: function headerCell(_ref4) {
     var props = _ref4.headerProps,
       frozen = _ref4.frozen,
       column = _ref4.column,
       options = _ref4.options,
       getColumnProp = _ref4.getColumnProp,
-      sorted = _ref4.sorted;
+      sorted = _ref4.sorted,
+      align = _ref4.align;
     return options.filterOnly ? classNames('p-filter-column', {
       'p-frozen-column': frozen
-    }) : classNames({
+    }) : classNames(_defineProperty({
       'p-sortable-column': getColumnProp(column, 'sortable'),
       'p-highlight': sorted,
       'p-frozen-column': frozen,
       'p-resizable-column': props.resizableColumns && getColumnProp(column, 'resizeable'),
       'p-reorderable-column': props.reorderableColumns && getColumnProp(column, 'reorderable') && !frozen
-    });
+    }, "p-align-".concat(align), !!align));
   },
   columnResizer: 'p-column-resizer p-clickable',
   sortIcon: 'p-sortable-column-icon',
@@ -54382,9 +55055,9 @@ var TreeTableBase = ComponentBase.extend({
     propagateSelectionDown: true,
     propagateSelectionUp: true,
     removableSort: false,
-    reorderableColumns: false,
     reorderIndicatorDownIcon: null,
     reorderIndicatorUpIcon: null,
+    reorderableColumns: false,
     resizableColumns: false,
     rowClassName: null,
     rowHover: false,
@@ -54397,8 +55070,8 @@ var TreeTableBase = ComponentBase.extend({
     selectionMode: null,
     showGridlines: false,
     sortField: null,
-    sortMode: 'single',
     sortIcon: null,
+    sortMode: 'single',
     sortOrder: null,
     stripedRows: false,
     style: null,
@@ -54427,6 +55100,7 @@ var TreeTableBodyCell = function TreeTableBodyCell(props) {
   var selfClick = React__namespace.useRef(false);
   var overlayEventListener = React__namespace.useRef(null);
   var tabIndexTimeout = React__namespace.useRef(null);
+  var mergeProps = useMergeProps();
   var getColumnProp = function getColumnProp(name) {
     return ColumnBase.getCProp(props.column, name);
   };
@@ -54630,6 +55304,7 @@ var TreeTableBodyCell = function TreeTableBodyCell(props) {
   var align = getColumnProp('align');
   /* eslint-enable */
   var bodyCellProps = mergeProps({
+    role: 'cell',
     className: classNames(bodyClassName || props.className, cx('bodyCell', {
       bodyProps: props,
       editingState: editingState,
@@ -54659,6 +55334,7 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
   var checkboxRef = React__namespace.useRef(null);
   var checkboxBoxRef = React__namespace.useRef(null);
   var nodeTouched = React__namespace.useRef(false);
+  var mergeProps = useMergeProps();
   var expanded = props.expandedKeys ? props.expandedKeys[props.node.key] !== undefined : false;
   var getColumnProp = function getColumnProp(column, name) {
     return ColumnBase.getCProp(column, name);
@@ -54724,11 +55400,13 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
     event.stopPropagation();
   };
   var expand = function expand(event) {
+    var navigateFocusToChild = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var expandedKeys = props.expandedKeys ? _objectSpread$5({}, props.expandedKeys) : {};
     expandedKeys[props.node.key] = true;
     props.onToggle({
       originalEvent: event,
-      value: expandedKeys
+      value: expandedKeys,
+      navigateFocusToChild: navigateFocusToChild
     });
     invokeToggleEvents(event, true);
   };
@@ -54909,49 +55587,147 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
       });
     }
   };
-  var _onKeyDown = function onKeyDown(event) {
-    if (event.target === elementRef.current) {
-      var rowElement = event.currentTarget;
-      switch (event.which) {
-        //down arrow
-        case 40:
-          var nextRow = rowElement.nextElementSibling;
-          if (nextRow) {
-            nextRow.focus();
-          }
-          event.preventDefault();
-          break;
+  var _onKeyDown = function onKeyDown(event, item) {
+    switch (event.code) {
+      case 'ArrowDown':
+        onArrowDownKey(event);
+        break;
+      case 'ArrowUp':
+        onArrowUpKey(event);
+        break;
+      case 'ArrowLeft':
+        onArrowLeftKey(event);
+        break;
+      case 'ArrowRight':
+        onArrowRightKey(event);
+        break;
+      case 'Home':
+        onHomeKey(event);
+        break;
+      case 'End':
+        onEndKey(event);
+        break;
+      case 'Enter':
+      case 'NumpadEnter':
+      case 'Space':
+        if (!DomHandler.isClickable(event.target)) {
+          onEnterKey(event);
+        }
+        break;
+      case 'Tab':
+        onTabKey();
+        break;
+    }
+  };
+  var onArrowDownKey = function onArrowDownKey(event) {
+    var nextElementSibling = event.currentTarget.nextElementSibling;
+    nextElementSibling && focusRowChange(event.currentTarget, nextElementSibling);
+    event.preventDefault();
+  };
+  var onArrowUpKey = function onArrowUpKey(event) {
+    var previousElementSibling = event.currentTarget.previousElementSibling;
+    previousElementSibling && focusRowChange(event.currentTarget, previousElementSibling);
+    event.preventDefault();
+  };
+  var onArrowRightKey = function onArrowRightKey(event) {
+    var ishiddenIcon = DomHandler.findSingle(event.currentTarget, 'button').style.visibility === 'hidden';
+    DomHandler.findSingle(elementRef.current, '[data-pc-section="rowtoggler"]');
+    if (ishiddenIcon) return;
 
-        //up arrow
-        case 38:
-          var previousRow = rowElement.previousElementSibling;
-          if (previousRow) {
-            previousRow.focus();
-          }
-          event.preventDefault();
-          break;
+    // !expanded && togglerElement.click();
+    !expanded && expand(event, true);
 
-        //right arrow
-        case 39:
-          if (!expanded) {
-            expand(event);
-          }
-          event.preventDefault();
-          break;
+    // this.$nextTick(() => {
+    //     this.onArrowDownKey(event);
+    // });
 
-        //left arrow
-        case 37:
-          if (expanded) {
-            collapse(event);
-          }
-          event.preventDefault();
-          break;
+    event.preventDefault();
+  };
+  var onArrowLeftKey = function onArrowLeftKey(event) {
+    if (props.level === 0 && !expanded) {
+      return;
+    }
+    var currentTarget = event.currentTarget;
+    var ishiddenIcon = DomHandler.findSingle(currentTarget, 'button').style.visibility === 'hidden';
+    DomHandler.findSingle(currentTarget, '[data-pc-section="rowtoggler"]');
+    if (expanded && !ishiddenIcon) {
+      // togglerElement.click();
+      collapse(event);
+      return;
+    }
+    var target = findBeforeClickableNode(currentTarget);
+    target && focusRowChange(currentTarget, target);
+  };
+  var onHomeKey = function onHomeKey(event) {
+    var findFirstElement = DomHandler.findSingle(event.currentTarget.parentElement, "tr[aria-level=\"".concat(props.level + 1, "\"]"));
+    findFirstElement && DomHandler.focus(findFirstElement);
+    event.preventDefault();
+  };
+  var onEndKey = function onEndKey(event) {
+    var nodes = DomHandler.find(event.currentTarget.parentElement, "tr[aria-level=\"".concat(props.level + 1, "\"]"));
+    var findFirstElement = nodes[nodes.length - 1];
+    DomHandler.focus(findFirstElement);
+    event.preventDefault();
+  };
+  var onEnterKey = function onEnterKey(event) {
+    event.preventDefault();
+    setTabIndexForSelectionMode(event, nodeTouched.current);
+    if (props.selectionMode === 'checkbox') {
+      // this.toggleCheckbox();
+      onCheckboxChange(event);
+      return;
+    }
 
-        //enter
-        case 13:
-          _onClick(event);
-          event.preventDefault();
-          break;
+    // this.$emit('node-click', {
+    //     originalEvent: event,
+    //     nodeTouched: nodeTouched.current,
+    //     node: this.node
+    // });
+
+    props.onRowClick(event, props.node);
+    nodeTouched.current = false;
+  };
+  var onTabKey = function onTabKey() {
+    var rows = _toConsumableArray(DomHandler.find(elementRef.current.parentElement, 'tr'));
+    var hasSelectedRow = rows.some(function (row) {
+      return DomHandler.getAttribute(row, 'data-p-highlight') || row.getAttribute('aria-checked') === 'true';
+    });
+    rows.forEach(function (row) {
+      row.tabIndex = -1;
+    });
+    if (hasSelectedRow) {
+      var selectedNodes = rows.filter(function (node) {
+        return DomHandler.getAttribute(node, 'data-p-highlight') || node.getAttribute('aria-checked') === 'true';
+      });
+      selectedNodes[0].tabIndex = 0;
+      return;
+    }
+    rows[0].tabIndex = 0;
+  };
+  var focusRowChange = function focusRowChange(firstFocusableRow, currentFocusedRow) {
+    firstFocusableRow.tabIndex = '-1';
+    currentFocusedRow.tabIndex = '0';
+    DomHandler.focus(currentFocusedRow);
+  };
+  var findBeforeClickableNode = function findBeforeClickableNode(node) {
+    var prevNode = node.previousElementSibling;
+    if (prevNode) {
+      var prevNodeButton = prevNode.querySelector('button');
+      if (prevNodeButton && prevNodeButton.style.visibility !== 'hidden') {
+        return prevNode;
+      }
+      return findBeforeClickableNode(prevNode);
+    }
+    return null;
+  };
+  var setTabIndexForSelectionMode = function setTabIndexForSelectionMode(event, nodeTouched) {
+    if (props.selectionMode !== null) {
+      var elements = _toConsumableArray(DomHandler.find(elementRef.current.parentElement, 'tr'));
+      event.currentTarget.tabIndex = nodeTouched === false ? -1 : 0;
+      if (elements.every(function (element) {
+        return element.tabIndex === -1;
+      })) {
+        elements[0].tabIndex = 0;
       }
     }
   };
@@ -54968,7 +55744,7 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
     return props.selectionKeys ? props.selectionKeys[props.node.key] && props.selectionKeys[props.node.key].partialChecked : false;
   };
   var createToggler = function createToggler(column) {
-    var label = expanded ? ariaLabel('collapseLabel') : ariaLabel('expandLabel');
+    var label = expanded ? ariaLabel$1('collapseLabel') : ariaLabel$1('expandLabel');
     var rowTogglerIconProps = mergeProps({
       className: cx('rowTogglerIcon'),
       'aria-hidden': true
@@ -55136,6 +55912,12 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
   var rowProps = mergeProps({
     tabIndex: 0,
     className: className,
+    'aria-expanded': expanded,
+    'aria-level': props.level + 1,
+    'aria-posinset': props.ariaPosInSet,
+    'aria-setsize': props.ariaSetSize,
+    'aria-checked': isChecked(),
+    'aria-selected': isSelected(),
     style: props.node.style,
     onClick: function onClick(e) {
       return _onClick(e);
@@ -55169,6 +55951,7 @@ function _arrayLikeToArray$2(arr, len) { if (len == null || len > arr.length) le
 function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TreeTableBody = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = useMergeProps();
   var isSingleSelectionMode = props.selectionMode === 'single';
   var isMultipleSelectionMode = props.selectionMode === 'multiple';
   var _props$ptCallbacks = props.ptCallbacks,
@@ -55326,6 +56109,8 @@ var TreeTableBody = /*#__PURE__*/React__namespace.memo(function (props) {
       key: "".concat(node.key || JSON.stringify(node.data), "_").concat(index),
       level: 0,
       rowIndex: index,
+      ariaSetSize: props.value.length,
+      ariaPosInSet: index + 1,
       selectOnEdit: props.selectOnEdit,
       node: node,
       originalOptions: props.originalOptions,
@@ -55389,6 +56174,7 @@ var TreeTableBody = /*#__PURE__*/React__namespace.memo(function (props) {
   };
   var content = props.value && props.value.length ? createRows() : createEmptyMessage();
   var tbodyProps = mergeProps({
+    role: 'rowgroup',
     className: cx('tbody')
   }, getPTOptions('tbody'));
   return /*#__PURE__*/React__namespace.createElement("tbody", tbodyProps, content);
@@ -55396,6 +56182,7 @@ var TreeTableBody = /*#__PURE__*/React__namespace.memo(function (props) {
 TreeTableBody.displayName = 'TreeTableBody';
 
 var TreeTableFooter = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     ptmo = _props$ptCallbacks.ptmo,
@@ -55434,7 +56221,8 @@ var TreeTableFooter = /*#__PURE__*/React__namespace.memo(function (props) {
     var rowColumns = React__namespace.Children.toArray(RowBase.getCProp(row, 'children'));
     var rowFooterCells = rowColumns.map(createFooterCell);
     var footerRowProps = mergeProps(ptm('footerRow', {
-      hostName: props.hostName
+      hostName: props.hostName,
+      role: 'row'
     }));
     return /*#__PURE__*/React__namespace.createElement("tr", _extends({}, footerRowProps, {
       key: index
@@ -55463,6 +56251,7 @@ var TreeTableFooter = /*#__PURE__*/React__namespace.memo(function (props) {
   var content = props.columnGroup ? createColumnGroup() : createColumns(props.columns);
   if (hasFooter()) {
     var tfootProps = mergeProps({
+      role: 'rowgroup',
       className: cx('tfoot')
     }, ptm('tfoot', {
       hostName: props.hostName
@@ -55480,6 +56269,7 @@ function _arrayLikeToArray$1(arr, len) { if (len == null || len > arr.length) le
 function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     ptmo = _props$ptCallbacks.ptmo,
@@ -55522,7 +56312,7 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
     }
   };
   var onHeaderKeyDown = function onHeaderKeyDown(event, column) {
-    if (event.key === 'Enter') {
+    if (event.key === 'Enter' && event.key === 'Space') {
       onHeaderClick(event, column);
       event.preventDefault();
     }
@@ -55696,6 +56486,7 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
     if (options.filterOnly) {
       var frozen = getColumnProp(column, 'frozen');
       var headerCellProps = mergeProps({
+        role: 'columnheader',
         key: getColumnProp(column, 'columnKey') || getColumnProp(column, 'field') || options.index,
         className: classNames(cx('headerCell', {
           options: options,
@@ -55727,11 +56518,14 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
       var sortIconElement = createSortIcon(column, sorted, sortOrder);
       var ariaSortData = getAriaSort(column, sorted, sortOrder);
       var sortBadge = createSortBadge(column, sortMetaDataIndex);
+      var ariaSort = sorted ? sortOrder ? sortOrder < 0 ? 'descending' : 'ascending' : 'none' : null;
       var headerTooltip = getColumnProp(column, 'headerTooltip');
       var hasTooltip = ObjectUtils.isNotEmpty(headerTooltip);
       var title = createTitle(column, options);
       var resizer = createResizer(column);
-      var _headerCellProps = mergeProps({
+      var sortable = getColumnProp(column, 'sortable');
+      var _headerCellProps = mergeProps(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
+        role: 'columnheader',
         className: classNames(getColumnProp(column, 'headerClassName') || getColumnProp(column, 'className'), cx('headerCell', {
           headerProps: props,
           frozen: _frozen,
@@ -55742,7 +56536,8 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
           align: align
         })),
         style: getColumnProp(column, 'headerStyle') || getColumnProp(column, 'style'),
-        tabIndex: getColumnProp(column, 'sortable') ? props.tabIndex : null,
+        tabIndex: sortable ? props.tabIndex : null,
+        'aria-sort': ariaSort,
         onClick: function onClick(e) {
           return onHeaderClick(e, column);
         },
@@ -55753,25 +56548,16 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
           return onHeaderKeyDown(e, column);
         },
         rowSpan: getColumnProp(column, 'rowSpan'),
-        colSpan: getColumnProp(column, 'colSpan'),
-        'aria-sort': ariaSortData,
-        onDragStart: function onDragStart(e) {
-          return _onDragStart(e, column);
-        },
-        onDragOver: function onDragOver(e) {
-          return _onDragOver(e, column);
-        },
-        onDragLeave: function onDragLeave(e) {
-          return _onDragLeave(e, column);
-        },
-        onDrop: function onDrop(e) {
-          return _onDrop(e, column);
-        },
-        'data-p-sortable-column': getColumnProp(column, 'sortable'),
-        'data-p-resizable-column': props.resizableColumns,
-        'data-p-highlight': sorted,
-        'data-p-frozen-column': getColumnProp(column, 'frozen')
-      }, getColumnPTOptions(column, 'root'), getColumnPTOptions(column, 'headerCell', {
+        colSpan: getColumnProp(column, 'colSpan')
+      }, "aria-sort", ariaSortData), "onDragStart", function onDragStart(e) {
+        return _onDragStart(e, column);
+      }), "onDragOver", function onDragOver(e) {
+        return _onDragOver(e, column);
+      }), "onDragLeave", function onDragLeave(e) {
+        return _onDragLeave(e, column);
+      }), "onDrop", function onDrop(e) {
+        return _onDrop(e, column);
+      }), 'data-p-sortable-column', sortable), 'data-p-resizable-column', props.resizableColumns), 'data-p-highlight', sorted), 'data-p-frozen-column', getColumnProp(column, 'frozen')), getColumnPTOptions(column, 'root'), getColumnPTOptions(column, 'headerCell', {
         context: {
           sorted: sorted,
           frozen: _frozen,
@@ -55806,7 +56592,9 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
     var headerRowProps = mergeProps(ptm('headerRow', {
       hostName: props.hostName
     }));
-    return /*#__PURE__*/React__namespace.createElement("tr", _extends({}, headerRowProps, {
+    return /*#__PURE__*/React__namespace.createElement("tr", _extends({
+      role: "row"
+    }, headerRowProps, {
       key: index
     }), rowHeaderCells);
   };
@@ -55817,7 +56605,8 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
   var createColumns = function createColumns(columns) {
     if (columns) {
       var headerRowProps = mergeProps(ptm('headerRow', {
-        hostName: props.hostName
+        hostName: props.hostName,
+        role: 'row'
       }));
       if (hasColumnFilter(columns)) {
         return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement("tr", headerRowProps, columns.map(function (col, i) {
@@ -55834,7 +56623,9 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
           });
         })));
       } else {
-        return /*#__PURE__*/React__namespace.createElement("tr", headerRowProps, columns.map(function (col, i) {
+        return /*#__PURE__*/React__namespace.createElement("tr", _extends({
+          role: "row"
+        }, headerRowProps), columns.map(function (col, i) {
           return createHeaderCell(col, {
             index: i,
             filterOnly: false,
@@ -55848,6 +56639,7 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
   };
   var content = props.columnGroup ? createColumnGroup() : createColumns(props.columns);
   var theadProps = mergeProps({
+    role: 'rowgroup',
     className: cx('thead')
   }, ptm('thead', {
     hostName: props.hostName
@@ -55866,6 +56658,7 @@ var TreeTableScrollableView = /*#__PURE__*/React__namespace.memo(function (props
   var scrollTableRef = React__namespace.useRef(null);
   var scrollFooterRef = React__namespace.useRef(null);
   var scrollFooterBoxRef = React__namespace.useRef(null);
+  var mergeProps = useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     cx = _props$ptCallbacks.cx,
@@ -56025,6 +56818,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 TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = TreeTableBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.expandedKeys),
@@ -56096,6 +56890,7 @@ var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
   var columnSortable = React__namespace.useRef(null);
   var columnSortFunction = React__namespace.useRef(null);
   var columnField = React__namespace.useRef(null);
+  var childFocusEvent = React__namespace.useRef(null);
   var _useEventListener = useEventListener({
       type: 'mousemove',
       listener: function listener(event) {
@@ -56120,10 +56915,19 @@ var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
     bindDocumentMouseUpListener = _useEventListener4[0],
     unbindDocumentMouseUpListener = _useEventListener4[1];
   var onToggle = function onToggle(event) {
+    var originalEvent = event.originalEvent,
+      value = event.value,
+      navigateFocusToChild = event.navigateFocusToChild;
     if (props.onToggle) {
-      props.onToggle(event);
+      props.onToggle({
+        originalEvent: originalEvent,
+        value: value
+      });
     } else {
-      setExpandedKeysState(event.value);
+      if (navigateFocusToChild) {
+        childFocusEvent.current = originalEvent;
+      }
+      setExpandedKeysState(value);
     }
   };
   var onPageChange = function onPageChange(event) {
@@ -56826,6 +57630,17 @@ var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
     }
     return data;
   };
+  useUpdateEffect(function () {
+    if (childFocusEvent.current) {
+      var nodeElement = childFocusEvent.current.target;
+      var nextElementSibling = nodeElement.nextElementSibling;
+      if (nextElementSibling) {
+        nodeElement.tabIndex = '-1';
+        nextElementSibling.tabIndex = '0';
+        DomHandler.focus(nextElementSibling);
+      }
+    }
+  }, [expandedKeysState]);
   React__namespace.useImperativeHandle(ref, function () {
     return {
       props: props,
@@ -56975,6 +57790,7 @@ var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
       className: ptCallbacks.cx('wrapper')
     }, ptCallbacks.ptm('wrapper'));
     var tableProps = mergeProps({
+      role: 'table',
       style: props.tableStyle,
       className: classNames(props.tableClassName, ptCallbacks.cx('table'))
     }, ptCallbacks.ptm('table'));
@@ -57058,6 +57874,7 @@ var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
     ref: reorderIndicatorDownRef
   }, reorderIndicatorDownProps), reorderIndicatorDownIcon);
   var rootProps = mergeProps({
+    role: 'table',
     id: props.id,
     className: classNames(props.className, ptCallbacks.cx('root', {
       isRowSelectionMode: isRowSelectionMode
@@ -57115,6 +57932,7 @@ var TriStateCheckboxBase = ComponentBase.extend({
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TriStateCheckbox = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React__namespace.useContext(PrimeReactContext);
   var props = TriStateCheckboxBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(false),
@@ -57206,7 +58024,7 @@ var TriStateCheckbox = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__n
   var checkIcon = IconUtils.getJSXIcon(icon, _objectSpread({}, checkIconProps), {
     props: props
   });
-  var ariaValueLabel = props.value ? ariaLabel('trueLabel') : props.value === false ? ariaLabel('falseLabel') : ariaLabel('nullLabel');
+  var ariaValueLabel = props.value ? ariaLabel$1('trueLabel') : props.value === false ? ariaLabel$1('falseLabel') : ariaLabel$1('nullLabel');
   var ariaChecked = props.value ? 'true' : 'false';
   var checkboxProps = mergeProps(_objectSpread({
     className: cx('checkbox', {
@@ -57405,8 +58223,9 @@ exports.VirtualScroller = VirtualScroller;
 exports.WindowMaximizeIcon = WindowMaximizeIcon;
 exports.WindowMinimizeIcon = WindowMinimizeIcon;
 exports.ZIndexUtils = ZIndexUtils;
+exports._mergeProps = _mergeProps;
 exports.addLocale = addLocale;
-exports.ariaLabel = ariaLabel;
+exports.ariaLabel = ariaLabel$1;
 exports.classNames = classNames;
 exports.confirmDialog = confirmDialog;
 exports.confirmPopup = confirmPopup;
@@ -57429,6 +58248,7 @@ exports.useIntersectionObserver = useIntersectionObserver;
 exports.useInterval = useInterval;
 exports.useLocalStorage = useLocalStorage;
 exports.useMatchMedia = useMatchMedia;
+exports.useMergeProps = useMergeProps;
 exports.useMountEffect = useMountEffect;
 exports.useMouse = useMouse;
 exports.useMove = useMove;