primereact 10.3.1 → 10.3.2

package/primereact.all.esm.js

@@ -1,6 +1,6 @@
 'use client';
 import * as React from 'react';
-import React__default, { useState, useEffect, useRef, useContext } from 'react';
+import React__default, { useState, useEffect, useContext, useRef } from 'react';
 import { CSSTransition as CSSTransition$1, TransitionGroup } from 'react-transition-group';
 import ReactDOM from 'react-dom';
 
@@ -1910,8 +1910,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);
@@ -1929,7 +1929,7 @@ var IconUtils = /*#__PURE__*/function () {
           className: className
         }));
         if (iconType !== 'string') {
-          var defaultContentOptions = _objectSpread$1T({
+          var defaultContentOptions = _objectSpread$1U({
             iconProps: iconProps,
             element: content
           }, options);
@@ -1942,8 +1942,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,
@@ -1956,7 +1956,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;
@@ -2363,13 +2363,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);
     };
@@ -2377,9 +2376,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)) {
@@ -2401,6 +2405,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_';
@@ -2711,8 +2750,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',
@@ -2827,14 +2866,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;
@@ -2857,7 +2896,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];
@@ -3485,7 +3524,7 @@ var useDisplayOrder = function useDisplayOrder(group) {
     }),
     _React$useState2 = _slicedToArray(_React$useState, 1),
     uid = _React$useState2[0];
-  var _React$useState3 = React.useState(),
+  var _React$useState3 = React.useState(0),
     _React$useState4 = _slicedToArray(_React$useState3, 2),
     displayOrder = _React$useState4[0],
     setDisplayOrder = _React$useState4[1];
@@ -3494,7 +3533,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 () {
@@ -3576,7 +3615,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);
@@ -3632,7 +3671,7 @@ var useGlobalOnEscapeKey = function useGlobalOnEscapeKey(_ref3) {
   useEffect(function () {
     if (!when) return;
     return globalEscKeyHandlingLogic.addListener(callback, priority);
-  }, [when, callback, priority]);
+  }, [callback, when, priority]);
 };
 
 var useIntersectionObserver = function useIntersectionObserver(ref) {
@@ -3714,6 +3753,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 = 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 */
 
 /**
@@ -4391,6 +4450,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] : {};
@@ -4438,7 +4498,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] : {};
@@ -4471,6 +4533,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
@@ -4479,7 +4542,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;
       };
@@ -4536,11 +4601,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);
 };
@@ -4838,6 +4906,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.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = AccordionBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -4867,6 +4936,9 @@ var Accordion = /*#__PURE__*/React.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 = {
@@ -4881,15 +4953,12 @@ var Accordion = /*#__PURE__*/React.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);
   };
@@ -6386,6 +6455,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = BadgeBase.getProps(inProps, context);
   var _BadgeBase$setMetaDat = BadgeBase.setMetaData(_objectSpread$1K({
@@ -6445,6 +6515,7 @@ var Ripple = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (in
     setMounted = _React$useState2[1];
   var inkRef = React.useRef(null);
   var targetRef = React.useRef(null);
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = RippleBase.getProps(inProps, context);
   var isRippleActive = context && context.ripple || PrimeReact.ripple;
@@ -6661,6 +6732,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = TooltipBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -7227,6 +7299,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ButtonBase.getProps(inProps, context);
   var disabled = props.disabled || props.loading;
@@ -7433,6 +7506,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = InputTextBase.getProps(inProps, context);
   var _InputTextBase$setMet = InputTextBase.setMetaData(_objectSpread$1G(_objectSpread$1G({
@@ -8494,6 +8568,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.memo( /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx;
   var context = React.useContext(PrimeReactContext);
@@ -8693,6 +8768,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = AutoCompleteBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -9386,6 +9462,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.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = AvatarBase.getProps(inProps, context);
   var elementRef = React.useRef(null);
@@ -9489,6 +9566,7 @@ var AvatarGroupBase = ComponentBase.extend({
 });
 
 var AvatarGroup = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = AvatarGroupBase.getProps(inProps, context);
   var _AvatarGroupBase$setM = AvatarGroupBase.setMetaData({
@@ -9557,6 +9635,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.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = BlockUIBase.getProps(inProps, context);
   var _React$useState = React.useState(props.blocked),
@@ -9712,6 +9791,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = BreadCrumbBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -10102,6 +10182,7 @@ var CalendarBase = ComponentBase.extend({
 
 var CalendarPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var cx = props.cx;
+  var mergeProps = useMergeProps();
   var createElement = function createElement() {
     var panelProps = mergeProps({
       className: cx('panel', {
@@ -10149,6 +10230,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = CalendarBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -11362,6 +11444,7 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
         month: month + 1,
         year: currentYear
       });
+      updateViewDate(event, currentDate);
     }
   };
   var onYearSelect = function onYearSelect(event, year) {
@@ -12152,8 +12235,13 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     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,
@@ -13317,6 +13405,7 @@ var CardBase = ComponentBase.extend({
 });
 
 var Card = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = CardBase.getProps(inProps, context);
   var elementRef = React.useRef(ref);
@@ -14226,6 +14315,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.memo(function (props) {
+  var mergeProps = useMergeProps();
   var _React$useState = React.useState(null),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     activeOptionState = _React$useState2[0],
@@ -14458,6 +14548,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = CascadeSelectBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -14511,7 +14602,7 @@ var CascadeSelect = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(funct
     callback: function callback() {
       hide();
     },
-    when: overlayVisibleState,
+    when: overlayVisibleState && cascadeSelectOverlayDisplayOrder,
     priority: [ESC_KEY_HANDLING_PRIORITIES.CASCADE_SELECT, cascadeSelectOverlayDisplayOrder]
   });
   var onOptionSelect = function onOptionSelect(event) {
@@ -14911,6 +15002,7 @@ var ChartJS = function () {
   }
 }();
 var PrimeReactChart = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ChartBase.getProps(inProps, context);
   var _ChartBase$setMetaDat = ChartBase.setMetaData({
@@ -15074,6 +15166,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = CheckboxBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -15286,6 +15379,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ChipBase.getProps(inProps, context);
   var elementRef = React.useRef(null);
@@ -15303,7 +15397,7 @@ var Chip = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inPr
     name: 'chip'
   });
   var onKeyDown = function onKeyDown(event) {
-    if (event.key === 'Enter' || event.key === 'Backspace') {
+    if (event.code === 'Enter' || event.code === 'Backspace') {
       close(event);
     }
   };
@@ -15446,6 +15540,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ChipsBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -15858,6 +15953,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ColorPickerBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -16548,6 +16644,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.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = DialogBase.getProps(inProps, context);
   var uniqueId = props.id ? props.id : UniqueComponentId();
@@ -16606,7 +16703,7 @@ var Dialog = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
         onClose(event);
       }
     },
-    when: visibleState,
+    when: visibleState && displayOrder,
     priority: [ESC_KEY_HANDLING_PRIORITIES.DIALOG, displayOrder]
   });
   var _useEventListener = useEventListener({
@@ -17276,6 +17373,7 @@ var confirmDialog = function confirmDialog() {
   };
 };
 var ConfirmDialog = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ConfirmDialogBase.getProps(inProps, context);
   var _React$useState = React.useState(props.visible),
@@ -17290,10 +17388,16 @@ var ConfirmDialog = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(funct
   var isCallbackExecuting = React.useRef(false);
   var focusElementOnHide = React.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++) {
@@ -17556,6 +17660,7 @@ var confirmPopup = function confirmPopup() {
   };
 };
 var ConfirmPopup = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ConfirmPopupBase.getProps(inProps, context);
   var _React$useState = React.useState(props.visible),
@@ -17609,7 +17714,7 @@ var ConfirmPopup = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(functi
         hide('hide');
       }
     },
-    when: visibleState,
+    when: visibleState && displayOrder,
     priority: [ESC_KEY_HANDLING_PRIORITIES.DIALOG, displayOrder]
   });
   var _useOverlayListener = useOverlayListener({
@@ -17962,6 +18067,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.memo( /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var submenuRef = React.useRef(null);
   var active = props.root || !props.resetMenu;
   var ptm = props.ptm,
@@ -18244,6 +18350,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ContextMenuBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -19021,6 +19128,7 @@ var DataScrollerBase = ComponentBase.extend({
 });
 
 var DataScroller = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = DataScrollerBase.getProps(inProps, context);
   var _React$useState = React.useState([]),
@@ -19473,6 +19581,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.memo(function (inProps) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = CurrentPageReportBase.getProps(inProps, context);
   var report = {
@@ -19485,6 +19594,7 @@ var CurrentPageReport = /*#__PURE__*/React.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
@@ -19492,6 +19602,7 @@ var CurrentPageReport = /*#__PURE__*/React.memo(function (inProps) {
   var element = /*#__PURE__*/React.createElement("span", currentProps, text);
   if (props.template) {
     var defaultOptions = _objectSpread$1l(_objectSpread$1l({}, report), {
+      ariaLive: 'polite',
       className: 'p-paginator-current',
       element: element,
       props: props
@@ -19505,6 +19616,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.memo(function (inProps) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = FirstPageLinkBase.getProps(inProps, context);
   var ptm = props.ptm,
@@ -19535,7 +19647,7 @@ var FirstPageLink = /*#__PURE__*/React.memo(function (inProps) {
     }),
     onClick: props.onClick,
     disabled: props.disabled,
-    'aria-label': ariaLabel('firstPageLabel')
+    'aria-label': ariaLabel$1('firstPageLabel')
   }, getPTOptions('firstPageButton'));
   var element = /*#__PURE__*/React.createElement("button", firstPageButtonProps, firstPageLinkIcon, /*#__PURE__*/React.createElement(Ripple, null));
   if (props.template) {
@@ -19651,6 +19763,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = InputNumberBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -20060,6 +20173,14 @@ var InputNumber = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(functio
           updateValue(event, newValueStr, null, 'delete-range');
         }
         break;
+
+      // End
+      case 35:
+      // Home/Pos1
+      case 36:
+        setTimeout(function () {
+          initCursor();
+        });
     }
   };
   var onInputKeyUp = function onInputKeyUp(event) {
@@ -20394,7 +20515,12 @@ var InputNumber = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(functio
         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);
@@ -20687,8 +20813,10 @@ var InputNumber = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(functio
 InputNumber.displayName = 'InputNumber';
 
 var JumpToPageInput = /*#__PURE__*/React.memo(function (inProps) {
+  useMergeProps();
   var context = React.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);
@@ -20704,7 +20832,8 @@ var JumpToPageInput = /*#__PURE__*/React.memo(function (inProps) {
     unstyled: props.unstyled,
     __parentMetadata: {
       parent: props.metaData
-    }
+    },
+    "aria-label": ariaLabelValue
   });
   if (props.template) {
     var defaultOptions = {
@@ -20712,6 +20841,7 @@ var JumpToPageInput = /*#__PURE__*/React.memo(function (inProps) {
       onChange: onChange,
       disabled: props.disabled,
       className: 'p-paginator-page-input',
+      ariaLabel: ariaLabelValue,
       element: element,
       props: props
     };
@@ -20724,6 +20854,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.memo(function (inProps) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = LastPageLinkBase.getProps(inProps, context);
   var ptm = props.ptm,
@@ -20754,7 +20885,7 @@ var LastPageLink = /*#__PURE__*/React.memo(function (inProps) {
     }),
     onClick: props.onClick,
     disabled: props.disabled,
-    'aria-label': ariaLabel('lastPageLabel')
+    'aria-label': ariaLabel$1('lastPageLabel')
   }, getPTOptions('lastPageButton'));
   var element = /*#__PURE__*/React.createElement("button", lastPageButtonProps, lastPageLinkIcon, /*#__PURE__*/React.createElement(Ripple, null));
   if (props.template) {
@@ -20775,6 +20906,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.memo(function (inProps) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = NextPageLinkBase.getProps(inProps, context);
   var ptm = props.ptm,
@@ -20805,7 +20937,7 @@ var NextPageLink = /*#__PURE__*/React.memo(function (inProps) {
     }),
     onClick: props.onClick,
     disabled: props.disabled,
-    'aria-label': ariaLabel('nextPageLabel')
+    'aria-label': ariaLabel$1('nextPageLabel')
   }, getPTOptions('nextPageButton'));
   var element = /*#__PURE__*/React.createElement("button", nextPageButtonProps, nextPageLinkIcon, /*#__PURE__*/React.createElement(Ripple, null));
   if (props.template) {
@@ -20825,6 +20957,7 @@ var NextPageLink = /*#__PURE__*/React.memo(function (inProps) {
 NextPageLink.displayName = 'NextPageLink';
 
 var PageLinks = /*#__PURE__*/React.memo(function (inProps) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = PageLinksBase.getProps(inProps, context);
   var ptm = props.ptm,
@@ -20868,9 +21001,10 @@ var PageLinks = /*#__PURE__*/React.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.createElement("button", pageButtonProps, pageLink, /*#__PURE__*/React.createElement(Ripple, null));
       if (props.template) {
@@ -20886,6 +21020,10 @@ var PageLinks = /*#__PURE__*/React.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
         };
@@ -20908,6 +21046,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.memo(function (inProps) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = PrevPageLinkBase.getProps(inProps, context);
   var ptm = props.ptm,
@@ -20938,7 +21077,7 @@ var PrevPageLink = /*#__PURE__*/React.memo(function (inProps) {
     }),
     onClick: props.onClick,
     disabled: props.disabled,
-    'aria-label': ariaLabel('previousPageLabel')
+    'aria-label': ariaLabel$1('previousPageLabel')
   }, getPTOptions('prevPageButton'));
   var element = /*#__PURE__*/React.createElement("button", prevPageButtonProps, prevPageLinkIcon, /*#__PURE__*/React.createElement(Ripple, null));
   if (props.template) {
@@ -20989,6 +21128,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', {
@@ -21110,6 +21250,7 @@ var DropdownBase = ComponentBase.extend({
 });
 
 var DropdownItem = /*#__PURE__*/React.memo(function (props) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx,
     selected = props.selected,
@@ -21157,6 +21298,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.memo( /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx,
     sx = props.sx;
@@ -21252,7 +21394,8 @@ var DropdownPanel = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(funct
         className: cx('itemGroup', {
           optionGroupLabel: optionGroupLabel
         }),
-        style: style
+        style: style,
+        'data-p-highlight': props.selected
       }, getPTOptions('itemGroup'));
       return /*#__PURE__*/React.createElement(React.Fragment, {
         key: key
@@ -21287,14 +21430,14 @@ var DropdownPanel = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(funct
     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.createElement(TimesIcon, clearIconProps);
       var filterClearIcon = IconUtils.getJSXIcon(icon, _objectSpread$1f({}, clearIconProps), {
         props: props
@@ -21447,6 +21590,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = DropdownBase.getProps(inProps, context);
   var _React$useState = React.useState(''),
@@ -21533,7 +21677,7 @@ var Dropdown = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     }
   };
   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) {
@@ -21545,7 +21689,7 @@ var Dropdown = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     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);
@@ -21848,6 +21992,9 @@ var Dropdown = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
         }
       });
     }
+    if (props.filter) {
+      resetFilter();
+    }
     updateEditableLabel();
   };
   var selectItem = function selectItem(event) {
@@ -21939,7 +22086,7 @@ var Dropdown = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     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',
@@ -22246,6 +22393,7 @@ var Dropdown = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
 Dropdown.displayName = 'Dropdown';
 
 var RowsPerPageDropdown = /*#__PURE__*/React.memo(function (inProps) {
+  useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = RowsPerPageDropdownBase.getProps(inProps, context);
   var hasOptions = props.options && props.options.length > 0;
@@ -22255,21 +22403,22 @@ var RowsPerPageDropdown = /*#__PURE__*/React.memo(function (inProps) {
       value: opt
     };
   }) : [];
-  var ariaLabel = localeOption('choose');
-  var element = hasOptions ? /*#__PURE__*/React.createElement(Dropdown, {
+  var placeholderValue = localeOption('choose');
+  var ariaLabelValue = ariaLabel$1('rowsPerPage');
+  var element = hasOptions ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.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,
@@ -22280,6 +22429,7 @@ var RowsPerPageDropdown = /*#__PURE__*/React.memo(function (inProps) {
       totalPages: props.pageCount,
       totalRecords: props.totalRecords,
       disabled: props.disabled,
+      ariaLabel: ariaLabelValue,
       element: element,
       props: props
     };
@@ -22292,6 +22442,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = PaginatorBase.getProps(inProps, context);
   var metaData = _objectSpread$1d({
@@ -22984,6 +23135,7 @@ var RowCheckbox = /*#__PURE__*/React.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);
   };
@@ -23075,6 +23227,7 @@ var RowRadioButton = /*#__PURE__*/React.memo(function (props) {
     focusedState = _React$useState2[0],
     setFocusedState = _React$useState2[1];
   var inputRef = React.useRef(null);
+  var mergeProps = useMergeProps();
   var getColumnProps = function getColumnProps() {
     return ColumnBase.getCProps(props.column);
   };
@@ -23173,6 +23326,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.memo(function (props) {
+  var mergeProps = useMergeProps();
   var _React$useState = React.useState(props.editing),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     editingState = _React$useState2[0],
@@ -23327,12 +23481,14 @@ var BodyCell = /*#__PURE__*/React.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 {
@@ -23473,21 +23629,18 @@ var BodyCell = /*#__PURE__*/React.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);
@@ -23495,9 +23648,7 @@ var BodyCell = /*#__PURE__*/React.memo(function (props) {
           }
           event.preventDefault();
           break;
-
-        //right arrow
-        case 39:
+        case 'ArrowRight':
           var nextCell = findNextSelectableCell(cell);
           if (nextCell) {
             changeTabIndex(cell, nextCell);
@@ -23505,9 +23656,7 @@ var BodyCell = /*#__PURE__*/React.memo(function (props) {
           }
           event.preventDefault();
           break;
-
-        //up arrow
-        case 38:
+        case 'ArrowUp':
           var upCell = findUpSelectableCell(cell);
           if (upCell) {
             changeTabIndex(cell, upCell);
@@ -23515,9 +23664,7 @@ var BodyCell = /*#__PURE__*/React.memo(function (props) {
           }
           event.preventDefault();
           break;
-
-        //down arrow
-        case 40:
+        case 'ArrowDown':
           var downCell = findDownSelectableCell(cell);
           if (downCell) {
             changeTabIndex(cell, downCell);
@@ -23525,17 +23672,14 @@ var BodyCell = /*#__PURE__*/React.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();
@@ -23693,7 +23837,7 @@ var BodyCell = /*#__PURE__*/React.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.createElement(React.Fragment, null, selectionMode === 'single' && /*#__PURE__*/React.createElement(RowRadioButton, {
         hostName: props.hostName,
@@ -23748,7 +23892,7 @@ var BodyCell = /*#__PURE__*/React.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')
@@ -23932,6 +24076,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.memo(function (props) {
+  var mergeProps = useMergeProps();
   var _React$useState = React.useState(false),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     editingState = _React$useState2[0],
@@ -24389,6 +24534,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.memo(function (props) {
+  var mergeProps = useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     ptmo = _props$ptCallbacks.ptmo,
@@ -24421,7 +24567,7 @@ var RowTogglerButton = /*#__PURE__*/React.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) {
@@ -24439,6 +24585,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.memo( /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     ptmo = _props$ptCallbacks.ptmo,
@@ -25490,6 +25637,7 @@ var FooterCell = /*#__PURE__*/React.memo(function (props) {
     styleObjectState = _React$useState2[0],
     setStyleObjectState = _React$useState2[1];
   var elementRef = React.useRef(null);
+  var mergeProps = useMergeProps();
   var getColumnProps = function getColumnProps() {
     return ColumnBase.getCProps(props.column);
   };
@@ -25580,6 +25728,7 @@ var TableFooter = /*#__PURE__*/React.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);
   };
@@ -25677,6 +25826,7 @@ var ColumnFilter = /*#__PURE__*/React.memo(function (props) {
   var iconRef = React.useRef(null);
   var selfClick = React.useRef(false);
   var overlayEventListener = React.useRef(null);
+  var mergeProps = useMergeProps();
   var getColumnProp = function getColumnProp(name) {
     return ColumnBase.getCProp(props.column, name);
   };
@@ -26489,6 +26639,7 @@ var HeaderCheckbox = /*#__PURE__*/React.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);
   };
@@ -26581,6 +26732,7 @@ var HeaderCell = /*#__PURE__*/React.memo(function (props) {
     setStyleObjectState = _React$useState2[1];
   var elementRef = React.useRef(null);
   var prevColumn = usePrevious(props.column);
+  var mergeProps = useMergeProps();
   var parentMetaData = props.metaData,
     ptCallbacks = props.ptCallbacks,
     index = props.index;
@@ -26963,6 +27115,7 @@ var TableHeader = /*#__PURE__*/React.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;
@@ -27208,6 +27361,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.forwardRef(function (inProps, ref) {
   var context = React.useContext(PrimeReactContext);
+  var mergeProps = useMergeProps();
   var props = DataTableBase.getProps(inProps, context);
   var _React$useState = React.useState(props.first),
     _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -27293,6 +27447,7 @@ var DataTable = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
   var dropPosition = React.useRef(null);
   var styleElement = React.useRef(null);
   var responsiveStyleElement = React.useRef(null);
+  var beforeResizeStyleElement = React.useRef(null);
   var columnWidthsState = React.useRef(null);
   var tableWidthState = React.useRef(null);
   var resizeColumn = React.useRef(null);
@@ -27666,6 +27821,7 @@ var DataTable = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
     }
   };
   var onColumnResizeStart = function onColumnResizeStart(e) {
+    createBeforeResizeStyleElement();
     var event = e.originalEvent,
       column = e.column;
     var containerLeft = DomHandler.getOffset(elementRef.current).left;
@@ -27678,7 +27834,6 @@ var DataTable = /*#__PURE__*/React.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';
@@ -27728,7 +27883,7 @@ var DataTable = /*#__PURE__*/React.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) {
@@ -27917,6 +28072,11 @@ var DataTable = /*#__PURE__*/React.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);
   };
@@ -27936,6 +28096,9 @@ var DataTable = /*#__PURE__*/React.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) {
@@ -28513,6 +28676,7 @@ var DataTable = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
     unbindColumnResizeEvents();
     destroyStyleElement();
     destroyResponsiveStyle();
+    destroyBeforeResizeStyleElement();
   });
   React.useImperativeHandle(ref, function () {
     return {
@@ -29369,6 +29533,7 @@ var DeferredContentBase = ComponentBase.extend({
 });
 
 var DeferredContent = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = DeferredContentBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -29472,6 +29637,7 @@ var DividerBase = ComponentBase.extend({
 });
 
 var Divider = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = DividerBase.getProps(inProps, context);
   var _DividerBase$setMetaD = DividerBase.setMetaData({
@@ -29583,6 +29749,7 @@ var Dock = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inPr
     _React$useState6 = _slicedToArray(_React$useState5, 2),
     focusedOptionIndex = _React$useState6[0],
     setFocusedOptionIndex = _React$useState6[1];
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = DockBase.getProps(inProps, context);
   var _React$useState7 = React.useState(props.id),
@@ -29904,6 +30071,7 @@ var QuillJS = function () {
   }
 }();
 var Editor = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = EditorBase.getProps(inProps, context);
   var _EditorBase$setMetaDa = EditorBase.setMetaData({
@@ -30170,6 +30338,7 @@ var FieldsetBase = ComponentBase.extend({
 });
 
 var Fieldset = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = FieldsetBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -30508,6 +30677,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = MessagesBase.getProps(inProps, context);
   var _React$useState = React.useState([]),
@@ -30678,6 +30848,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ProgressBarBase.getProps(inProps, context);
   var _ProgressBarBase$setM = ProgressBarBase.setMetaData(_objectSpread$X({
@@ -30891,6 +31062,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = FileUploadBase.getProps(inProps, context);
   var _React$useState = React.useState([]),
@@ -31004,9 +31176,7 @@ var FileUpload = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
     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);
       }
     }
@@ -31703,6 +31873,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.memo( /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var indicatorContent = React.useRef(null);
   var ptm = props.ptm,
     cx = props.cx;
@@ -32800,6 +32971,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ImageBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -32822,7 +32994,6 @@ var Image = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inP
   var imageRef = React.useRef(null);
   var maskRef = React.useRef(null);
   var previewRef = React.useRef(null);
-  var previewClick = React.useRef(false);
   var previewButton = React.useRef(null);
   var zoomOutDisabled = scaleState <= 0.5;
   var zoomInDisabled = scaleState >= 1.5;
@@ -32864,28 +33035,17 @@ var Image = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inP
     }
   };
   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) {
@@ -32905,33 +33065,28 @@ var Image = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inP
       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']);
@@ -33068,7 +33223,6 @@ var Image = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inP
         rotateState: rotateState,
         scaleState: scaleState
       }),
-      onClick: onPreviewImageClick,
       crossOrigin: crossOrigin,
       referrerPolicy: referrerPolicy,
       useMap: useMap,
@@ -33213,6 +33367,7 @@ var InplaceContent = function InplaceContent(props) {
   return props.children;
 };
 var Inplace = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = InplaceBase.getProps(inProps, context);
   var _React$useState = React.useState(props.active),
@@ -33396,7 +33551,7 @@ var InputMask = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
     var range, begin, end;
     var inputEl = elementRef.current;
     if (!inputEl || !inputEl.offsetParent || inputEl !== document.activeElement) {
-      return;
+      return null;
     }
     if (typeof first === 'number') {
       begin = first;
@@ -33419,11 +33574,11 @@ var InputMask = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
         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++) {
@@ -33487,6 +33642,9 @@ var InputMask = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
   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);
@@ -33533,6 +33691,9 @@ var InputMask = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
     //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) {
@@ -33559,8 +33720,11 @@ var InputMask = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
     if (props.readOnly) {
       return;
     }
+    var pos = caret();
+    if (!pos) {
+      return;
+    }
     var k = e.which || e.keyCode,
-      pos = caret(),
       p,
       c,
       next,
@@ -33926,6 +34090,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = InputSwitchBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -34090,6 +34255,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = InputTextareaBase.getProps(inProps, context);
   var elementRef = React.useRef(ref);
@@ -34250,6 +34416,7 @@ var midY = 50;
 var minRadians = 4 * Math.PI / 3;
 var maxRadians = -Math.PI / 3;
 var Knob = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = KnobBase.getProps(inProps, context);
   var _KnobBase$setMetaData = KnobBase.setMetaData({
@@ -34553,6 +34720,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.memo(function (props) {
+  var mergeProps = useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     cx = _props$ptCallbacks.cx;
@@ -34628,6 +34796,7 @@ var ListBoxItem = /*#__PURE__*/React.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;
@@ -34690,11 +34859,11 @@ var ListBoxItem = /*#__PURE__*/React.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({
@@ -34712,7 +34881,8 @@ var ListBoxItem = /*#__PURE__*/React.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.createElement("li", itemProps, content, /*#__PURE__*/React.createElement(Ripple, null));
 });
@@ -34724,6 +34894,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ListBoxBase.getProps(inProps, context);
   var _React$useState = React.useState(''),
@@ -35221,7 +35392,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',
@@ -35250,6 +35421,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = MegaMenuBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -36183,7 +36355,7 @@ var MegaMenu = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     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;
     }
   };
@@ -36302,7 +36474,7 @@ var MegaMenu = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     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({
@@ -36312,7 +36484,7 @@ var MegaMenu = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
       '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);
@@ -36350,20 +36522,25 @@ var MegaMenu = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
 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
@@ -36413,6 +36590,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = MentionBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -36431,6 +36609,10 @@ var Mention = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (i
     _React$useState8 = _slicedToArray(_React$useState7, 2),
     triggerState = _React$useState8[0],
     setTriggerState = _React$useState8[1];
+  var _React$useState9 = React.useState([]),
+    _React$useState10 = _slicedToArray(_React$useState9, 2),
+    highlightState = _React$useState10[0],
+    setHighlightState = _React$useState10[1];
   var elementRef = React.useRef(null);
   var overlayRef = React.useRef(null);
   var inputRef = React.useRef(props.inputRef);
@@ -36453,11 +36635,12 @@ var Mention = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (i
   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({
@@ -36491,7 +36674,11 @@ var Mention = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (i
   };
   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() {
@@ -36506,13 +36693,15 @@ var Mention = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (i
     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', {
@@ -36634,7 +36823,18 @@ var Mention = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (i
   };
   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) {
@@ -36647,21 +36847,32 @@ var Mention = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (i
   };
   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();
@@ -36672,8 +36883,14 @@ var Mention = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (i
           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);
             }
           }
@@ -36734,15 +36951,26 @@ var Mention = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (i
     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 () {
@@ -36754,13 +36982,19 @@ var Mention = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (i
       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.createElement("li", itemProps, content, /*#__PURE__*/React.createElement(Ripple, null));
   };
   var createList = function createList() {
@@ -36919,6 +37153,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = MenuBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -36963,7 +37198,7 @@ var Menu = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inPr
     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({
@@ -36994,9 +37229,6 @@ var Menu = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inPr
       event.preventDefault();
       return;
     }
-    if (!item.url) {
-      event.preventDefault();
-    }
     if (item.command) {
       item.command({
         originalEvent: event,
@@ -37009,8 +37241,10 @@ var Menu = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inPr
     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);
@@ -37400,6 +37634,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.memo( /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx;
   var getPTOptions = function getPTOptions(processedItem, key, index) {
@@ -37640,6 +37875,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = MenubarBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -38294,7 +38530,7 @@ var Menubar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (i
       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) {
@@ -38383,6 +38619,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = MessageBase.getProps(inProps, context);
   var elementRef = React.useRef(null);
@@ -38625,6 +38862,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.memo(function (props) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx,
     isUnstyled = props.isUnstyled;
@@ -38772,6 +39010,7 @@ var MultiSelectItem = /*#__PURE__*/React.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) {
@@ -38850,6 +39089,7 @@ function _objectSpread$F(e) { for (var r = 1; r < arguments.length; r++) { var t
 var MultiSelectPanel = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (props, ref) {
   var virtualScrollerRef = React.useRef(null);
   var filterInputRef = React.useRef(null);
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var ptm = props.ptm,
     cx = props.cx,
@@ -39123,6 +39363,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = MultiSelectBase.getProps(inProps, context);
   var _React$useState = React.useState(''),
@@ -39363,7 +39604,7 @@ var MultiSelect = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(functio
     });
   };
   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',
@@ -39901,6 +40142,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = MultiStateCheckboxBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -40036,7 +40278,7 @@ var MultiStateCheckbox = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(
   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,
@@ -40133,6 +40375,7 @@ var OrderListBase = ComponentBase.extend({
 });
 
 var OrderListControls = /*#__PURE__*/React.memo(function (props) {
+  var mergeProps = useMergeProps();
   var moveUpIcon = props.moveUpIcon || /*#__PURE__*/React.createElement(AngleUpIcon, null);
   var moveTopIcon = props.moveTopIcon || /*#__PURE__*/React.createElement(AngleDoubleUpIcon, null);
   var moveDownIcon = props.moveDownIcon || /*#__PURE__*/React.createElement(AngleDownIcon, null);
@@ -40244,7 +40487,7 @@ var OrderListControls = /*#__PURE__*/React.memo(function (props) {
     icon: moveUpIcon,
     onClick: moveUp,
     disabled: isMoveDisabled,
-    'aria-label': ariaLabel('moveUp'),
+    'aria-label': ariaLabel$1('moveUp'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -40255,7 +40498,7 @@ var OrderListControls = /*#__PURE__*/React.memo(function (props) {
     icon: moveTopIcon,
     onClick: moveTop,
     disabled: isMoveDisabled,
-    'aria-label': ariaLabel('moveTop'),
+    'aria-label': ariaLabel$1('moveTop'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -40266,7 +40509,7 @@ var OrderListControls = /*#__PURE__*/React.memo(function (props) {
     icon: moveDownIcon,
     onClick: moveDown,
     disabled: isMoveDisabled,
-    'aria-label': ariaLabel('moveDown'),
+    'aria-label': ariaLabel$1('moveDown'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -40277,7 +40520,7 @@ var OrderListControls = /*#__PURE__*/React.memo(function (props) {
     icon: moveBottomIcon,
     onClick: moveBottom,
     disabled: isMoveDisabled,
-    'aria-label': ariaLabel('moveBottom'),
+    'aria-label': ariaLabel$1('moveBottom'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -40297,6 +40540,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.memo( /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx;
   var _ptm = function _ptm(key, options) {
@@ -40546,6 +40790,7 @@ var OrderListSubList = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(fu
 OrderListSubList.displayName = 'OrderListSubList';
 
 var OrderList = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = OrderListBase.getProps(inProps, context);
   var _React$useState = React.useState([]),
@@ -40969,6 +41214,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.memo(function (props) {
+  var mergeProps = useMergeProps();
   var node = props.node;
   var _React$useState = React.useState(node.expanded),
     _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -41163,6 +41409,7 @@ var OrganizationChartNode = /*#__PURE__*/React.memo(function (props) {
 OrganizationChartNode.displayName = 'OrganizationChartNode';
 
 var OrganizationChart = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = OrganizationChartBase.getProps(inProps, context);
   var _OrganizationChartBas = OrganizationChartBase.setMetaData({
@@ -41307,6 +41554,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.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = OverlayPanelBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -41362,7 +41610,7 @@ var OverlayPanel = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
     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) {
@@ -41605,6 +41853,7 @@ var PanelBase = ComponentBase.extend({
 });
 
 var Panel = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = PanelBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -41882,6 +42131,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.memo( /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx;
   var elementRef = React.useRef(null);
@@ -41908,7 +42158,7 @@ var PanelMenuSub = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(functi
     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;
     });
   };
@@ -42126,7 +42376,7 @@ var PanelMenuList = /*#__PURE__*/React.memo(function (props) {
     _React$useState6 = _slicedToArray(_React$useState5, 2),
     focusedItemId = _React$useState6[0],
     setFocusedItemId = _React$useState6[1];
-  var _React$useState7 = React.useState(null),
+  var _React$useState7 = React.useState([]),
     _React$useState8 = _slicedToArray(_React$useState7, 2),
     activeItemPath = _React$useState8[0],
     setActiveItemPath = _React$useState8[1];
@@ -42154,7 +42404,7 @@ var PanelMenuList = /*#__PURE__*/React.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;
     });
   };
@@ -42481,21 +42731,24 @@ var PanelMenuList = /*#__PURE__*/React.memo(function (props) {
     });
     return processedFlattenItems;
   };
-  useUpdateEffect(function () {
+  React.useEffect(function () {
     var processed = createProcessedItems(props.model);
     setProcessedItems(processed);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [props.model]);
-  useUpdateEffect(function () {
+  React.useEffect(function () {
     var _visibleItems = flatItems(processedItems);
     setVisibleItems(_visibleItems);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [processedItems, activeItemPath]);
+  React.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.createElement(PanelMenuSub, {
     hostName: "PanelMenu",
     id: props.panelId + '_list',
@@ -42525,6 +42778,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = PanelMenuBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -42571,7 +42825,9 @@ var PanelMenu = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
         item: item
       });
     }
-    changeActiveItem(event, item);
+    if (item.items) {
+      changeActiveItem(event, item);
+    }
   };
   var getItemProp = function getItemProp(item, name) {
     return item ? ObjectUtils.getItemValue(item[name]) : undefined;
@@ -42740,9 +42996,7 @@ var PanelMenu = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
     };
   });
   useMountEffect(function () {
-    if (!idState) {
-      setIdState(UniqueComponentId());
-    }
+    !idState && setIdState(UniqueComponentId());
   });
   useUpdateEffect(function () {
     setAnimationDisabled(true);
@@ -42964,6 +43218,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = PasswordBase.getProps(inProps, context);
   var promptLabel = props.promptLabel || localeOption('passwordPrompt');
@@ -43018,7 +43273,7 @@ var Password = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     callback: function callback() {
       hide();
     },
-    when: overlayVisibleState && props.feedback,
+    when: overlayVisibleState && props.feedback && passwordDisplayOrder,
     priority: [ESC_KEY_HANDLING_PRIORITIES.PASSWORD, passwordDisplayOrder]
   });
   var _useOverlayListener = useOverlayListener({
@@ -43427,6 +43682,7 @@ var PickListBase = ComponentBase.extend({
 });
 
 var PickListControls = /*#__PURE__*/React.memo(function (props) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx,
     unstyled = props.unstyled;
@@ -43543,7 +43799,7 @@ var PickListControls = /*#__PURE__*/React.memo(function (props) {
     onClick: moveUp,
     pt: ptm('moveUpButton'),
     unstyled: unstyled,
-    "aria-label": ariaLabel('moveUp'),
+    "aria-label": ariaLabel$1('moveUp'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -43554,7 +43810,7 @@ var PickListControls = /*#__PURE__*/React.memo(function (props) {
     onClick: moveTop,
     pt: ptm('moveTopButton'),
     unstyled: unstyled,
-    "aria-label": ariaLabel('moveTop'),
+    "aria-label": ariaLabel$1('moveTop'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -43565,7 +43821,7 @@ var PickListControls = /*#__PURE__*/React.memo(function (props) {
     onClick: moveDown,
     pt: ptm('moveDownButton'),
     unstyled: unstyled,
-    "aria-label": ariaLabel('moveDown'),
+    "aria-label": ariaLabel$1('moveDown'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -43576,7 +43832,7 @@ var PickListControls = /*#__PURE__*/React.memo(function (props) {
     onClick: moveBottom,
     pt: ptm('moveBottomButton'),
     unstyled: unstyled,
-    "aria-label": ariaLabel('moveBottom'),
+    "aria-label": ariaLabel$1('moveBottom'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -43585,6 +43841,7 @@ var PickListControls = /*#__PURE__*/React.memo(function (props) {
 PickListControls.displayName = 'PickListControls';
 
 var PickListItem = /*#__PURE__*/React.memo(function (props) {
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx;
   var getPTOptions = function getPTOptions(key) {
@@ -43645,6 +43902,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.memo( /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var listElementRef = React.useRef(null);
   var ptm = props.ptm,
     cx = props.cx;
@@ -43789,6 +44047,7 @@ var PickListSubList = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(fun
 PickListSubList.displayName = 'PickListSubList';
 
 var PickListTransferControls = /*#__PURE__*/React.memo(function (props) {
+  var mergeProps = useMergeProps();
   var viewChanged = useMatchMedia("(max-width: ".concat(props.breakpoint, ")"), props.breakpoint);
   var ptm = props.ptm,
     cx = props.cx,
@@ -43917,7 +44176,7 @@ var PickListTransferControls = /*#__PURE__*/React.memo(function (props) {
     onClick: moveRight,
     pt: ptm('moveToTargetButton'),
     unstyled: unstyled,
-    "aria-label": ariaLabel('moveToTarget'),
+    "aria-label": ariaLabel$1('moveToTarget'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -43928,7 +44187,7 @@ var PickListTransferControls = /*#__PURE__*/React.memo(function (props) {
     onClick: moveAllRight,
     pt: ptm('moveAllToTargetButton'),
     unstyled: unstyled,
-    "aria-label": ariaLabel('moveAllToTarget'),
+    "aria-label": ariaLabel$1('moveAllToTarget'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -43939,7 +44198,7 @@ var PickListTransferControls = /*#__PURE__*/React.memo(function (props) {
     onClick: moveLeft,
     pt: ptm('moveToSourceButton'),
     unstyled: unstyled,
-    "aria-label": ariaLabel('moveToSource'),
+    "aria-label": ariaLabel$1('moveToSource'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -43950,7 +44209,7 @@ var PickListTransferControls = /*#__PURE__*/React.memo(function (props) {
     onClick: moveAllLeft,
     pt: ptm('moveAllToSourceButton'),
     unstyled: unstyled,
-    "aria-label": ariaLabel('moveAllToSource'),
+    "aria-label": ariaLabel$1('moveAllToSource'),
     __parentMetadata: {
       parent: props.metaData
     }
@@ -43961,6 +44220,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = PickListBase.getProps(inProps, context);
   var _React$useState = React.useState([]),
@@ -44656,6 +44916,7 @@ var ProgressSpinnerBase = ComponentBase.extend({
 });
 
 var ProgressSpinner = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ProgressSpinnerBase.getProps(inProps, context);
   var elementRef = React.useRef(null);
@@ -44755,6 +45016,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = RadioButtonBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -44962,6 +45224,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = RatingBase.getProps(inProps, context);
   var elementRef = React.useRef(null);
@@ -45118,6 +45381,7 @@ var Rating = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (in
 Rating.displayName = 'Rating';
 
 var Row = function Row(inProps) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = RowBase.getProps(inProps, context);
   //@todo Pass Parent MetaData
@@ -45158,6 +45422,7 @@ var ScrollPanelBase = ComponentBase.extend({
 });
 
 var ScrollPanel = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ScrollPanelBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -45498,6 +45763,7 @@ var ScrollTop = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
     _React$useState2 = _slicedToArray(_React$useState, 2),
     visibleState = _React$useState2[0],
     setVisibleState = _React$useState2[1];
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ScrollTopBase.getProps(inProps, context);
   var _ScrollTopBase$setMet = ScrollTopBase.setMetaData({
@@ -45657,6 +45923,7 @@ var SelectButtonItem = /*#__PURE__*/React.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) {
@@ -45716,6 +45983,7 @@ var SelectButtonItem = /*#__PURE__*/React.memo(function (props) {
 SelectButtonItem.displayName = 'SelectButtonItem';
 
 var SelectButton = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = SelectButtonBase.getProps(inProps, context);
   var elementRef = React.useRef(null);
@@ -45927,6 +46195,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.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = SidebarBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -45958,7 +46227,7 @@ var Sidebar = /*#__PURE__*/React.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({
@@ -46210,6 +46479,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = SkeletonBase.getProps(inProps, context);
   var _SkeletonBase$setMeta = SkeletonBase.setMetaData({
@@ -46346,6 +46616,7 @@ var SlideMenuSub = /*#__PURE__*/React.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;
@@ -46497,6 +46768,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = SlideMenuBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -46535,7 +46807,7 @@ var SlideMenu = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
     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({
@@ -46778,6 +47050,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = SliderBase.getProps(inProps, context);
   var elementRef = React.useRef(null);
@@ -47174,6 +47447,7 @@ var SpeedDial = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
   var isItemClicked = React.useRef(false);
   var elementRef = React.useRef(null);
   var listRef = React.useRef(null);
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = SpeedDialBase.getProps(inProps, context);
   var visible = props.onVisibleChange ? props.visible : visibleState;
@@ -47196,7 +47470,7 @@ var SpeedDial = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
     callback: function callback() {
       hide();
     },
-    when: visible,
+    when: visible && speedDialDisplayOrder,
     priority: [ESC_KEY_HANDLING_PRIORITIES.SPEED_DIAL, speedDialDisplayOrder]
   });
   var _useEventListener = useEventListener({
@@ -47764,6 +48038,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.memo( /*#__PURE__*/React.forwardRef(function (props, ref) {
   var elementRef = React.useRef(null);
+  var mergeProps = useMergeProps();
   var ptm = props.ptm,
     cx = props.cx,
     sx = props.sx;
@@ -47882,7 +48157,7 @@ var TieredMenuSub = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(funct
         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,
@@ -48029,6 +48304,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = TieredMenuBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -48819,6 +49095,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = SplitButtonBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -48852,7 +49129,7 @@ var SplitButton = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(functio
     callback: function callback() {
       hide();
     },
-    when: overlayVisibleState,
+    when: overlayVisibleState && overlayDisplayOrder,
     priority: [ESC_KEY_HANDLING_PRIORITIES.SPLIT_BUTTON, overlayDisplayOrder]
   });
   var onPanelClick = function onPanelClick(event) {
@@ -49059,6 +49336,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = SplitterBase.getProps(inProps, context);
   var elementRef = React.useRef(null);
@@ -49471,6 +49749,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = StepsBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -49952,6 +50231,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = TabMenuBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -50351,6 +50631,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.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = TabViewBase.getProps(inProps, context);
   var _React$useState = React.useState(props.id),
@@ -50635,6 +50916,7 @@ var TabView = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
   };
   React.useEffect(function () {
     updateInkBar();
+    updateButtonState();
   });
   useMountEffect(function () {
     if (!idState) {
@@ -50844,7 +51126,7 @@ var TabView = /*#__PURE__*/React.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();
       }
@@ -50866,7 +51148,7 @@ var TabView = /*#__PURE__*/React.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();
       }
@@ -50922,6 +51204,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.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = TagBase.getProps(inProps, context);
   var _TagBase$setMetaData = TagBase.setMetaData({
@@ -50989,6 +51272,7 @@ var TerminalBase = ComponentBase.extend({
 });
 
 var Terminal = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = TerminalBase.getProps(inProps, context);
   var _React$useState = React.useState(''),
@@ -51188,6 +51472,7 @@ var TimelineBase = ComponentBase.extend({
 });
 
 var Timeline = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = TimelineBase.getProps(inProps, context);
   var _TimelineBase$setMeta = TimelineBase.setMetaData({
@@ -51321,6 +51606,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.memo( /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var messageInfo = props.messageInfo,
     parentMetaData = props.metaData,
     _props$ptCallbacks = props.ptCallbacks,
@@ -51501,6 +51787,7 @@ ToastMessage.displayName = 'ToastMessage';
 
 var messageIdx = 0;
 var Toast = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ToastBase.getProps(inProps, context);
   var _React$useState = React.useState([]),
@@ -51703,6 +51990,7 @@ var ToggleButton = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(functi
     _React$useState2 = _slicedToArray(_React$useState, 2),
     focusedState = _React$useState2[0],
     setFocusedState = _React$useState2[1];
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ToggleButtonBase.getProps(inProps, context);
   var elementRef = React.useRef(null);
@@ -51843,6 +52131,7 @@ var ToolbarBase = ComponentBase.extend({
 });
 
 var Toolbar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = ToolbarBase.getProps(inProps, context);
   var elementRef = React.useRef(null);
@@ -52010,6 +52299,7 @@ var UITreeNode = /*#__PURE__*/React.memo(function (props) {
   var contentRef = React.useRef(null);
   var elementRef = React.useRef(null);
   var nodeTouched = React.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;
@@ -52662,7 +52952,8 @@ var UITreeNode = /*#__PURE__*/React.memo(function (props) {
       onDragEnter: onDragEnter,
       onDragLeave: onDragLeave,
       onDragStart: onDragStart,
-      onDragEnd: onDragEnd
+      onDragEnd: onDragEnd,
+      'data-p-highlight': isCheckboxSelectionMode() ? checked : selected
     }, getPTOptions('content'));
     return /*#__PURE__*/React.createElement("div", contentProps, toggler, checkbox, icon, label);
   };
@@ -52758,6 +53049,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = TreeBase.getProps(inProps, context);
   var _React$useState = React.useState(''),
@@ -52812,7 +53104,7 @@ var Tree = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (inPr
       if (navigateFocusToChild) {
         childFocusEvent.current = originalEvent;
       }
-      setExpandedKeysState(event.value);
+      setExpandedKeysState(value);
     }
   };
   useUpdateEffect(function () {
@@ -53383,6 +53675,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.forwardRef(function (props, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var ptm = props.ptm,
     cx = props.cx;
@@ -53448,6 +53741,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = TreeSelectBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -53541,7 +53835,7 @@ var TreeSelect = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
     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();
     }
@@ -53738,7 +54032,7 @@ var TreeSelect = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
     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',
@@ -54191,7 +54485,7 @@ var TreeSelect = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
 }));
 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,
@@ -54211,8 +54505,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;
@@ -54238,22 +54532,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',
@@ -54355,9 +54651,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,
@@ -54370,8 +54666,8 @@ var TreeTableBase = ComponentBase.extend({
     selectionMode: null,
     showGridlines: false,
     sortField: null,
-    sortMode: 'single',
     sortIcon: null,
+    sortMode: 'single',
     sortOrder: null,
     stripedRows: false,
     style: null,
@@ -54400,6 +54696,7 @@ var TreeTableBodyCell = function TreeTableBodyCell(props) {
   var selfClick = React.useRef(false);
   var overlayEventListener = React.useRef(null);
   var tabIndexTimeout = React.useRef(null);
+  var mergeProps = useMergeProps();
   var getColumnProp = function getColumnProp(name) {
     return ColumnBase.getCProp(props.column, name);
   };
@@ -54632,6 +54929,7 @@ var TreeTableRow = /*#__PURE__*/React.memo(function (props) {
   var checkboxRef = React.useRef(null);
   var checkboxBoxRef = React.useRef(null);
   var nodeTouched = React.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);
@@ -54941,7 +55239,7 @@ var TreeTableRow = /*#__PURE__*/React.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
@@ -55142,6 +55440,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.memo(function (props) {
+  var mergeProps = useMergeProps();
   var isSingleSelectionMode = props.selectionMode === 'single';
   var isMultipleSelectionMode = props.selectionMode === 'multiple';
   var _props$ptCallbacks = props.ptCallbacks,
@@ -55369,6 +55668,7 @@ var TreeTableBody = /*#__PURE__*/React.memo(function (props) {
 TreeTableBody.displayName = 'TreeTableBody';
 
 var TreeTableFooter = /*#__PURE__*/React.memo(function (props) {
+  var mergeProps = useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     ptmo = _props$ptCallbacks.ptmo,
@@ -55453,6 +55753,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.memo(function (props) {
+  var mergeProps = useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     ptmo = _props$ptCallbacks.ptmo,
@@ -55839,6 +56140,7 @@ var TreeTableScrollableView = /*#__PURE__*/React.memo(function (props) {
   var scrollTableRef = React.useRef(null);
   var scrollFooterRef = React.useRef(null);
   var scrollFooterBoxRef = React.useRef(null);
+  var mergeProps = useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     cx = _props$ptCallbacks.cx,
@@ -55998,6 +56300,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.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = TreeTableBase.getProps(inProps, context);
   var _React$useState = React.useState(props.expandedKeys),
@@ -57088,6 +57391,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.memo( /*#__PURE__*/React.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = TriStateCheckboxBase.getProps(inProps, context);
   var _React$useState = React.useState(false),
@@ -57179,7 +57483,7 @@ var TriStateCheckbox = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(fu
   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', {
@@ -57213,4 +57517,4 @@ var TriStateCheckbox = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(fu
 }));
 TriStateCheckbox.displayName = 'TriStateCheckbox';
 
-export { Accordion, AccordionTab, AngleDoubleDownIcon, AngleDoubleLeftIcon, AngleDoubleRightIcon, AngleDoubleUpIcon, AngleDownIcon, AngleLeftIcon, AngleRightIcon, AngleUpIcon, ArrowDownIcon, ArrowUpIcon, AutoComplete, Avatar, AvatarGroup, Badge, BanIcon, BarsIcon, BlockUI, BreadCrumb, Button, CSSTransition, Calendar, CalendarIcon, Card, Carousel, CascadeSelect, PrimeReactChart as Chart, CheckIcon, Checkbox, ChevronDownIcon, ChevronLeftIcon, ChevronRightIcon, ChevronUpIcon, Chip, Chips, ColorPicker, Column, ColumnGroup, ConfirmDialog, ConfirmPopup, ContextMenu, DataScroller, DataTable, DataView, DataViewItem, DataViewLayoutOptions, DeferredContent, Dialog, Divider, Dock, DomHandler, Dropdown, ESC_KEY_HANDLING_PRIORITIES, Editor, EventBus, ExclamationTriangleIcon, EyeIcon, EyeSlashIcon, Fieldset, FileUpload, FilterIcon, FilterMatchMode, FilterOperator, FilterService, FilterSlashIcon, Galleria, IconBase, IconUtils, Image, InfoCircleIcon, Inplace, InplaceContent, InplaceDisplay, InputMask, InputNumber, InputSwitch, InputText, InputTextarea, KeyFilter, Knob, ListBox, MegaMenu, Mention, Menu, Menubar, Message, MessageSeverity, Messages, MinusIcon, MultiSelect, MultiStateCheckbox, ObjectUtils, OrderList, OrganizationChart, OverlayPanel, OverlayService, Paginator, Panel, PanelMenu, Password, PencilIcon, PickList, PlusIcon, Portal, PrimeIcons, PrimeReactContext, PrimeReactProvider, ProgressBar, ProgressSpinner, RadioButton, Rating, RefreshIcon, Ripple, Row, ScrollPanel, ScrollTop, SearchIcon, SearchMinusIcon, SearchPlusIcon, SelectButton, Sidebar, Skeleton, SlideMenu, Slider, SortAltIcon, SortAmountDownIcon, SortAmountUpAltIcon, SortOrder, SpeedDial, SpinnerIcon, SplitButton, Splitter, SplitterPanel, StarFillIcon, StarIcon, Steps, StyleClass, TabMenu, TabPanel, TabView, Tag, Terminal, TerminalService, ThLargeIcon, TieredMenu, Timeline, TimesCircleIcon, TimesIcon, Toast, ToggleButton, Toolbar, Tooltip, TrashIcon, Tree, TreeSelect, TreeTable, TriStateCheckbox, UndoIcon, UniqueComponentId, UploadIcon, VirtualScroller, WindowMaximizeIcon, WindowMinimizeIcon, ZIndexUtils, addLocale, ariaLabel, classNames, confirmDialog, confirmPopup, PrimeReact as default, locale, localeOption, localeOptions, mask, mergeProps, updateLocaleOption, updateLocaleOptions, useClickOutside, useCounter, useDebounce, useDisplayOrder, useEventListener, useFavicon, useGlobalOnEscapeKey, useIntersectionObserver, useInterval, useLocalStorage, useMatchMedia, useMountEffect, useMouse, useMove, useOverlayListener, useOverlayScrollListener, usePrevious, useResizeListener, useSessionStorage, useStorage, useStyle, useTimeout, useUnmountEffect, useUpdateEffect };
+export { Accordion, AccordionTab, AngleDoubleDownIcon, AngleDoubleLeftIcon, AngleDoubleRightIcon, AngleDoubleUpIcon, AngleDownIcon, AngleLeftIcon, AngleRightIcon, AngleUpIcon, ArrowDownIcon, ArrowUpIcon, AutoComplete, Avatar, AvatarGroup, Badge, BanIcon, BarsIcon, BlockUI, BreadCrumb, Button, CSSTransition, Calendar, CalendarIcon, Card, Carousel, CascadeSelect, PrimeReactChart as Chart, CheckIcon, Checkbox, ChevronDownIcon, ChevronLeftIcon, ChevronRightIcon, ChevronUpIcon, Chip, Chips, ColorPicker, Column, ColumnGroup, ConfirmDialog, ConfirmPopup, ContextMenu, DataScroller, DataTable, DataView, DataViewItem, DataViewLayoutOptions, DeferredContent, Dialog, Divider, Dock, DomHandler, Dropdown, ESC_KEY_HANDLING_PRIORITIES, Editor, EventBus, ExclamationTriangleIcon, EyeIcon, EyeSlashIcon, Fieldset, FileUpload, FilterIcon, FilterMatchMode, FilterOperator, FilterService, FilterSlashIcon, Galleria, IconBase, IconUtils, Image, InfoCircleIcon, Inplace, InplaceContent, InplaceDisplay, InputMask, InputNumber, InputSwitch, InputText, InputTextarea, KeyFilter, Knob, ListBox, MegaMenu, Mention, Menu, Menubar, Message, MessageSeverity, Messages, MinusIcon, MultiSelect, MultiStateCheckbox, ObjectUtils, OrderList, OrganizationChart, OverlayPanel, OverlayService, Paginator, Panel, PanelMenu, Password, PencilIcon, PickList, PlusIcon, Portal, PrimeIcons, PrimeReactContext, PrimeReactProvider, ProgressBar, ProgressSpinner, RadioButton, Rating, RefreshIcon, Ripple, Row, ScrollPanel, ScrollTop, SearchIcon, SearchMinusIcon, SearchPlusIcon, SelectButton, Sidebar, Skeleton, SlideMenu, Slider, SortAltIcon, SortAmountDownIcon, SortAmountUpAltIcon, SortOrder, SpeedDial, SpinnerIcon, SplitButton, Splitter, SplitterPanel, StarFillIcon, StarIcon, Steps, StyleClass, TabMenu, TabPanel, TabView, Tag, Terminal, TerminalService, ThLargeIcon, TieredMenu, Timeline, TimesCircleIcon, TimesIcon, Toast, ToggleButton, Toolbar, Tooltip, TrashIcon, Tree, TreeSelect, TreeTable, TriStateCheckbox, UndoIcon, UniqueComponentId, UploadIcon, VirtualScroller, WindowMaximizeIcon, WindowMinimizeIcon, ZIndexUtils, _mergeProps, addLocale, ariaLabel$1 as ariaLabel, classNames, confirmDialog, confirmPopup, PrimeReact as default, locale, localeOption, localeOptions, mask, mergeProps, updateLocaleOption, updateLocaleOptions, useClickOutside, useCounter, useDebounce, useDisplayOrder, useEventListener, useFavicon, useGlobalOnEscapeKey, useIntersectionObserver, useInterval, useLocalStorage, useMatchMedia, useMergeProps, useMountEffect, useMouse, useMove, useOverlayListener, useOverlayScrollListener, usePrevious, useResizeListener, useSessionStorage, useStorage, useStyle, useTimeout, useUnmountEffect, useUpdateEffect };