primereact 10.3.1 → 10.3.2

package/core/core.js

@@ -2358,11 +2358,10 @@ this.primereact.utils = (function (exports, React) {
 
   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; }
-  function mergeProps() {
-    for (var _len = arguments.length, props = new Array(_len), _key = 0; _key < _len; _key++) {
-      props[_key] = arguments[_key];
-    }
+  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);
       };
@@ -2372,7 +2371,12 @@ this.primereact.utils = (function (exports, React) {
           if (key === 'style') {
             merged['style'] = _objectSpread(_objectSpread({}, 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)) {
@@ -2394,6 +2398,41 @@ this.primereact.utils = (function (exports, React) {
     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(_objectSpread({}, 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_';
@@ -2459,6 +2498,7 @@ this.primereact.utils = (function (exports, React) {
   exports.ObjectUtils = ObjectUtils;
   exports.UniqueComponentId = UniqueComponentId;
   exports.ZIndexUtils = ZIndexUtils;
+  exports._mergeProps = _mergeProps;
   exports.classNames = classNames;
   exports.mask = mask;
   exports.mergeProps = mergeProps;
@@ -3573,44 +3613,6 @@ this.primereact.componentbase = (function (exports, PrimeReact, hooks, utils) {
     return obj;
   }
 
-  function ownKeys$1(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$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(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];
-    }
-    if (props) {
-      var isFn = function isFn(o) {
-        return !!(o && o.constructor && o.call && o.apply);
-      };
-      return props.reduce(function (merged, ps) {
-        var _loop = function _loop() {
-          var value = ps[key];
-          if (key === 'style') {
-            merged['style'] = _objectSpread$1(_objectSpread$1({}, merged['style']), ps['style']);
-          } else if (key === 'className') {
-            var newClassname = [merged['className'], ps['className']].join(' ').trim();
-            var isEmpty = newClassname === null || newClassname === undefined || newClassname === '';
-            merged['className'] = isEmpty ? undefined : newClassname;
-          } 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) {
-          _loop();
-        }
-        return merged;
-      }, {});
-    }
-    return undefined;
-  }
-
   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 baseStyle = "\n.p-hidden-accessible {\n    border: 0;\n    clip: rect(0 0 0 0);\n    height: 1px;\n    margin: -1px;\n    overflow: hidden;\n    padding: 0;\n    position: absolute;\n    width: 1px;\n}\n\n.p-hidden-accessible input,\n.p-hidden-accessible select {\n    transform: scale(0);\n}\n\n.p-overflow-hidden {\n    overflow: hidden;\n    padding-right: var(--scrollbar-width);\n}\n";
@@ -3648,6 +3650,7 @@ this.primereact.componentbase = (function (exports, PrimeReact, hooks, utils) {
         return utils.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] : {};
@@ -3695,7 +3698,9 @@ this.primereact.componentbase = (function (exports, PrimeReact, hooks, utils) {
         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(_objectSpread({}, fkey === 'root' && _defineProperty({}, "".concat(datasetPrefix, "name"), params.props && params.props.__parentMetadata ? utils.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(_objectSpread(_objectSpread({}, globalPT), self), Object.keys(datasetProps).length ? datasetProps : {}) : _objectSpread(_objectSpread({}, self), Object.keys(datasetProps).length ? datasetProps : {});
+        return mergeSections || !mergeSections && self ? useMergeProps ? utils._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(_objectSpread(_objectSpread({}, globalPT), self), Object.keys(datasetProps).length ? datasetProps : {}) : _objectSpread(_objectSpread({}, self), Object.keys(datasetProps).length ? datasetProps : {});
       };
       var setMetaData = function setMetaData() {
         var metadata = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -3728,6 +3733,7 @@ this.primereact.componentbase = (function (exports, PrimeReact, hooks, utils) {
           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({
               props: props,
               state: state
@@ -3736,7 +3742,9 @@ this.primereact.componentbase = (function (exports, PrimeReact, hooks, utils) {
               props: props,
               state: state
             }, params));
-            return mergeProps(base, self);
+            return utils._mergeProps([base, self], {
+              classNameMergeFunction: (_ComponentBase$contex2 = ComponentBase.context.ptOptions) === null || _ComponentBase$contex2 === void 0 ? void 0 : _ComponentBase$contex2.classNameMergeFunction
+            });
           }
           return undefined;
         };
@@ -3793,11 +3801,14 @@ this.primereact.componentbase = (function (exports, PrimeReact, hooks, utils) {
         _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 (utils.ObjectUtils.isString(value)) return value;else if (utils.ObjectUtils.isString(originalValue)) return originalValue;
-      return mergeSections || !mergeSections && value ? useMergeProps ? mergeProps(originalValue, value) : _objectSpread(_objectSpread({}, originalValue), value) : value;
+      return mergeSections || !mergeSections && value ? useMergeProps ? utils._mergeProps([originalValue, value], {
+        classNameMergeFunction: classNameMergeFunction
+      }) : _objectSpread(_objectSpread({}, originalValue), value) : value;
     }
     return fn(pt);
   };
@@ -4137,7 +4148,7 @@ this.primereact.hooks = (function (exports, React, utils, PrimeReact) {
       }),
       _React$useState2 = _slicedToArray(_React$useState, 1),
       uid = _React$useState2[0];
-    var _React$useState3 = React__namespace.useState(),
+    var _React$useState3 = React__namespace.useState(0),
       _React$useState4 = _slicedToArray(_React$useState3, 2),
       displayOrder = _React$useState4[0],
       setDisplayOrder = _React$useState4[1];
@@ -4146,7 +4157,7 @@ this.primereact.hooks = (function (exports, React, utils, PrimeReact) {
         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 () {
@@ -4244,7 +4255,7 @@ this.primereact.hooks = (function (exports, React, utils, PrimeReact) {
      */
     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);
@@ -4300,7 +4311,7 @@ this.primereact.hooks = (function (exports, React, utils, PrimeReact) {
     React.useEffect(function () {
       if (!when) return;
       return globalEscKeyHandlingLogic.addListener(callback, priority);
-    }, [when, callback, priority]);
+    }, [callback, when, priority]);
   };
 
   var useIntersectionObserver = function useIntersectionObserver(ref) {
@@ -4382,24 +4393,6 @@ this.primereact.hooks = (function (exports, React, utils, PrimeReact) {
   };
   /* eslint-enable */
 
-  /* eslint-disable */
-
-  /**
-   * Custom hook to run a mount effect only once.
-   * @param {*} fn the callback function
-   * @returns the hook
-   */
-  var useMountEffect = function useMountEffect(fn) {
-    var mounted = React__namespace.useRef(false);
-    return React__namespace.useEffect(function () {
-      if (!mounted.current) {
-        mounted.current = true;
-        return fn && fn();
-      }
-    }, []);
-  };
-  /* eslint-enable */
-
   function _typeof(o) {
     "@babel/helpers - typeof";
 
@@ -4441,6 +4434,44 @@ this.primereact.hooks = (function (exports, React, utils, PrimeReact) {
     return obj;
   }
 
+  function ownKeys$2(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$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+
+  /**
+   * Hook to merge properties including custom merge function for things like Tailwind merge.
+   */
+  var useMergeProps = function useMergeProps() {
+    var context = React.useContext(PrimeReact.PrimeReactContext);
+    return function () {
+      var _context$ptOptions;
+      var options = _objectSpread$2({}, (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 utils._mergeProps(props, options);
+    };
+  };
+
+  /* eslint-disable */
+
+  /**
+   * Custom hook to run a mount effect only once.
+   * @param {*} fn the callback function
+   * @returns the hook
+   */
+  var useMountEffect = function useMountEffect(fn) {
+    var mounted = React__namespace.useRef(false);
+    return React__namespace.useEffect(function () {
+      if (!mounted.current) {
+        mounted.current = true;
+        return fn && fn();
+      }
+    }, []);
+  };
+  /* eslint-enable */
+
   function ownKeys$1(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$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
   var useMouse = function useMouse() {
@@ -5075,6 +5106,7 @@ this.primereact.hooks = (function (exports, React, utils, PrimeReact) {
   exports.useInterval = useInterval;
   exports.useLocalStorage = useLocalStorage;
   exports.useMatchMedia = useMatchMedia;
+  exports.useMergeProps = useMergeProps;
   exports.useMountEffect = useMountEffect;
   exports.useMouse = useMouse;
   exports.useMove = useMove;
@@ -5263,6 +5295,7 @@ this.primereact.ripple = (function (exports, React, PrimeReact, hooks, utils, co
       setMounted = _React$useState2[1];
     var inkRef = React__namespace.useRef(null);
     var targetRef = React__namespace.useRef(null);
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(PrimeReact.PrimeReactContext);
     var props = RippleBase.getProps(inProps, context);
     var isRippleActive = context && context.ripple || PrimeReact__default["default"].ripple;
@@ -5351,7 +5384,7 @@ this.primereact.ripple = (function (exports, React, PrimeReact, hooks, utils, co
       }
     });
     if (!isRippleActive) return null;
-    var rootProps = utils.mergeProps({
+    var rootProps = mergeProps({
       'aria-hidden': true,
       className: utils.classNames(cx('root'))
     }, RippleBase.getOtherProps(props), ptm('root'));
@@ -26300,6 +26333,7 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, componentbase,
   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 Tooltip = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(PrimeReact.PrimeReactContext);
     var props = TooltipBase.getProps(inProps, context);
     var _React$useState = React__namespace.useState(false),
@@ -26760,7 +26794,7 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, componentbase,
     });
     var createElement = function createElement() {
       var empty = isTargetContentEmpty(currentTargetRef.current);
-      var rootProps = utils.mergeProps({
+      var rootProps = mergeProps({
         id: props.id,
         className: utils.classNames(props.className, cx('root', {
           positionState: positionState,
@@ -26776,11 +26810,11 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, componentbase,
           return _onMouseLeave(e);
         }
       }, TooltipBase.getOtherProps(props), ptm('root'));
-      var arrowProps = utils.mergeProps({
+      var arrowProps = mergeProps({
         className: cx('arrow'),
         style: sx('arrow', _objectSpread({}, metaData))
       }, ptm('arrow'));
-      var textProps = utils.mergeProps({
+      var textProps = mergeProps({
         className: cx('text')
       }, ptm('text'));
       return /*#__PURE__*/React__namespace.createElement("div", _extends({
@@ -28026,6 +28060,7 @@ this.primereact.checkbox = (function (exports, React, api, componentbase, hooks,
   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 Checkbox = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(api.PrimeReactContext);
     var props = CheckboxBase.getProps(inProps, context);
     var _React$useState = React__namespace.useState(false),
@@ -28136,7 +28171,7 @@ this.primereact.checkbox = (function (exports, React, api, componentbase, hooks,
     var hasTooltip = utils.ObjectUtils.isNotEmpty(props.tooltip);
     var otherProps = CheckboxBase.getOtherProps(props);
     var ariaProps = utils.ObjectUtils.reduceKeys(otherProps, utils.DomHandler.ARIA_PROPS);
-    var iconProps = utils.mergeProps({
+    var iconProps = mergeProps({
       className: cx('icon')
     }, ptm('icon'));
     var icon = checked ? props.icon || /*#__PURE__*/React__namespace.createElement(check.CheckIcon, iconProps) : null;
@@ -28144,7 +28179,7 @@ this.primereact.checkbox = (function (exports, React, api, componentbase, hooks,
       props: props,
       checked: checked
     });
-    var rootProps = utils.mergeProps({
+    var rootProps = mergeProps({
       id: props.id,
       className: utils.classNames(props.className, cx('root', {
         checked: checked,
@@ -28157,10 +28192,10 @@ this.primereact.checkbox = (function (exports, React, api, componentbase, hooks,
       onContextMenu: props.onContextMenu,
       onMouseDown: props.onMouseDown
     }, otherProps, ptm('root'));
-    var hiddenInputWrapperProps = utils.mergeProps({
+    var hiddenInputWrapperProps = mergeProps({
       className: 'p-hidden-accessible'
     }, ptm('hiddenInputWrapper'));
-    var hiddenInputProps = utils.mergeProps(_objectSpread({
+    var hiddenInputProps = mergeProps(_objectSpread({
       id: props.inputId,
       type: 'checkbox',
       name: props.name,
@@ -28179,7 +28214,7 @@ this.primereact.checkbox = (function (exports, React, api, componentbase, hooks,
       readOnly: props.readOnly,
       required: props.required
     }, ariaProps), ptm('hiddenInput'));
-    var inputProps = utils.mergeProps({
+    var inputProps = mergeProps({
       className: cx('input', {
         checked: checked,
         focusedState: focusedState
@@ -28210,7 +28245,7 @@ this.primereact.checkbox = (function (exports, React, api, componentbase, hooks,
 })({}, React, primereact.api, primereact.componentbase, primereact.hooks, primereact.icons.check, primereact.tooltip, primereact.utils);
 
 this.primereact = this.primereact || {};
-this.primereact.button = (function (exports, React, api, componentbase, utils, spinner, ripple, tooltip) {
+this.primereact.button = (function (exports, React, api, componentbase, hooks, utils, spinner, ripple, tooltip) {
   'use strict';
 
   function _interopNamespace(e) {
@@ -28321,6 +28356,7 @@ this.primereact.button = (function (exports, React, api, componentbase, utils, s
   function ownKeys$1(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$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
   var Badge = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(api.PrimeReactContext);
     var props = BadgeBase.getProps(inProps, context);
     var _BadgeBase$setMetaDat = BadgeBase.setMetaData(_objectSpread$1({
@@ -28341,7 +28377,7 @@ this.primereact.button = (function (exports, React, api, componentbase, utils, s
         }
       };
     });
-    var rootProps = utils.mergeProps({
+    var rootProps = mergeProps({
       ref: elementRef,
       style: props.style,
       className: utils.classNames(props.className, cx('root'))
@@ -28415,6 +28451,7 @@ this.primereact.button = (function (exports, React, api, componentbase, utils, s
   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 Button = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(api.PrimeReactContext);
     var props = ButtonBase.getProps(inProps, context);
     var disabled = props.disabled || props.loading;
@@ -28442,13 +28479,13 @@ this.primereact.button = (function (exports, React, api, componentbase, utils, s
     }
     var createIcon = function createIcon() {
       var className = utils.classNames('p-button-icon p-c', _defineProperty({}, "p-button-icon-".concat(props.iconPos), props.label));
-      var iconsProps = utils.mergeProps({
+      var iconsProps = mergeProps({
         className: cx('icon')
       }, ptm('icon'));
       className = utils.classNames(className, {
         'p-button-loading-icon': props.loading
       });
-      var loadingIconProps = utils.mergeProps({
+      var loadingIconProps = mergeProps({
         className: cx('loadingIcon', {
           className: className
         })
@@ -28461,7 +28498,7 @@ this.primereact.button = (function (exports, React, api, componentbase, utils, s
       });
     };
     var createLabel = function createLabel() {
-      var labelProps = utils.mergeProps({
+      var labelProps = mergeProps({
         className: cx('label')
       }, ptm('label'));
       if (props.label) {
@@ -28475,7 +28512,7 @@ this.primereact.button = (function (exports, React, api, componentbase, utils, s
     };
     var createBadge = function createBadge() {
       if (props.badge) {
-        var badgeProps = utils.mergeProps({
+        var badgeProps = mergeProps({
           className: utils.classNames(props.badgeClassName),
           value: props.badge,
           unstyled: props.unstyled,
@@ -28498,7 +28535,7 @@ this.primereact.button = (function (exports, React, api, componentbase, utils, s
     var label = createLabel();
     var badge = createBadge();
     var defaultAriaLabel = props.label ? props.label + (props.badge ? ' ' + props.badge : '') : props['aria-label'];
-    var rootProps = utils.mergeProps({
+    var rootProps = mergeProps({
       ref: elementRef,
       'aria-label': defaultAriaLabel,
       className: utils.classNames(props.className, cx('root', {
@@ -28522,10 +28559,10 @@ this.primereact.button = (function (exports, React, api, componentbase, utils, s
 
   return exports;
 
-})({}, React, primereact.api, primereact.componentbase, primereact.utils, primereact.icons.spinner, primereact.ripple, primereact.tooltip);
+})({}, React, primereact.api, primereact.componentbase, primereact.hooks, primereact.utils, primereact.icons.spinner, primereact.ripple, primereact.tooltip);
 
 this.primereact = this.primereact || {};
-this.primereact.inputtext = (function (exports, React, api, componentbase, keyfilter, tooltip, utils) {
+this.primereact.inputtext = (function (exports, React, api, componentbase, hooks, keyfilter, tooltip, utils) {
   'use strict';
 
   function _interopNamespace(e) {
@@ -28637,6 +28674,7 @@ this.primereact.inputtext = (function (exports, React, api, componentbase, keyfi
   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 InputText = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(api.PrimeReactContext);
     var props = InputTextBase.getProps(inProps, context);
     var _InputTextBase$setMet = InputTextBase.setMetaData(_objectSpread(_objectSpread({
@@ -28690,7 +28728,7 @@ this.primereact.inputtext = (function (exports, React, api, componentbase, keyfi
       return utils.ObjectUtils.isNotEmpty(props.value) || utils.ObjectUtils.isNotEmpty(props.defaultValue);
     }, [props.value, props.defaultValue]);
     var hasTooltip = utils.ObjectUtils.isNotEmpty(props.tooltip);
-    var rootProps = utils.mergeProps({
+    var rootProps = mergeProps({
       className: utils.classNames(props.className, cx('root', {
         isFilled: isFilled
       })),
@@ -28716,7 +28754,7 @@ this.primereact.inputtext = (function (exports, React, api, componentbase, keyfi
 
   return exports;
 
-})({}, React, primereact.api, primereact.componentbase, primereact.keyfilter, primereact.tooltip, primereact.utils);
+})({}, React, primereact.api, primereact.componentbase, primereact.hooks, primereact.keyfilter, primereact.tooltip, primereact.utils);
 
 this.primereact = this.primereact || {};
 this.primereact.inputnumber = (function (exports, React, PrimeReact, componentbase, hooks, angledown, angleup, inputtext, ripple, tooltip, utils) {
@@ -28970,6 +29008,7 @@ this.primereact.inputnumber = (function (exports, React, PrimeReact, componentba
   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 InputNumber = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(PrimeReact.PrimeReactContext);
     var props = InputNumberBase.getProps(inProps, context);
     var _React$useState = React__namespace.useState(false),
@@ -29379,6 +29418,14 @@ this.primereact.inputnumber = (function (exports, React, PrimeReact, componentba
             updateValue(event, newValueStr, null, 'delete-range');
           }
           break;
+
+        // End
+        case 35:
+        // Home/Pos1
+        case 36:
+          setTimeout(function () {
+            initCursor();
+          });
       }
     };
     var onInputKeyUp = function onInputKeyUp(event) {
@@ -29713,7 +29760,12 @@ this.primereact.inputnumber = (function (exports, React, PrimeReact, componentba
           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);
@@ -29916,14 +29968,14 @@ this.primereact.inputnumber = (function (exports, React, PrimeReact, componentba
       }));
     };
     var createUpButton = function createUpButton() {
-      var incrementIconProps = utils.mergeProps({
+      var incrementIconProps = mergeProps({
         className: cx('incrementIcon')
       }, ptm('incrementIcon'));
       var icon = props.incrementButtonIcon || /*#__PURE__*/React__namespace.createElement(angleup.AngleUpIcon, incrementIconProps);
       var upButton = utils.IconUtils.getJSXIcon(icon, _objectSpread({}, incrementIconProps), {
         props: props
       });
-      var incrementButtonProps = utils.mergeProps({
+      var incrementButtonProps = mergeProps({
         type: 'button',
         className: utils.classNames(props.incrementButtonClassName, cx('incrementButton')),
         onPointerLeave: onUpButtonMouseLeave,
@@ -29942,14 +29994,14 @@ this.primereact.inputnumber = (function (exports, React, PrimeReact, componentba
       return /*#__PURE__*/React__namespace.createElement("button", incrementButtonProps, upButton, /*#__PURE__*/React__namespace.createElement(ripple.Ripple, null));
     };
     var createDownButton = function createDownButton() {
-      var decrementIconProps = utils.mergeProps({
+      var decrementIconProps = mergeProps({
         className: cx('decrementIcon')
       }, ptm('decrementIcon'));
       var icon = props.decrementButtonIcon || /*#__PURE__*/React__namespace.createElement(angledown.AngleDownIcon, decrementIconProps);
       var downButton = utils.IconUtils.getJSXIcon(icon, _objectSpread({}, decrementIconProps), {
         props: props
       });
-      var decrementButtonProps = utils.mergeProps({
+      var decrementButtonProps = mergeProps({
         type: 'button',
         className: utils.classNames(props.decrementButtonClassName, cx('decrementButton')),
         onPointerLeave: onDownButtonMouseLeave,
@@ -29970,7 +30022,7 @@ this.primereact.inputnumber = (function (exports, React, PrimeReact, componentba
     var createButtonGroup = function createButtonGroup() {
       var upButton = props.showButtons && createUpButton();
       var downButton = props.showButtons && createDownButton();
-      var buttonGroupProps = utils.mergeProps({
+      var buttonGroupProps = mergeProps({
         className: cx('buttonGroup')
       }, ptm('buttonGroup'));
       if (stacked) {
@@ -29984,7 +30036,7 @@ this.primereact.inputnumber = (function (exports, React, PrimeReact, componentba
     var ariaProps = utils.ObjectUtils.reduceKeys(otherProps, utils.DomHandler.ARIA_PROPS);
     var inputElement = createInputElement();
     var buttonGroup = createButtonGroup();
-    var rootProps = utils.mergeProps({
+    var rootProps = mergeProps({
       id: props.id,
       className: utils.classNames(props.className, cx('root', {
         focusedState: focusedState,
@@ -30014,7 +30066,7 @@ this.primereact.inputnumber = (function (exports, React, PrimeReact, componentba
 })({}, React, primereact.api, primereact.componentbase, primereact.hooks, primereact.icons.angledown, primereact.icons.angleup, primereact.inputtext, primereact.ripple, primereact.tooltip, primereact.utils);
 
 this.primereact = this.primereact || {};
-this.primereact.messages = (function (exports, React, reactTransitionGroup, api, componentbase, csstransition, utils, hooks, check, exclamationtriangle, infocircle, times, timescircle, ripple) {
+this.primereact.messages = (function (exports, React, reactTransitionGroup, api, componentbase, csstransition, hooks, utils, check, exclamationtriangle, infocircle, times, timescircle, ripple) {
   'use strict';
 
   function _interopNamespace(e) {
@@ -30342,6 +30394,7 @@ this.primereact.messages = (function (exports, React, reactTransitionGroup, api,
   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 messageIdx = 0;
   var Messages = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(api.PrimeReactContext);
     var props = MessagesBase.getProps(inProps, context);
     var _React$useState = React__namespace.useState([]),
@@ -30428,12 +30481,12 @@ this.primereact.messages = (function (exports, React, reactTransitionGroup, api,
         }
       };
     });
-    var rootProps = utils.mergeProps({
+    var rootProps = mergeProps({
       id: props.id,
       className: props.className,
       style: props.style
     }, MessagesBase.getOtherProps(props), ptCallbacks.ptm('root'));
-    var transitionProps = utils.mergeProps({
+    var transitionProps = mergeProps({
       classNames: ptCallbacks.cx('uimessage.transition'),
       unmountOnExit: true,
       timeout: {
@@ -30469,10 +30522,10 @@ this.primereact.messages = (function (exports, React, reactTransitionGroup, api,
 
   return exports;
 
-})({}, React, ReactTransitionGroup, primereact.api, primereact.componentbase, primereact.csstransition, primereact.utils, primereact.hooks, primereact.icons.check, primereact.icons.exclamationtriangle, primereact.icons.infocircle, primereact.icons.times, primereact.icons.timescircle, primereact.ripple);
+})({}, React, ReactTransitionGroup, primereact.api, primereact.componentbase, primereact.csstransition, primereact.hooks, primereact.utils, primereact.icons.check, primereact.icons.exclamationtriangle, primereact.icons.infocircle, primereact.icons.times, primereact.icons.timescircle, primereact.ripple);
 
 this.primereact = this.primereact || {};
-this.primereact.progressbar = (function (exports, React, api, componentbase, utils) {
+this.primereact.progressbar = (function (exports, React, api, componentbase, hooks, utils) {
   'use strict';
 
   function _interopNamespace(e) {
@@ -30600,6 +30653,7 @@ this.primereact.progressbar = (function (exports, React, api, componentbase, uti
   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 ProgressBar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(api.PrimeReactContext);
     var props = ProgressBarBase.getProps(inProps, context);
     var _ProgressBarBase$setM = ProgressBarBase.setMetaData(_objectSpread({
@@ -30621,7 +30675,7 @@ this.primereact.progressbar = (function (exports, React, api, componentbase, uti
     };
     var createDeterminate = function createDeterminate() {
       var label = createLabel();
-      var rootProps = utils.mergeProps({
+      var rootProps = mergeProps({
         className: utils.classNames(props.className, cx('root')),
         style: props.style,
         role: 'progressbar',
@@ -30629,7 +30683,7 @@ this.primereact.progressbar = (function (exports, React, api, componentbase, uti
         'aria-valuenow': props.value,
         'aria-valuemax': '100'
       }, ProgressBarBase.getOtherProps(props), ptm('root'));
-      var valueProps = utils.mergeProps({
+      var valueProps = mergeProps({
         className: cx('value'),
         style: {
           width: props.value + '%',
@@ -30637,7 +30691,7 @@ this.primereact.progressbar = (function (exports, React, api, componentbase, uti
           backgroundColor: props.color
         }
       }, ptm('value'));
-      var labelProps = utils.mergeProps({
+      var labelProps = mergeProps({
         className: cx('label')
       }, ptm('label'));
       return /*#__PURE__*/React__namespace.createElement("div", _extends({
@@ -30646,7 +30700,7 @@ this.primereact.progressbar = (function (exports, React, api, componentbase, uti
       }, rootProps), /*#__PURE__*/React__namespace.createElement("div", valueProps, label != null && /*#__PURE__*/React__namespace.createElement("div", labelProps, label)));
     };
     var createIndeterminate = function createIndeterminate() {
-      var rootProps = utils.mergeProps({
+      var rootProps = mergeProps({
         className: utils.classNames(props.className, cx('root')),
         style: props.style,
         role: 'progressbar',
@@ -30654,10 +30708,10 @@ this.primereact.progressbar = (function (exports, React, api, componentbase, uti
         'aria-valuenow': props.value,
         'aria-valuemax': '100'
       }, ProgressBarBase.getOtherProps(props), ptm('root'));
-      var containerProps = utils.mergeProps({
+      var containerProps = mergeProps({
         className: cx('container')
       }, ptm('container'));
-      var valueProps = utils.mergeProps({
+      var valueProps = mergeProps({
         className: cx('value'),
         style: {
           backgroundColor: props.color
@@ -30686,7 +30740,7 @@ this.primereact.progressbar = (function (exports, React, api, componentbase, uti
 
   return exports;
 
-})({}, React, primereact.api, primereact.componentbase, primereact.utils);
+})({}, React, primereact.api, primereact.componentbase, primereact.hooks, primereact.utils);
 
 this.primereact = this.primereact || {};
 this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase, hooks, chevrondown, spinner, times, overlayservice, tooltip, utils, csstransition, search, portal, virtualscroller, ripple) {
@@ -30859,6 +30913,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
     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 utils.classNames('p-dropdown-filter-container', {
@@ -30980,6 +31035,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
   });
 
   var DropdownItem = /*#__PURE__*/React__namespace.memo(function (props) {
+    var mergeProps = hooks.useMergeProps();
     var ptm = props.ptm,
       cx = props.cx,
       selected = props.selected,
@@ -31003,7 +31059,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
       }
     };
     var content = props.template ? utils.ObjectUtils.getJSXElement(props.template, props.option) : props.label;
-    var itemProps = utils.mergeProps({
+    var itemProps = mergeProps({
       role: 'option',
       key: props.label,
       className: utils.classNames(option.className, cx('item', {
@@ -31027,6 +31083,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
   function ownKeys$1(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$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
   var DropdownPanel = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
+    var mergeProps = hooks.useMergeProps();
     var ptm = props.ptm,
       cx = props.cx,
       sx = props.sx;
@@ -31073,7 +31130,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
     var createFooter = function createFooter() {
       if (props.panelFooterTemplate) {
         var content = utils.ObjectUtils.getJSXElement(props.panelFooterTemplate, props, props.onOverlayHide);
-        var footerProps = utils.mergeProps({
+        var footerProps = mergeProps({
           className: cx('footer')
         }, getPTOptions('footer'));
         return /*#__PURE__*/React__namespace.createElement("div", footerProps, content);
@@ -31102,7 +31159,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
     };
     var createEmptyMessage = function createEmptyMessage(emptyMessage, isFilter) {
       var message = utils.ObjectUtils.getJSXElement(emptyMessage, props) || PrimeReact.localeOption(isFilter ? 'emptyFilterMessage' : 'emptyMessage');
-      var emptyMessageProps = utils.mergeProps({
+      var emptyMessageProps = mergeProps({
         className: cx('emptyMessage')
       }, getPTOptions('emptyMessage'));
       return /*#__PURE__*/React__namespace.createElement("li", emptyMessageProps, message);
@@ -31118,11 +31175,12 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
         var groupContent = props.optionGroupTemplate ? utils.ObjectUtils.getJSXElement(props.optionGroupTemplate, option, index) : props.getOptionGroupLabel(option);
         var groupChildrenContent = createGroupChildren(option, style);
         var key = index + '_' + props.getOptionGroupRenderKey(option);
-        var itemGroupProps = utils.mergeProps({
+        var itemGroupProps = mergeProps({
           className: cx('itemGroup', {
             optionGroupLabel: optionGroupLabel
           }),
-          style: style
+          style: style,
+          'data-p-highlight': props.selected
         }, getPTOptions('itemGroup'));
         return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, {
           key: key
@@ -31156,15 +31214,15 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
     var createFilterClearIcon = function createFilterClearIcon() {
       if (props.showFilterClear && props.filterValue) {
         var ariaLabel = PrimeReact.localeOption('clear');
-        var clearIconProps = utils.mergeProps({
-          className: cx('clearIcon'),
+        var clearIconProps = mergeProps({
+          className: cx('filterClearIcon'),
           'aria-label': ariaLabel,
           onClick: function onClick() {
             return props.onFilterClearIconClick(function () {
               return utils.DomHandler.focus(filterInputRef.current);
             });
           }
-        }, getPTOptions('clearIcon'));
+        }, getPTOptions('filterClearIcon'));
         var icon = props.filterClearIcon || /*#__PURE__*/React__namespace.createElement(times.TimesIcon, clearIconProps);
         var filterClearIcon = utils.IconUtils.getJSXIcon(icon, _objectSpread$1({}, clearIconProps), {
           props: props
@@ -31176,19 +31234,19 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
     var createFilter = function createFilter() {
       if (props.filter) {
         var clearIcon = createFilterClearIcon();
-        var filterIconProps = utils.mergeProps({
+        var filterIconProps = mergeProps({
           className: cx('filterIcon')
         }, getPTOptions('filterIcon'));
         var icon = props.filterIcon || /*#__PURE__*/React__namespace.createElement(search.SearchIcon, filterIconProps);
         var filterIcon = utils.IconUtils.getJSXIcon(icon, _objectSpread$1({}, filterIconProps), {
           props: props
         });
-        var filterContainerProps = utils.mergeProps({
+        var filterContainerProps = mergeProps({
           className: cx('filterContainer', {
             clearIcon: clearIcon
           })
         }, getPTOptions('filterContainer'));
-        var filterInputProps = utils.mergeProps({
+        var filterInputProps = mergeProps({
           ref: filterInputRef,
           type: 'text',
           autoComplete: 'off',
@@ -31216,7 +31274,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
           };
           content = utils.ObjectUtils.getJSXElement(props.filterTemplate, defaultContentOptions);
         }
-        var headerProps = utils.mergeProps({
+        var headerProps = mergeProps({
           className: cx('header')
         }, getPTOptions('header'));
         return /*#__PURE__*/React__namespace.createElement("div", headerProps, content);
@@ -31243,7 +31301,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
           contentTemplate: function contentTemplate(options) {
             var emptyMessage = props.hasFilter ? props.emptyFilterMessage : props.emptyMessage;
             var content = isEmptyFilter ? createEmptyMessage(emptyMessage) : options.children;
-            var listProps = utils.mergeProps({
+            var listProps = mergeProps({
               ref: options.contentRef,
               style: options.style,
               className: utils.classNames(options.className, cx('list', {
@@ -31261,11 +31319,11 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
         }));
       } else {
         var items = createItems();
-        var wrapperProps = utils.mergeProps({
+        var wrapperProps = mergeProps({
           className: cx('wrapper'),
           style: sx('wrapper')
         }, getPTOptions('wrapper'));
-        var listProps = utils.mergeProps({
+        var listProps = mergeProps({
           className: cx('list'),
           role: 'listbox'
         }, getPTOptions('list'));
@@ -31276,14 +31334,14 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
       var filter = createFilter();
       var content = createContent();
       var footer = createFooter();
-      var panelProps = utils.mergeProps({
+      var panelProps = mergeProps({
         className: utils.classNames(props.panelClassName, cx('panel', {
           context: context
         })),
         style: sx('panel'),
         onClick: props.onClick
       }, getPTOptions('panel'));
-      var transitionProps = utils.mergeProps({
+      var transitionProps = mergeProps({
         classNames: cx('transition'),
         "in": props["in"],
         timeout: {
@@ -31317,6 +31375,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
   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 Dropdown = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(PrimeReact.PrimeReactContext);
     var props = DropdownBase.getProps(inProps, context);
     var _React$useState = React__namespace.useState(''),
@@ -31403,7 +31462,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
       }
     };
     var isClearClicked = function isClearClicked(event) {
-      return utils.DomHandler.hasClass(event.target, 'p-dropdown-clear-icon') || utils.DomHandler.hasClass(event.target, 'p-dropdown-filter-clear-icon');
+      return utils.DomHandler.isAttributeEquals(event.target, 'data-pc-section', 'clearicon') || utils.DomHandler.isAttributeEquals(event.target.parentElement || event.target, 'data-pc-section', 'filterclearicon');
     };
     var _onClick = function onClick(event) {
       if (props.disabled || props.loading) {
@@ -31415,7 +31474,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
       if (event.defaultPrevented) {
         return;
       }
-      if (utils.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))) {
         utils.DomHandler.focus(focusInputRef.current);
@@ -31718,6 +31777,9 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
           }
         });
       }
+      if (props.filter) {
+        resetFilter();
+      }
       updateEditableLabel();
     };
     var selectItem = function selectItem(event) {
@@ -31809,7 +31871,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
       utils.DomHandler.alignOverlay(overlayRef.current, inputRef.current.parentElement, props.appendTo || context && context.appendTo || PrimeReact__default["default"].appendTo);
     };
     var scrollInView = function scrollInView() {
-      var highlightItem = utils.DomHandler.findSingle(overlayRef.current, 'li.p-highlight');
+      var highlightItem = utils.DomHandler.findSingle(overlayRef.current, 'li[data-p-highlight="true"]');
       if (highlightItem && highlightItem.scrollIntoView) {
         highlightItem.scrollIntoView({
           block: 'nearest',
@@ -31929,10 +31991,10 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
           label: getOptionLabel(selectedOption)
         };
       }
-      var hiddenSelectedMessageProps = utils.mergeProps({
+      var hiddenSelectedMessageProps = mergeProps({
         className: 'p-hidden-accessible p-dropdown-hidden-select'
       }, ptm('hiddenSelectedMessage'));
-      var selectProps = utils.mergeProps({
+      var selectProps = mergeProps({
         ref: inputRef,
         required: props.required,
         defaultValue: option.value,
@@ -31940,16 +32002,16 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
         tabIndex: -1,
         'aria-hidden': 'true'
       }, ptm('select'));
-      var optionProps = utils.mergeProps({
+      var optionProps = mergeProps({
         value: option.value
       }, ptm('option'));
       return /*#__PURE__*/React__namespace.createElement("div", hiddenSelectedMessageProps, /*#__PURE__*/React__namespace.createElement("select", selectProps, /*#__PURE__*/React__namespace.createElement("option", optionProps, option.label)));
     };
     var createKeyboardHelper = function createKeyboardHelper() {
-      var hiddenSelectedMessageProps = utils.mergeProps({
+      var hiddenSelectedMessageProps = mergeProps({
         className: 'p-hidden-accessible'
       }, ptm('hiddenSelectedMessage'));
-      var inputProps = utils.mergeProps(_objectSpread({
+      var inputProps = mergeProps(_objectSpread({
         ref: focusInputRef,
         id: props.inputId,
         type: 'text',
@@ -31967,7 +32029,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
       var label = utils.ObjectUtils.isNotEmpty(selectedOption) ? getOptionLabel(selectedOption) : null;
       if (props.editable) {
         var value = label || props.value || '';
-        var inputProps = utils.mergeProps(_objectSpread({
+        var inputProps = mergeProps(_objectSpread({
           ref: inputRef,
           type: 'text',
           defaultValue: value,
@@ -31986,7 +32048,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
         return /*#__PURE__*/React__namespace.createElement("input", inputProps);
       } else {
         var content = props.valueTemplate ? utils.ObjectUtils.getJSXElement(props.valueTemplate, selectedOption, props) : label || props.placeholder || 'empty';
-        var _inputProps = utils.mergeProps({
+        var _inputProps = mergeProps({
           ref: inputRef,
           className: cx('input', {
             label: label
@@ -31998,7 +32060,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
     };
     var createClearIcon = function createClearIcon() {
       if (props.value != null && props.showClear && !props.disabled) {
-        var clearIconProps = utils.mergeProps({
+        var clearIconProps = mergeProps({
           className: cx('clearIcon'),
           onPointerUp: clear
         }, ptm('clearIcon'));
@@ -32010,7 +32072,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
       return null;
     };
     var createLoadingIcon = function createLoadingIcon() {
-      var loadingIconProps = utils.mergeProps({
+      var loadingIconProps = mergeProps({
         className: cx('loadingIcon'),
         'data-pr-overlay-visible': overlayVisibleState
       }, ptm('loadingIcon'));
@@ -32021,7 +32083,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
         props: props
       });
       var ariaLabel = props.placeholder || props.ariaLabel;
-      var loadingButtonProps = utils.mergeProps({
+      var loadingButtonProps = mergeProps({
         className: cx('trigger'),
         role: 'button',
         'aria-haspopup': 'listbox',
@@ -32031,7 +32093,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
       return /*#__PURE__*/React__namespace.createElement("div", loadingButtonProps, loadingIcon);
     };
     var createDropdownIcon = function createDropdownIcon() {
-      var dropdownIconProps = utils.mergeProps({
+      var dropdownIconProps = mergeProps({
         className: cx('dropdownIcon'),
         'data-pr-overlay-visible': overlayVisibleState
       }, ptm('dropdownIcon'));
@@ -32040,7 +32102,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
         props: props
       });
       var ariaLabel = props.placeholder || props.ariaLabel;
-      var triggerProps = utils.mergeProps({
+      var triggerProps = mergeProps({
         className: cx('trigger'),
         role: 'button',
         'aria-haspopup': 'listbox',
@@ -32059,7 +32121,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
     var labelElement = createLabel();
     var dropdownIcon = props.loading ? createLoadingIcon() : createDropdownIcon();
     var clearIcon = createClearIcon();
-    var rootProps = utils.mergeProps({
+    var rootProps = mergeProps({
       id: props.id,
       ref: elementRef,
       className: utils.classNames(props.className, cx('root', {
@@ -32408,6 +32470,7 @@ this.primereact.dialog = (function (exports, React, PrimeReact, componentbase, c
   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 Dialog = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(PrimeReact.PrimeReactContext);
     var props = DialogBase.getProps(inProps, context);
     var uniqueId = props.id ? props.id : utils.UniqueComponentId();
@@ -32466,7 +32529,7 @@ this.primereact.dialog = (function (exports, React, PrimeReact, componentbase, c
           onClose(event);
         }
       },
-      when: visibleState,
+      when: visibleState && displayOrder,
       priority: [hooks.ESC_KEY_HANDLING_PRIORITIES.DIALOG, displayOrder]
     });
     var _useEventListener = hooks.useEventListener({
@@ -32873,7 +32936,7 @@ this.primereact.dialog = (function (exports, React, PrimeReact, componentbase, c
     var createCloseIcon = function createCloseIcon() {
       if (props.closable) {
         var ariaLabel = props.ariaCloseIconLabel || PrimeReact.localeOption('close');
-        var closeButtonIconProps = utils.mergeProps({
+        var closeButtonIconProps = mergeProps({
           className: cx('closeButtonIcon'),
           'aria-hidden': true
         }, ptm('closeButtonIcon'));
@@ -32881,7 +32944,7 @@ this.primereact.dialog = (function (exports, React, PrimeReact, componentbase, c
         var headerCloseIcon = utils.IconUtils.getJSXIcon(icon, _objectSpread({}, closeButtonIconProps), {
           props: props
         });
-        var closeButtonProps = utils.mergeProps({
+        var closeButtonProps = mergeProps({
           ref: closeRef,
           type: 'button',
           className: cx('closeButton'),
@@ -32894,7 +32957,7 @@ this.primereact.dialog = (function (exports, React, PrimeReact, componentbase, c
     };
     var createMaximizeIcon = function createMaximizeIcon() {
       var icon;
-      var maximizableIconProps = utils.mergeProps({
+      var maximizableIconProps = mergeProps({
         className: cx('maximizableIcon')
       }, ptm('maximizableIcon'));
       if (!maximized) {
@@ -32906,7 +32969,7 @@ this.primereact.dialog = (function (exports, React, PrimeReact, componentbase, c
         props: props
       });
       if (props.maximizable) {
-        var maximizableButtonProps = utils.mergeProps({
+        var maximizableButtonProps = mergeProps({
           type: 'button',
           className: cx('maximizableButton'),
           onClick: toggleMaximize
@@ -32922,17 +32985,17 @@ this.primereact.dialog = (function (exports, React, PrimeReact, componentbase, c
         var icons = utils.ObjectUtils.getJSXElement(props.icons, props);
         var header = utils.ObjectUtils.getJSXElement(props.header, props);
         var headerId = idState + '_header';
-        var headerProps = utils.mergeProps({
+        var headerProps = mergeProps({
           ref: headerRef,
           style: props.headerStyle,
           className: cx('header'),
           onMouseDown: onDragStart
         }, ptm('header'));
-        var headerTitleProps = utils.mergeProps({
+        var headerTitleProps = mergeProps({
           id: headerId,
           className: cx('headerTitle')
         }, ptm('headerTitle'));
-        var headerIconsProps = utils.mergeProps({
+        var headerIconsProps = mergeProps({
           className: cx('headerIcons')
         }, ptm('headerIcons'));
         return /*#__PURE__*/React__namespace.createElement("div", headerProps, /*#__PURE__*/React__namespace.createElement("div", headerTitleProps, header), /*#__PURE__*/React__namespace.createElement("div", headerIconsProps, icons, maximizeIcon, closeIcon));
@@ -32941,7 +33004,7 @@ this.primereact.dialog = (function (exports, React, PrimeReact, componentbase, c
     };
     var createContent = function createContent() {
       var contentId = idState + '_content';
-      var contentProps = utils.mergeProps({
+      var contentProps = mergeProps({
         id: contentId,
         ref: contentRef,
         style: props.contentStyle,
@@ -32951,7 +33014,7 @@ this.primereact.dialog = (function (exports, React, PrimeReact, componentbase, c
     };
     var createFooter = function createFooter() {
       var footer = utils.ObjectUtils.getJSXElement(props.footer, props);
-      var footerProps = utils.mergeProps({
+      var footerProps = mergeProps({
         ref: footerRef,
         className: cx('footer')
       }, ptm('footer'));
@@ -33010,13 +33073,13 @@ this.primereact.dialog = (function (exports, React, PrimeReact, componentbase, c
         enter: props.position === 'center' ? 150 : 300,
         exit: props.position === 'center' ? 150 : 300
       };
-      var maskProps = utils.mergeProps({
+      var maskProps = mergeProps({
         ref: maskRef,
         style: sx('mask'),
         className: cx('mask'),
         onPointerUp: onMaskPointerUp
       }, ptm('mask'));
-      var rootProps = utils.mergeProps({
+      var rootProps = mergeProps({
         ref: dialogRef,
         id: idState,
         className: cx('root', {
@@ -33032,7 +33095,7 @@ this.primereact.dialog = (function (exports, React, PrimeReact, componentbase, c
         'aria-modal': props.modal,
         onPointerDown: onDialogPointerDown
       }, DialogBase.getOtherProps(props), ptm('root'));
-      var transitionProps = utils.mergeProps({
+      var transitionProps = mergeProps({
         classNames: cx('transition'),
         timeout: transitionTimeout,
         "in": visibleState,
@@ -33368,6 +33431,7 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
   function ownKeys$5(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$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
   var CurrentPageReport = /*#__PURE__*/React__namespace.memo(function (inProps) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(api.PrimeReactContext);
     var props = CurrentPageReportBase.getProps(inProps, context);
     var report = {
@@ -33379,7 +33443,8 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
       totalRecords: props.totalRecords
     };
     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 = utils.mergeProps({
+    var currentProps = mergeProps({
+      'aria-live': 'polite',
       className: 'p-paginator-current'
     }, props.ptm('current', {
       hostName: props.hostName
@@ -33387,6 +33452,7 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
     var element = /*#__PURE__*/React__namespace.createElement("span", currentProps, text);
     if (props.template) {
       var defaultOptions = _objectSpread$5(_objectSpread$5({}, report), {
+        ariaLive: 'polite',
         className: 'p-paginator-current',
         element: element,
         props: props
@@ -33400,6 +33466,7 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
   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 FirstPageLink = /*#__PURE__*/React__namespace.memo(function (inProps) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(api.PrimeReactContext);
     var props = FirstPageLinkBase.getProps(inProps, context);
     var ptm = props.ptm,
@@ -33416,14 +33483,14 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
       'p-disabled': props.disabled
     });
     var iconClassName = 'p-paginator-icon';
-    var firstPageIconProps = utils.mergeProps({
+    var firstPageIconProps = mergeProps({
       className: cx('firstPageIcon')
     }, getPTOptions('firstPageIcon'));
     var icon = props.firstPageLinkIcon || /*#__PURE__*/React__namespace.createElement(angledoubleleft.AngleDoubleLeftIcon, firstPageIconProps);
     var firstPageLinkIcon = utils.IconUtils.getJSXIcon(icon, _objectSpread$4({}, firstPageIconProps), {
       props: props
     });
-    var firstPageButtonProps = utils.mergeProps({
+    var firstPageButtonProps = mergeProps({
       type: 'button',
       className: cx('firstPageButton', {
         disabled: props.disabled
@@ -33449,8 +33516,10 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
   FirstPageLink.displayName = 'FirstPageLink';
 
   var JumpToPageInput = /*#__PURE__*/React__namespace.memo(function (inProps) {
+    hooks.useMergeProps();
     var context = React__namespace.useContext(api.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);
@@ -33466,7 +33535,8 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
       unstyled: props.unstyled,
       __parentMetadata: {
         parent: props.metaData
-      }
+      },
+      "aria-label": ariaLabelValue
     });
     if (props.template) {
       var defaultOptions = {
@@ -33474,6 +33544,7 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
         onChange: onChange,
         disabled: props.disabled,
         className: 'p-paginator-page-input',
+        ariaLabel: ariaLabelValue,
         element: element,
         props: props
       };
@@ -33486,6 +33557,7 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
   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 LastPageLink = /*#__PURE__*/React__namespace.memo(function (inProps) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(api.PrimeReactContext);
     var props = LastPageLinkBase.getProps(inProps, context);
     var ptm = props.ptm,
@@ -33502,14 +33574,14 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
       'p-disabled': props.disabled
     });
     var iconClassName = 'p-paginator-icon';
-    var lastPageIconProps = utils.mergeProps({
+    var lastPageIconProps = mergeProps({
       className: cx('lastPageIcon')
     }, getPTOptions('lastPageIcon'));
     var icon = props.lastPageLinkIcon || /*#__PURE__*/React__namespace.createElement(angledoubleright.AngleDoubleRightIcon, lastPageIconProps);
     var lastPageLinkIcon = utils.IconUtils.getJSXIcon(icon, _objectSpread$3({}, lastPageIconProps), {
       props: props
     });
-    var lastPageButtonProps = utils.mergeProps({
+    var lastPageButtonProps = mergeProps({
       type: 'button',
       className: cx('lastPageButton', {
         disabled: props.disabled
@@ -33537,6 +33609,7 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
   function ownKeys$2(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$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
   var NextPageLink = /*#__PURE__*/React__namespace.memo(function (inProps) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(api.PrimeReactContext);
     var props = NextPageLinkBase.getProps(inProps, context);
     var ptm = props.ptm,
@@ -33553,14 +33626,14 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
       'p-disabled': props.disabled
     });
     var iconClassName = 'p-paginator-icon';
-    var nextPageIconProps = utils.mergeProps({
+    var nextPageIconProps = mergeProps({
       className: cx('nextPageIcon')
     }, getPTOptions('nextPageIcon'));
     var icon = props.nextPageLinkIcon || /*#__PURE__*/React__namespace.createElement(angleright.AngleRightIcon, nextPageIconProps);
     var nextPageLinkIcon = utils.IconUtils.getJSXIcon(icon, _objectSpread$2({}, nextPageIconProps), {
       props: props
     });
-    var nextPageButtonProps = utils.mergeProps({
+    var nextPageButtonProps = mergeProps({
       type: 'button',
       className: cx('nextPageButton', {
         disabled: props.disabled
@@ -33587,6 +33660,7 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
   NextPageLink.displayName = 'NextPageLink';
 
   var PageLinks = /*#__PURE__*/React__namespace.memo(function (inProps) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(api.PrimeReactContext);
     var props = PageLinksBase.getProps(inProps, context);
     var ptm = props.ptm,
@@ -33618,7 +33692,7 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
           'p-paginator-page-end': pageLink === endPageInView,
           'p-highlight': pageLink - 1 === props.page
         });
-        var pageButtonProps = utils.mergeProps({
+        var pageButtonProps = mergeProps({
           type: 'button',
           onClick: function onClick(e) {
             return onPageLinkClick(e, pageLink);
@@ -33632,7 +33706,8 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
           disabled: props.disabled,
           'aria-label': api.ariaLabel('pageLabel', {
             page: pageLink
-          })
+          }),
+          'aria-current': pageLink - 1 === props.page ? 'true' : undefined
         }, getPTOptions(pageLink, 'pageButton'));
         var element = /*#__PURE__*/React__namespace.createElement("button", pageButtonProps, pageLink, /*#__PURE__*/React__namespace.createElement(ripple.Ripple, null));
         if (props.template) {
@@ -33648,6 +33723,10 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
             page: pageLink - 1,
             currentPage: props.page,
             totalPages: props.pageCount,
+            ariaLabel: api.ariaLabel('pageLabel', {
+              page: pageLink
+            }),
+            ariaCurrent: pageLink - 1 === props.page ? 'true' : undefined,
             element: element,
             props: props
           };
@@ -33658,7 +33737,7 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
         }, element);
       });
     }
-    var pagesProps = utils.mergeProps({
+    var pagesProps = mergeProps({
       className: cx('pages')
     }, ptm('pages', {
       hostName: props.hostName
@@ -33670,6 +33749,7 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
   function ownKeys$1(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$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
   var PrevPageLink = /*#__PURE__*/React__namespace.memo(function (inProps) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(api.PrimeReactContext);
     var props = PrevPageLinkBase.getProps(inProps, context);
     var ptm = props.ptm,
@@ -33686,14 +33766,14 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
       'p-disabled': props.disabled
     });
     var iconClassName = 'p-paginator-icon';
-    var prevPageIconProps = utils.mergeProps({
+    var prevPageIconProps = mergeProps({
       className: cx('prevPageIcon')
     }, getPTOptions('prevPageIcon'));
     var icon = props.prevPageLinkIcon || /*#__PURE__*/React__namespace.createElement(angleleft.AngleLeftIcon, prevPageIconProps);
     var prevPageLinkIcon = utils.IconUtils.getJSXIcon(icon, _objectSpread$1({}, prevPageIconProps), {
       props: props
     });
-    var prevPageButtonProps = utils.mergeProps({
+    var prevPageButtonProps = mergeProps({
       type: 'button',
       className: cx('prevPageButton', {
         disabled: props.disabled
@@ -33718,7 +33798,237 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
   });
   PrevPageLink.displayName = 'PrevPageLink';
 
+  function _defineProperties(target, props) {
+    for (var i = 0; i < props.length; i++) {
+      var descriptor = props[i];
+      descriptor.enumerable = descriptor.enumerable || false;
+      descriptor.configurable = true;
+      if ("value" in descriptor) descriptor.writable = true;
+      Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
+    }
+  }
+  function _createClass(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    Object.defineProperty(Constructor, "prototype", {
+      writable: false
+    });
+    return Constructor;
+  }
+
+  function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+      throw new TypeError("Cannot call a class as a function");
+    }
+  }
+
+  var FilterMatchMode = Object.freeze({
+    STARTS_WITH: 'startsWith',
+    CONTAINS: 'contains',
+    NOT_CONTAINS: 'notContains',
+    ENDS_WITH: 'endsWith',
+    EQUALS: 'equals',
+    NOT_EQUALS: 'notEquals',
+    IN: 'in',
+    LESS_THAN: 'lt',
+    LESS_THAN_OR_EQUAL_TO: 'lte',
+    GREATER_THAN: 'gt',
+    GREATER_THAN_OR_EQUAL_TO: 'gte',
+    BETWEEN: 'between',
+    DATE_IS: 'dateIs',
+    DATE_IS_NOT: 'dateIsNot',
+    DATE_BEFORE: 'dateBefore',
+    DATE_AFTER: 'dateAfter',
+    CUSTOM: 'custom'
+  });
+
+  /**
+   * @deprecated please use PrimeReactContext
+   */
+  var PrimeReact = /*#__PURE__*/_createClass(function PrimeReact() {
+    _classCallCheck(this, PrimeReact);
+  });
+  _defineProperty(PrimeReact, "ripple", false);
+  _defineProperty(PrimeReact, "inputStyle", 'outlined');
+  _defineProperty(PrimeReact, "locale", 'en');
+  _defineProperty(PrimeReact, "appendTo", null);
+  _defineProperty(PrimeReact, "cssTransition", true);
+  _defineProperty(PrimeReact, "autoZIndex", true);
+  _defineProperty(PrimeReact, "hideOverlaysOnDocumentScrolling", false);
+  _defineProperty(PrimeReact, "nonce", null);
+  _defineProperty(PrimeReact, "nullSortOrder", 1);
+  _defineProperty(PrimeReact, "zIndex", {
+    modal: 1100,
+    overlay: 1000,
+    menu: 1000,
+    tooltip: 1100,
+    toast: 1200
+  });
+  _defineProperty(PrimeReact, "pt", undefined);
+  _defineProperty(PrimeReact, "filterMatchModeOptions", {
+    text: [FilterMatchMode.STARTS_WITH, FilterMatchMode.CONTAINS, FilterMatchMode.NOT_CONTAINS, FilterMatchMode.ENDS_WITH, FilterMatchMode.EQUALS, FilterMatchMode.NOT_EQUALS],
+    numeric: [FilterMatchMode.EQUALS, FilterMatchMode.NOT_EQUALS, FilterMatchMode.LESS_THAN, FilterMatchMode.LESS_THAN_OR_EQUAL_TO, FilterMatchMode.GREATER_THAN, FilterMatchMode.GREATER_THAN_OR_EQUAL_TO],
+    date: [FilterMatchMode.DATE_IS, FilterMatchMode.DATE_IS_NOT, FilterMatchMode.DATE_BEFORE, FilterMatchMode.DATE_AFTER]
+  });
+  _defineProperty(PrimeReact, "changeTheme", function (currentTheme, newTheme, linkElementId, callback) {
+    var _linkElement$parentNo;
+    var linkElement = document.getElementById(linkElementId);
+    var cloneLinkElement = linkElement.cloneNode(true);
+    var newThemeUrl = linkElement.getAttribute('href').replace(currentTheme, newTheme);
+    cloneLinkElement.setAttribute('id', linkElementId + '-clone');
+    cloneLinkElement.setAttribute('href', newThemeUrl);
+    cloneLinkElement.addEventListener('load', function () {
+      linkElement.remove();
+      cloneLinkElement.setAttribute('id', linkElementId);
+      if (callback) {
+        callback();
+      }
+    });
+    (_linkElement$parentNo = linkElement.parentNode) === null || _linkElement$parentNo === void 0 || _linkElement$parentNo.insertBefore(cloneLinkElement, linkElement.nextSibling);
+  });
+
+  var locales = {
+    en: {
+      startsWith: 'Starts with',
+      contains: 'Contains',
+      notContains: 'Not contains',
+      endsWith: 'Ends with',
+      equals: 'Equals',
+      notEquals: 'Not equals',
+      noFilter: 'No Filter',
+      filter: 'Filter',
+      lt: 'Less than',
+      lte: 'Less than or equal to',
+      gt: 'Greater than',
+      gte: 'Greater than or equal to',
+      dateIs: 'Date is',
+      dateIsNot: 'Date is not',
+      dateBefore: 'Date is before',
+      dateAfter: 'Date is after',
+      custom: 'Custom',
+      clear: 'Clear',
+      close: 'Close',
+      apply: 'Apply',
+      matchAll: 'Match All',
+      matchAny: 'Match Any',
+      addRule: 'Add Rule',
+      removeRule: 'Remove Rule',
+      accept: 'Yes',
+      reject: 'No',
+      choose: 'Choose',
+      upload: 'Upload',
+      cancel: 'Cancel',
+      completed: 'Completed',
+      pending: 'Pending',
+      fileSizeTypes: ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
+      dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+      dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+      dayNamesMin: ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'],
+      monthNames: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
+      monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+      today: 'Today',
+      weekHeader: 'Wk',
+      firstDayOfWeek: 0,
+      showMonthAfterYear: false,
+      dateFormat: 'mm/dd/yy',
+      weak: 'Weak',
+      medium: 'Medium',
+      strong: 'Strong',
+      passwordPrompt: 'Enter a password',
+      emptyFilterMessage: 'No available options',
+      emptyMessage: 'No results found',
+      aria: {
+        trueLabel: 'True',
+        falseLabel: 'False',
+        nullLabel: 'Not Selected',
+        star: '1 star',
+        stars: '{star} stars',
+        selectAll: 'All items selected',
+        unselectAll: 'All items unselected',
+        close: 'Close',
+        previous: 'Previous',
+        next: 'Next',
+        navigation: 'Navigation',
+        scrollTop: 'Scroll Top',
+        moveTop: 'Move Top',
+        moveUp: 'Move Up',
+        moveDown: 'Move Down',
+        moveBottom: 'Move Bottom',
+        moveToTarget: 'Move to Target',
+        moveToSource: 'Move to Source',
+        moveAllToTarget: 'Move All to Target',
+        moveAllToSource: 'Move All to Source',
+        pageLabel: 'Page {page}',
+        firstPageLabel: 'First Page',
+        lastPageLabel: 'Last Page',
+        nextPageLabel: 'Next Page',
+        previousPageLabel: 'Previous Page',
+        rowsPerPageLabel: 'Rows per page',
+        jumpToPageDropdownLabel: 'Jump to Page Dropdown',
+        jumpToPageInputLabel: 'Jump to Page Input',
+        selectRow: 'Row Selected',
+        unselectRow: 'Row Unselected',
+        expandRow: 'Row Expanded',
+        collapseRow: 'Row Collapsed',
+        showFilterMenu: 'Show Filter Menu',
+        hideFilterMenu: 'Hide Filter Menu',
+        filterOperator: 'Filter Operator',
+        filterConstraint: 'Filter Constraint',
+        editRow: 'Row Edit',
+        saveEdit: 'Save Edit',
+        cancelEdit: 'Cancel Edit',
+        listView: 'List View',
+        gridView: 'Grid View',
+        slide: 'Slide',
+        slideNumber: '{slideNumber}',
+        zoomImage: 'Zoom Image',
+        zoomIn: 'Zoom In',
+        zoomOut: 'Zoom Out',
+        rotateRight: 'Rotate Right',
+        rotateLeft: 'Rotate Left',
+        selectLabel: 'Select',
+        unselectLabel: 'Unselect',
+        expandLabel: 'Expand',
+        collapseLabel: 'Collapse'
+      }
+    }
+  };
+
+  /**
+   * Find an ARIA label in the locale by key.  If options are passed it will replace all options:
+   * ```ts
+   * const ariaValue = "Page {page}, User {user}, Role {role}";
+   * const options = { page: 2, user: "John", role: "Admin" };
+   * const result = ariaLabel('yourLabel', { page: 2, user: "John", role: "Admin" })
+   * console.log(result); // Output: Page 2, User John, Role Admin
+   * ```
+   * @param {string} ariaKey key of the ARIA label to look up in locale.
+   * @param {any} options JSON options like { page: 2, user: "John", role: "Admin" }
+   * @returns the ARIA label with replaced values
+   */
+  function ariaLabel$1(ariaKey, options) {
+    var _locale = PrimeReact.locale;
+    try {
+      var _ariaLabel = localeOptions(_locale)['aria'][ariaKey];
+      if (_ariaLabel) {
+        for (var key in options) {
+          if (options.hasOwnProperty(key)) {
+            _ariaLabel = _ariaLabel.replace("{".concat(key, "}"), options[key]);
+          }
+        }
+      }
+      return _ariaLabel;
+    } catch (error) {
+      throw new Error("The ".concat(ariaKey, " option is not found in the current locale('").concat(_locale, "')."));
+    }
+  }
+  function localeOptions(locale) {
+    var _locale = locale || PrimeReact.locale;
+    return locales[_locale];
+  }
+
   var RowsPerPageDropdown = /*#__PURE__*/React__namespace.memo(function (inProps) {
+    hooks.useMergeProps();
     var context = React__namespace.useContext(api.PrimeReactContext);
     var props = RowsPerPageDropdownBase.getProps(inProps, context);
     var hasOptions = props.options && props.options.length > 0;
@@ -33728,21 +34038,22 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
         value: opt
       };
     }) : [];
-    var ariaLabel = api.localeOption('choose');
-    var element = hasOptions ? /*#__PURE__*/React__namespace.createElement(dropdown.Dropdown, {
+    var placeholderValue = api.localeOption('choose');
+    var ariaLabelValue = ariaLabel$1('rowsPerPage');
+    var element = hasOptions ? /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(dropdown.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,
@@ -33753,6 +34064,7 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
         totalPages: props.pageCount,
         totalRecords: props.totalRecords,
         disabled: props.disabled,
+        ariaLabel: ariaLabelValue,
         element: element,
         props: props
       };
@@ -33765,6 +34077,7 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
   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 Paginator = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(api.PrimeReactContext);
     var props = PaginatorBase.getProps(inProps, context);
     var metaData = _objectSpread({
@@ -34002,15 +34315,15 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
       var leftContent = utils.ObjectUtils.getJSXElement(props.leftContent, props);
       var rightContent = utils.ObjectUtils.getJSXElement(props.rightContent, props);
       var elements = createElements();
-      var leftProps = utils.mergeProps({
+      var leftProps = mergeProps({
         className: cx('left')
       }, ptm('left'));
       var leftElement = leftContent && /*#__PURE__*/React__namespace.createElement("div", leftProps, leftContent);
-      var endProps = utils.mergeProps({
+      var endProps = mergeProps({
         className: cx('end')
       }, ptm('end'));
       var rightElement = rightContent && /*#__PURE__*/React__namespace.createElement("div", endProps, rightContent);
-      var rootProps = utils.mergeProps({
+      var rootProps = mergeProps({
         ref: elementRef,
         className: utils.classNames(props.className, cx('root')),
         style: props.style
@@ -34029,7 +34342,7 @@ this.primereact.paginator = (function (exports, React, api, componentbase, hooks
 })({}, React, primereact.api, primereact.componentbase, primereact.hooks, primereact.utils, primereact.icons.angledoubleleft, primereact.ripple, primereact.inputnumber, primereact.icons.angledoubleright, primereact.icons.angleright, primereact.icons.angleleft, primereact.dropdown);
 
 this.primereact = this.primereact || {};
-this.primereact.tree = (function (exports, React, api, componentbase, search, spinner, utils, check, chevrondown, chevronright, minus, ripple) {
+this.primereact.tree = (function (exports, React, api, componentbase, hooks, search, spinner, utils, check, chevrondown, chevronright, minus, ripple) {
   'use strict';
 
   function _interopNamespace(e) {
@@ -34179,6 +34492,19 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
     return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray$2(arr, i) || _nonIterableRest();
   }
 
+  /* eslint-disable */
+  var useUpdateEffect = function useUpdateEffect(fn, deps) {
+    var mounted = React__namespace.useRef(false);
+    return React__namespace.useEffect(function () {
+      if (!mounted.current) {
+        mounted.current = true;
+        return;
+      }
+      return fn && fn();
+    }, deps);
+  };
+  /* eslint-enable */
+
   var classes = {
     container: 'p-tree-container',
     loadingIcon: 'p-tree-loading-icon',
@@ -34303,6 +34629,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
     var contentRef = React__namespace.useRef(null);
     var elementRef = React__namespace.useRef(null);
     var nodeTouched = React__namespace.useRef(false);
+    var mergeProps = hooks.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;
@@ -34832,7 +35159,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
       }
     };
     var createLabel = function createLabel() {
-      var labelProps = utils.mergeProps({
+      var labelProps = mergeProps({
         className: cx('label')
       }, getPTOptions('label'));
       var content = /*#__PURE__*/React__namespace.createElement("span", labelProps, label);
@@ -34852,16 +35179,16 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
       if (isCheckboxSelectionMode() && props.node.selectable !== false) {
         var checked = isChecked();
         var partialChecked = isPartialChecked();
-        var checkboxIconProps = utils.mergeProps({
+        var checkboxIconProps = mergeProps({
           className: cx('checkboxIcon')
         }, getPTOptions('checkboxIcon'));
         var icon = checked ? props.checkboxIcon || /*#__PURE__*/React__namespace.createElement(check.CheckIcon, checkboxIconProps) : partialChecked ? props.checkboxIcon || /*#__PURE__*/React__namespace.createElement(minus.MinusIcon, checkboxIconProps) : null;
         var checkboxIcon = utils.IconUtils.getJSXIcon(icon, _objectSpread$1({}, checkboxIconProps), props);
-        var checkboxContainerProps = utils.mergeProps({
+        var checkboxContainerProps = mergeProps({
           'aria-hidden': true,
           className: cx('checkboxContainer')
         }, getPTOptions('checkboxContainer'));
-        var checkboxProps = utils.mergeProps({
+        var checkboxProps = mergeProps({
           className: cx('checkbox', {
             checked: checked,
             partialChecked: partialChecked,
@@ -34876,7 +35203,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
     var createIcon = function createIcon() {
       var icon = props.node.icon || (expanded ? props.node.expandedIcon : props.node.collapsedIcon);
       if (icon) {
-        var nodeIconProps = utils.mergeProps({
+        var nodeIconProps = mergeProps({
           className: utils.classNames(icon, cx('nodeIcon'))
         }, getPTOptions('nodeIcon'));
         return /*#__PURE__*/React__namespace.createElement("span", nodeIconProps);
@@ -34884,7 +35211,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
       return null;
     };
     var createToggler = function createToggler() {
-      var togglerIconProps = utils.mergeProps({
+      var togglerIconProps = mergeProps({
         className: cx('togglerIcon'),
         'aria-hidden': true
       }, getPTOptions('togglerIcon'));
@@ -34893,7 +35220,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
         props: props,
         expanded: expanded
       });
-      var togglerProps = utils.mergeProps({
+      var togglerProps = mergeProps({
         type: 'button',
         className: cx('toggler'),
         tabIndex: -1,
@@ -34916,7 +35243,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
     };
     var createDropPoint = function createDropPoint(position) {
       if (props.dragdropScope) {
-        var droppointProps = utils.mergeProps({
+        var droppointProps = mergeProps({
           className: cx('droppoint'),
           onDrop: function onDrop(event) {
             return onDropPoint(event, position);
@@ -34936,7 +35263,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
       var checkbox = createCheckbox();
       var icon = createIcon();
       var label = createLabel();
-      var contentProps = utils.mergeProps({
+      var contentProps = mergeProps({
         ref: contentRef,
         className: utils.classNames(props.node.className, cx('content', {
           checked: checked,
@@ -34955,12 +35282,13 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
         onDragEnter: onDragEnter,
         onDragLeave: onDragLeave,
         onDragStart: onDragStart,
-        onDragEnd: onDragEnd
+        onDragEnd: onDragEnd,
+        'data-p-highlight': isCheckboxSelectionMode() ? checked : selected
       }, getPTOptions('content'));
       return /*#__PURE__*/React__namespace.createElement("div", contentProps, toggler, checkbox, icon, label);
     };
     var createChildren = function createChildren() {
-      var subgroupProps = utils.mergeProps({
+      var subgroupProps = mergeProps({
         className: cx('subgroup'),
         role: 'group'
       }, getPTOptions('subgroup'));
@@ -35017,7 +35345,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
       var checked = isChecked();
       var content = createContent();
       var children = createChildren();
-      var nodeProps = utils.mergeProps(_defineProperty(_defineProperty({
+      var nodeProps = mergeProps(_defineProperty(_defineProperty({
         ref: elementRef,
         className: utils.classNames(props.node.className, cx('node', {
           isLeaf: isLeaf
@@ -35045,25 +35373,13 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
   });
   UITreeNode.displayName = 'UITreeNode';
 
-  /* eslint-disable */
-  var useUpdateEffect = function useUpdateEffect(fn, deps) {
-    var mounted = React__namespace.useRef(false);
-    return React__namespace.useEffect(function () {
-      if (!mounted.current) {
-        mounted.current = true;
-        return;
-      }
-      return fn && fn();
-    }, deps);
-  };
-  /* eslint-enable */
-
   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; }
   function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
   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 Tree = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+    var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(api.PrimeReactContext);
     var props = TreeBase.getProps(inProps, context);
     var _React$useState = React__namespace.useState(''),
@@ -35118,7 +35434,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
         if (navigateFocusToChild) {
           childFocusEvent.current = originalEvent;
         }
-        setExpandedKeysState(event.value);
+        setExpandedKeysState(value);
       }
     };
     useUpdateEffect(function () {
@@ -35456,7 +35772,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
     var createModel = function createModel() {
       if (props.value) {
         var rootNodes = createRootChildren();
-        var containerProps = utils.mergeProps(_objectSpread({
+        var containerProps = mergeProps(_objectSpread({
           className: utils.classNames(props.contentClassName, cx('container')),
           role: 'tree',
           'aria-label': props.ariaLabel,
@@ -35469,7 +35785,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
     };
     var createLoader = function createLoader() {
       if (props.loading) {
-        var loadingIconProps = utils.mergeProps({
+        var loadingIconProps = mergeProps({
           className: cx('loadingIcon')
         }, ptm('loadingIcon'));
         var icon = props.loadingIcon || /*#__PURE__*/React__namespace.createElement(spinner.SpinnerIcon, _extends({}, loadingIconProps, {
@@ -35478,7 +35794,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
         var loadingIcon = utils.IconUtils.getJSXIcon(icon, _objectSpread({}, loadingIconProps), {
           props: props
         });
-        var loadingOverlayProps = utils.mergeProps({
+        var loadingOverlayProps = mergeProps({
           className: cx('loadingOverlay')
         }, ptm('loadingOverlay'));
         return /*#__PURE__*/React__namespace.createElement("div", loadingOverlayProps, loadingIcon);
@@ -35488,17 +35804,17 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
     var createFilter = function createFilter() {
       if (props.filter) {
         var value = utils.ObjectUtils.isNotEmpty(filteredValue) ? filteredValue : '';
-        var searchIconProps = utils.mergeProps({
+        var searchIconProps = mergeProps({
           className: cx('searchIcon')
         }, ptm('searchIcon'));
         var icon = props.filterIcon || /*#__PURE__*/React__namespace.createElement(search.SearchIcon, searchIconProps);
         var filterIcon = utils.IconUtils.getJSXIcon(icon, _objectSpread({}, searchIconProps), {
           props: props
         });
-        var filterContainerProps = utils.mergeProps({
+        var filterContainerProps = mergeProps({
           className: cx('filterContainer')
         }, ptm('filterContainer'));
-        var inputProps = utils.mergeProps({
+        var inputProps = mergeProps({
           type: 'text',
           value: value,
           autoComplete: 'off',
@@ -35545,7 +35861,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
           };
           _content2 = utils.ObjectUtils.getJSXElement(props.header, defaultContentOptions);
         }
-        var headerProps = utils.mergeProps({
+        var headerProps = mergeProps({
           className: cx('header')
         }, ptm('header'));
         return /*#__PURE__*/React__namespace.createElement("div", headerProps, _content2);
@@ -35554,7 +35870,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
     };
     var createFooter = function createFooter() {
       var content = utils.ObjectUtils.getJSXElement(props.footer, props);
-      var footerProps = utils.mergeProps({
+      var footerProps = mergeProps({
         className: cx('footer')
       }, ptm('footer'));
       return /*#__PURE__*/React__namespace.createElement("div", footerProps, content);
@@ -35565,7 +35881,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
     var content = createModel();
     var header = createHeader();
     var footer = createFooter();
-    var rootProps = utils.mergeProps({
+    var rootProps = mergeProps({
       ref: elementRef,
       className: utils.classNames(props.className, cx('root')),
       style: props.style,
@@ -35581,7 +35897,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, search, sp
 
   return exports;
 
-})({}, React, primereact.api, primereact.componentbase, primereact.icons.search, primereact.icons.spinner, primereact.utils, primereact.icons.check, primereact.icons.chevrondown, primereact.icons.chevronright, primereact.icons.minus, primereact.ripple);
+})({}, React, primereact.api, primereact.componentbase, primereact.hooks, primereact.icons.search, primereact.icons.spinner, primereact.utils, primereact.icons.check, primereact.icons.chevrondown, primereact.icons.chevronright, primereact.icons.minus, primereact.ripple);
 
 undefined
 undefined