primereact 10.9.1 → 10.9.2

package/core/core.js

@@ -773,34 +773,58 @@ this.primereact.utils = (function (exports, React) {
         var parents = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
         return element.parentNode === null ? parents : this.getParents(element.parentNode, parents.concat([element.parentNode]));
       }
+
+      /**
+       * Gets all scrollable parent elements of a given element
+       * @param {HTMLElement} element - The element to find scrollable parents for
+       * @param {boolean} hideOverlaysOnDocumentScrolling - Whether to include window/document level scrolling
+       * @returns {Array} Array of scrollable parent elements
+       */
     }, {
       key: "getScrollableParents",
       value: function getScrollableParents(element) {
         var hideOverlaysOnDocumentScrolling = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
         var scrollableParents = [];
         if (element) {
+          // Get all parent elements
           var parents = this.getParents(element);
+          // Regex to match auto or scroll overflow values
           var overflowRegex = /(auto|scroll)/;
+
+          /**
+           * Checks if an element has overflow scroll/auto in any direction
+           * @param {HTMLElement} node - Element to check
+           * @returns {boolean} True if element has overflow scroll/auto
+           */
           var overflowCheck = function overflowCheck(node) {
             var styleDeclaration = node ? getComputedStyle(node) : null;
             return styleDeclaration && (overflowRegex.test(styleDeclaration.getPropertyValue('overflow')) || overflowRegex.test(styleDeclaration.getPropertyValue('overflow-x')) || overflowRegex.test(styleDeclaration.getPropertyValue('overflow-y')));
           };
+
+          /**
+           * Adds a scrollable parent element to the collection
+           * @param {HTMLElement} node - Element to add
+           */
           var addScrollableParent = function addScrollableParent(node) {
             if (hideOverlaysOnDocumentScrolling) {
-              // nodeType 9 is for document element
+              // For document/body/html elements, add window instead
               scrollableParents.push(node.nodeName === 'BODY' || node.nodeName === 'HTML' || node.nodeType === 9 ? window : node);
-            } else {
-              scrollableParents.push(node);
             }
           };
+
+          // Iterate through all parent elements
           var _iterator = _createForOfIteratorHelper$1(parents),
             _step;
           try {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var _parent$dataset;
               var parent = _step.value;
-              var scrollSelectors = parent.nodeType === 1 && parent.dataset.scrollselectors;
+              // Check for custom scroll selectors in data attribute
+              var scrollSelectors = parent.nodeType === 1 && ((_parent$dataset = parent.dataset) === null || _parent$dataset === void 0 ? void 0 : _parent$dataset.scrollselectors);
               if (scrollSelectors) {
                 var selectors = scrollSelectors.split(',');
+
+                // Check each selector
                 var _iterator2 = _createForOfIteratorHelper$1(selectors),
                   _step2;
                 try {
@@ -818,7 +842,7 @@ this.primereact.utils = (function (exports, React) {
                 }
               }
 
-              // BODY
+              // Check if the parent itself is scrollable
               if (parent.nodeType === 1 && overflowCheck(parent)) {
                 addScrollableParent(parent);
               }
@@ -830,11 +854,11 @@ this.primereact.utils = (function (exports, React) {
           }
         }
 
-        // we should always at least have the body or window
+        // Ensure window/body is always included as fallback
         if (!scrollableParents.some(function (node) {
           return node === document.body || node === window;
         })) {
-          scrollableParents.push(window);
+          scrollableParents.push(hideOverlaysOnDocumentScrolling ? window : document.body);
         }
         return scrollableParents;
       }
@@ -3863,7 +3887,7 @@ this.primereact.componentbase = (function (exports, PrimeReact, hooks, utils) {
 
   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    position: absolute;\n    pointer-events: none;\n    opacity: 0;\n    white-space: nowrap;\n}\n\n.p-overflow-hidden {\n    overflow: hidden;\n    padding-right: var(--scrollbar-width);\n}\n";
+  var baseStyle = "\n.p-hidden-accessible {\n    border: 0;\n    clip: rect(0 0 0 0);\n    height: 1px;\n    margin: -1px;\n    opacity: 0;\n    overflow: hidden;\n    padding: 0;\n    pointer-events: none;\n    position: absolute;\n    white-space: nowrap;\n    width: 1px;\n}\n\n.p-overflow-hidden {\n    overflow: hidden;\n    padding-right: var(--scrollbar-width);\n}\n";
   var buttonStyles = "\n.p-button {\n    margin: 0;\n    display: inline-flex;\n    cursor: pointer;\n    user-select: none;\n    align-items: center;\n    vertical-align: bottom;\n    text-align: center;\n    overflow: hidden;\n    position: relative;\n}\n\n.p-button-label {\n    flex: 1 1 auto;\n}\n\n.p-button-icon-right {\n    order: 1;\n}\n\n.p-button:disabled {\n    cursor: default;\n}\n\n.p-button-icon-only {\n    justify-content: center;\n}\n\n.p-button-icon-only .p-button-label {\n    visibility: hidden;\n    width: 0;\n    flex: 0 0 auto;\n}\n\n.p-button-vertical {\n    flex-direction: column;\n}\n\n.p-button-icon-bottom {\n    order: 2;\n}\n\n.p-button-group .p-button {\n    margin: 0;\n}\n\n.p-button-group .p-button:not(:last-child) {\n    border-right: 0 none;\n}\n\n.p-button-group .p-button:not(:first-of-type):not(:last-of-type) {\n    border-radius: 0;\n}\n\n.p-button-group .p-button:first-of-type {\n    border-top-right-radius: 0;\n    border-bottom-right-radius: 0;\n}\n\n.p-button-group .p-button:last-of-type {\n    border-top-left-radius: 0;\n    border-bottom-left-radius: 0;\n}\n\n.p-button-group .p-button:focus {\n    position: relative;\n    z-index: 1;\n}\n";
   var inputTextStyles = "\n.p-inputtext {\n    margin: 0;\n}\n\n.p-fluid .p-inputtext {\n    width: 100%;\n}\n\n/* InputGroup */\n.p-inputgroup {\n    display: flex;\n    align-items: stretch;\n    width: 100%;\n}\n\n.p-inputgroup-addon {\n    display: flex;\n    align-items: center;\n    justify-content: center;\n}\n\n.p-inputgroup .p-float-label {\n    display: flex;\n    align-items: stretch;\n    width: 100%;\n}\n\n.p-inputgroup .p-inputtext,\n.p-fluid .p-inputgroup .p-inputtext,\n.p-inputgroup .p-inputwrapper,\n.p-fluid .p-inputgroup .p-input {\n    flex: 1 1 auto;\n    width: 1%;\n}\n\n/* Floating Label */\n.p-float-label {\n    display: block;\n    position: relative;\n}\n\n.p-float-label label {\n    position: absolute;\n    pointer-events: none;\n    top: 50%;\n    margin-top: -0.5rem;\n    transition-property: all;\n    transition-timing-function: ease;\n    line-height: 1;\n}\n\n.p-float-label textarea ~ label,\n.p-float-label .p-mention ~ label {\n    top: 1rem;\n}\n\n.p-float-label input:focus ~ label,\n.p-float-label input:-webkit-autofill ~ label,\n.p-float-label input.p-filled ~ label,\n.p-float-label textarea:focus ~ label,\n.p-float-label textarea.p-filled ~ label,\n.p-float-label .p-inputwrapper-focus ~ label,\n.p-float-label .p-inputwrapper-filled ~ label,\n.p-float-label .p-tooltip-target-wrapper ~ label {\n    top: -0.75rem;\n    font-size: 12px;\n}\n\n.p-float-label .p-placeholder,\n.p-float-label input::placeholder,\n.p-float-label .p-inputtext::placeholder {\n    opacity: 0;\n    transition-property: all;\n    transition-timing-function: ease;\n}\n\n.p-float-label .p-focus .p-placeholder,\n.p-float-label input:focus::placeholder,\n.p-float-label .p-inputtext:focus::placeholder {\n    opacity: 1;\n    transition-property: all;\n    transition-timing-function: ease;\n}\n\n.p-input-icon-left,\n.p-input-icon-right {\n    position: relative;\n    display: inline-block;\n}\n\n.p-input-icon-left > i,\n.p-input-icon-right > i,\n.p-input-icon-left > svg,\n.p-input-icon-right > svg,\n.p-input-icon-left > .p-input-prefix,\n.p-input-icon-right > .p-input-suffix {\n    position: absolute;\n    top: 50%;\n    margin-top: -0.5rem;\n}\n\n.p-fluid .p-input-icon-left,\n.p-fluid .p-input-icon-right {\n    display: block;\n    width: 100%;\n}\n";
   var iconStyles = "\n.p-icon {\n    display: inline-block;\n}\n\n.p-icon-spin {\n    -webkit-animation: p-icon-spin 2s infinite linear;\n    animation: p-icon-spin 2s infinite linear;\n}\n\nsvg.p-icon {\n    pointer-events: auto;\n}\n\nsvg.p-icon g,\n.p-disabled svg.p-icon {\n    pointer-events: none;\n}\n\n@-webkit-keyframes p-icon-spin {\n    0% {\n        -webkit-transform: rotate(0deg);\n        transform: rotate(0deg);\n    }\n    100% {\n        -webkit-transform: rotate(359deg);\n        transform: rotate(359deg);\n    }\n}\n\n@keyframes p-icon-spin {\n    0% {\n        -webkit-transform: rotate(0deg);\n        transform: rotate(0deg);\n    }\n    100% {\n        -webkit-transform: rotate(359deg);\n        transform: rotate(359deg);\n    }\n}\n";
@@ -9545,8 +9569,9 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, componentbase,
     var hide = function hide(e) {
       if (e && e.type === 'blur') setMultipleFocusEvents(false);
       clearTimeouts();
+      var success = true;
       if (visibleState) {
-        var success = sendCallback(props.onBeforeHide, {
+        success = sendCallback(props.onBeforeHide, {
           originalEvent: e,
           target: currentTargetRef.current
         });
@@ -9557,7 +9582,6 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, componentbase,
             }
             utils.ZIndexUtils.clear(elementRef.current);
             utils.DomHandler.removeClass(elementRef.current, 'p-tooltip-active');
-            setVisibleState(false);
             sendCallback(props.onHide, {
               originalEvent: e,
               target: currentTargetRef.current
@@ -9565,6 +9589,11 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, componentbase,
           });
         }
       }
+
+      // handles the case when visibleState change from mouseenter was queued and mouseleave handler was called earlier than queued re-render
+      if (success) {
+        setVisibleState(false);
+      }
     };
     var align = function align(target, coordinate, position) {
       var left = 0;
@@ -10670,7 +10699,7 @@ this.primereact.virtualscroller = (function (exports, React, api, hooks, spinner
       }
     };
     var init = function init() {
-      if (!props.disabled && isVisible(elementRef.current)) {
+      if (!props.disabled && utils.DomHandler.isVisible(elementRef.current)) {
         setSize();
         calculateOptions();
         setSpacerSize();
@@ -10684,7 +10713,7 @@ this.primereact.virtualscroller = (function (exports, React, api, hooks, spinner
       return false;
     };
     React__namespace.useEffect(function () {
-      if (!viewInitialized.current && isVisible(elementRef.current)) {
+      if (!viewInitialized.current && isVisible()) {
         viewInit();
         viewInitialized.current = true;
       }
@@ -14142,6 +14171,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
       filter: false,
       filterBy: null,
       filterClearIcon: null,
+      filterDelay: 300,
       filterIcon: null,
       filterInputAutoFocus: false,
       filterLocale: undefined,
@@ -14597,22 +14627,23 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
     var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(PrimeReact.PrimeReactContext);
     var props = DropdownBase.getProps(inProps, context);
-    var _React$useState = React__namespace.useState(''),
+    var _useDebounce = hooks.useDebounce('', props.filterDelay || 0),
+      _useDebounce2 = _slicedToArray(_useDebounce, 3),
+      filterValue = _useDebounce2[0],
+      filterState = _useDebounce2[1],
+      setFilterState = _useDebounce2[2];
+    var _React$useState = React__namespace.useState(false),
       _React$useState2 = _slicedToArray(_React$useState, 2),
-      filterState = _React$useState2[0],
-      setFilterState = _React$useState2[1];
-    var _React$useState3 = React__namespace.useState(false),
+      focusedState = _React$useState2[0],
+      setFocusedState = _React$useState2[1];
+    var _React$useState3 = React__namespace.useState(-1),
       _React$useState4 = _slicedToArray(_React$useState3, 2),
-      focusedState = _React$useState4[0],
-      setFocusedState = _React$useState4[1];
-    var _React$useState5 = React__namespace.useState(-1),
+      focusedOptionIndex = _React$useState4[0],
+      setFocusedOptionIndex = _React$useState4[1];
+    var _React$useState5 = React__namespace.useState(false),
       _React$useState6 = _slicedToArray(_React$useState5, 2),
-      focusedOptionIndex = _React$useState6[0],
-      setFocusedOptionIndex = _React$useState6[1];
-    var _React$useState7 = React__namespace.useState(false),
-      _React$useState8 = _slicedToArray(_React$useState7, 2),
-      overlayVisibleState = _React$useState8[0],
-      setOverlayVisibleState = _React$useState8[1];
+      overlayVisibleState = _React$useState6[0],
+      setOverlayVisibleState = _React$useState6[1];
     var clickedRef = React__namespace.useRef(false);
     var elementRef = React__namespace.useRef(null);
     var overlayRef = React__namespace.useRef(null);
@@ -14673,7 +14704,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
     var getVisibleOptions = function getVisibleOptions() {
       var options = props.optionGroupLabel ? flatOptions(props.options) : props.options;
       if (hasFilter && !isLazy) {
-        var filterValue = filterState.trim().toLocaleLowerCase(props.filterLocale);
+        var _filterValue = filterState.trim().toLocaleLowerCase(props.filterLocale);
         var searchFields = props.filterBy ? props.filterBy.split(',') : [props.optionLabel || 'label'];
         if (props.optionGroupLabel) {
           var filteredGroups = [];
@@ -14682,7 +14713,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
           try {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
               var optgroup = _step.value;
-              var filteredSubOptions = PrimeReact.FilterService.filter(getOptionGroupChildren(optgroup), searchFields, filterValue, props.filterMatchMode, props.filterLocale);
+              var filteredSubOptions = PrimeReact.FilterService.filter(getOptionGroupChildren(optgroup), searchFields, _filterValue, props.filterMatchMode, props.filterLocale);
               if (filteredSubOptions && filteredSubOptions.length) {
                 filteredGroups.push(_objectSpread(_objectSpread({}, optgroup), _defineProperty({}, "".concat(props.optionGroupChildren), filteredSubOptions)));
               }
@@ -14694,7 +14725,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
           }
           return flatOptions(filteredGroups);
         }
-        return PrimeReact.FilterService.filter(options, searchFields, filterValue, props.filterMatchMode, props.filterLocale);
+        return PrimeReact.FilterService.filter(options, searchFields, _filterValue, props.filterMatchMode, props.filterLocale);
       }
       return options;
     };
@@ -14777,7 +14808,6 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
         event.preventDefault();
         return;
       }
-      var metaKey = event.metaKey || event.ctrlKey;
       var code = utils.DomHandler.isAndroid() ? event.key : event.code;
       switch (code) {
         case 'ArrowDown':
@@ -14823,6 +14853,9 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
           //NOOP
           break;
         default:
+          var metaKey = event.metaKey || event.ctrlKey || event.altKey;
+
+          // Only handle printable characters when no meta keys are pressed
           if (!metaKey && utils.ObjectUtils.isPrintableCharacter(event.key)) {
             !overlayVisibleState && !props.editable && show();
             !props.editable && searchOptions(event, event.key);
@@ -15141,6 +15174,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
         resetFilter();
       }
       updateEditableLabel();
+      setFocusedOptionIndex(-1);
     };
     var selectItem = function selectItem(event) {
       if (selectedOption !== event.option) {
@@ -15401,8 +15435,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
         required: props.required,
         defaultValue: option.value,
         name: props.name,
-        tabIndex: -1,
-        'aria-hidden': 'true'
+        tabIndex: -1
       }, ptm('select'));
       var optionProps = mergeProps({
         value: option.value
@@ -15559,7 +15592,6 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
     var firstHiddenFocusableElementProps = mergeProps({
       ref: firstHiddenFocusableElementOnOverlay,
       role: 'presentation',
-      'aria-hidden': 'true',
       className: 'p-hidden-accessible p-hidden-focusable',
       tabIndex: '0',
       onFocus: onFirstHiddenFocus,
@@ -15569,7 +15601,6 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
     var lastHiddenFocusableElementProps = mergeProps({
       ref: lastHiddenFocusableElementOnOverlay,
       role: 'presentation',
-      'aria-hidden': 'true',
       className: 'p-hidden-accessible p-hidden-focusable',
       tabIndex: '0',
       onFocus: onLastHiddenFocus,
@@ -15584,7 +15615,7 @@ this.primereact.dropdown = (function (exports, React, PrimeReact, componentbase,
     }, props, {
       appendTo: appendTo,
       cx: cx,
-      filterValue: filterState,
+      filterValue: filterValue,
       focusedOptionIndex: focusedOptionIndex,
       getOptionGroupChildren: getOptionGroupChildren,
       getOptionGroupLabel: getOptionGroupLabel,
@@ -17900,7 +17931,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, hooks, search, spinner, utils, check, chevrondown, chevronright, minus, ripple, tooltip) {
+this.primereact.tree = (function (exports, React, api, componentbase, hooks, search, spinner, utils, check, tooltip, chevrondown, chevronright, minus, ripple) {
   'use strict';
 
   function _interopNamespace(e) {
@@ -18050,19 +18081,6 @@ this.primereact.tree = (function (exports, React, api, componentbase, hooks, sea
     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$1 = {
     root: function root(_ref) {
       var props = _ref.props;
@@ -18079,9 +18097,9 @@ this.primereact.tree = (function (exports, React, api, componentbase, hooks, sea
     searchIcon: 'p-tree-filter-icon',
     container: 'p-tree-container',
     node: function node(_ref2) {
-      var isLeaf = _ref2.isLeaf;
+      var leaf = _ref2.leaf;
       return utils.classNames('p-treenode', {
-        'p-treenode-leaf': isLeaf
+        'p-treenode-leaf': leaf
       });
     },
     content: function content(_ref3) {
@@ -18134,6 +18152,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, hooks, sea
       expandedKeys: null,
       filter: false,
       filterBy: 'label',
+      filterDelay: 300,
       filterIcon: null,
       filterLocale: undefined,
       filterMode: 'lenient',
@@ -18405,7 +18424,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, hooks, sea
     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;
+    var expanded = props.expandedKeys ? props.expandedKeys[props.node.key] !== undefined : false;
     var ptm = props.ptm,
       cx = props.cx;
     var getPTOptions = function getPTOptions(key) {
@@ -18415,7 +18434,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, hooks, sea
           selected: !isCheckboxSelectionMode() ? isSelected() : false,
           expanded: expanded || false,
           checked: isCheckboxSelectionMode() ? isChecked() : false,
-          isLeaf: isLeaf
+          leaf: isLeaf
         }
       });
     };
@@ -19174,7 +19193,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, hooks, sea
       var nodeProps = mergeProps({
         ref: elementRef,
         className: utils.classNames(props.node.className, cx('node', {
-          isLeaf: isLeaf
+          leaf: isLeaf
         })),
         style: props.node.style,
         tabIndex: tabIndex,
@@ -19209,20 +19228,27 @@ this.primereact.tree = (function (exports, React, api, componentbase, hooks, sea
     var mergeProps = hooks.useMergeProps();
     var context = React__namespace.useContext(api.PrimeReactContext);
     var props = TreeBase.getProps(inProps, context);
-    var _React$useState = React__namespace.useState(''),
+    var _useDebounce = hooks.useDebounce('', props.filterDelay || 0),
+      _useDebounce2 = _slicedToArray(_useDebounce, 3),
+      filterValue = _useDebounce2[0],
+      filterValueState = _useDebounce2[1],
+      setFilterValueState = _useDebounce2[2];
+    var _React$useState = React__namespace.useState(props.expandedKeys),
       _React$useState2 = _slicedToArray(_React$useState, 2),
-      filterValueState = _React$useState2[0],
-      setFilterValueState = _React$useState2[1];
-    var _React$useState3 = React__namespace.useState(props.expandedKeys),
+      expandedKeysState = _React$useState2[0],
+      setExpandedKeysState = _React$useState2[1];
+    var _React$useState3 = React__namespace.useState({}),
       _React$useState4 = _slicedToArray(_React$useState3, 2),
-      expandedKeysState = _React$useState4[0],
-      setExpandedKeysState = _React$useState4[1];
+      filterExpandedKeys = _React$useState4[0],
+      setFilterExpandedKeys = _React$useState4[1];
     var elementRef = React__namespace.useRef(null);
     var filteredNodes = React__namespace.useRef([]);
     var dragState = React__namespace.useRef(null);
     var filterChanged = React__namespace.useRef(false);
     var filteredValue = props.onFilterValueChange ? props.filterValue : filterValueState;
-    var expandedKeys = props.onToggle ? props.expandedKeys : expandedKeysState;
+    var isFiltering = props.filter && filteredValue;
+    var expandedKeys = isFiltering ? filterExpandedKeys : props.onToggle ? props.expandedKeys : expandedKeysState;
+    var currentFilterExpandedKeys = {};
     var childFocusEvent = React__namespace.useRef(null);
     var _TreeBase$setMetaData = TreeBase.setMetaData({
         props: props,
@@ -19261,10 +19287,14 @@ this.primereact.tree = (function (exports, React, api, componentbase, hooks, sea
         if (navigateFocusToChild) {
           childFocusEvent.current = originalEvent;
         }
-        setExpandedKeysState(value);
+        if (isFiltering) {
+          setFilterExpandedKeys(value);
+        } else {
+          setExpandedKeysState(value);
+        }
       }
     };
-    useUpdateEffect(function () {
+    hooks.useUpdateEffect(function () {
       if (childFocusEvent.current) {
         var event = childFocusEvent.current;
         var nodeElement = event.target.getAttribute('data-pc-section') === 'toggler' ? event.target.closest('[role="treeitem"]') : event.target;
@@ -19284,6 +19314,10 @@ this.primereact.tree = (function (exports, React, api, componentbase, hooks, sea
         childFocusEvent.current = null;
       }
     }, [expandedKeys]);
+    React__namespace.useEffect(function () {
+      if (props.filter) _filter();
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [filteredValue, props.value, props.filter]);
     var onDragStart = function onDragStart(event) {
       dragState.current = {
         path: event.path,
@@ -19465,12 +19499,9 @@ this.primereact.tree = (function (exports, React, api, componentbase, hooks, sea
     };
     var filter = function filter(value) {
       setFilterValueState(utils.ObjectUtils.isNotEmpty(value) ? value : '');
-      _filter();
     };
     var _filter = function _filter() {
-      if (!filterChanged.current) {
-        return;
-      }
+      if (!filterChanged.current) return;
       if (utils.ObjectUtils.isEmpty(filteredValue)) {
         filteredNodes.current = props.value;
       } else {
@@ -19499,6 +19530,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, hooks, sea
           _iterator.f();
         }
       }
+      setFilterExpandedKeys(currentFilterExpandedKeys);
       filterChanged.current = false;
     };
     var findFilteredNodes = function findFilteredNodes(node, paramsWithoutNode) {
@@ -19525,7 +19557,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, hooks, sea
           }
         }
         if (matched) {
-          node.expanded = true;
+          currentFilterExpandedKeys[node.key] = true;
           return true;
         }
       }
@@ -19642,10 +19674,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, hooks, sea
     };
     var createModel = function createModel() {
       if (props.value) {
-        if (props.filter) {
-          filterChanged.current = true;
-          _filter();
-        }
+        if (props.filter) filterChanged.current = true;
         var value = getRootNode();
         if (value.length > 0) {
           var rootNodes = createRootChildren(value);
@@ -19676,7 +19705,8 @@ this.primereact.tree = (function (exports, React, api, componentbase, hooks, sea
     };
     var createFilter = function createFilter() {
       if (props.filter) {
-        var value = utils.ObjectUtils.isNotEmpty(filteredValue) ? filteredValue : '';
+        var value = props.onFilterValueChange ? props.filterValue : filterValue;
+        value = utils.ObjectUtils.isNotEmpty(value) ? value : '';
         var searchIconProps = mergeProps({
           className: cx('searchIcon')
         }, ptm('searchIcon'));
@@ -19770,7 +19800,7 @@ this.primereact.tree = (function (exports, React, api, componentbase, hooks, sea
 
   return exports;
 
-})({}, 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, primereact.tooltip);
+})({}, React, primereact.api, primereact.componentbase, primereact.hooks, primereact.icons.search, primereact.icons.spinner, primereact.utils, primereact.icons.check, primereact.tooltip, primereact.icons.chevrondown, primereact.icons.chevronright, primereact.icons.minus, primereact.ripple);
 
 undefined
 undefined