Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #6747: Tree/TreeSelect add filterDelay #7549

Merged
merged 1 commit into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions components/lib/tree/Tree.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import * as React from 'react';
import { localeOption, PrimeReactContext } from '../api/Api';
import { useHandleStyle } from '../componentbase/ComponentBase';
import { useMergeProps } from '../hooks/Hooks';
import { useUpdateEffect } from '../hooks/useUpdateEffect';
import { useDebounce, useMergeProps, useUpdateEffect } from '../hooks/Hooks';
import { SearchIcon } from '../icons/search';
import { SpinnerIcon } from '../icons/spinner';
import { classNames, DomHandler, IconUtils, ObjectUtils } from '../utils/Utils';
Expand All @@ -15,7 +14,7 @@ export const Tree = React.memo(
const context = React.useContext(PrimeReactContext);
const props = TreeBase.getProps(inProps, context);

const [filterValueState, setFilterValueState] = React.useState('');
const [filterValue, filterValueState, setFilterValueState] = useDebounce('', props.filterDelay || 0);
const [expandedKeysState, setExpandedKeysState] = React.useState(props.expandedKeys);
const elementRef = React.useRef(null);
const filteredNodes = React.useRef([]);
Expand Down Expand Up @@ -523,7 +522,9 @@ export const Tree = React.memo(

const createFilter = () => {
if (props.filter) {
const value = ObjectUtils.isNotEmpty(filteredValue) ? filteredValue : '';
let value = props.onFilterValueChange ? props.filterValue : filterValue;

value = ObjectUtils.isNotEmpty(value) ? value : '';
const searchIconProps = mergeProps(
{
className: cx('searchIcon')
Expand Down
1 change: 1 addition & 0 deletions components/lib/tree/TreeBase.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ export const TreeBase = ComponentBase.extend({
expandedKeys: null,
filter: false,
filterBy: 'label',
filterDelay: 300,
filterIcon: null,
filterLocale: undefined,
filterMode: 'lenient',
Expand Down
5 changes: 5 additions & 0 deletions components/lib/tree/tree.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,11 @@ export interface TreeProps {
* @defaultValue false
*/
filter?: boolean | undefined;
/**
* Delay in milliseconds before filtering the data.
* @defaultValue 300
*/
filterDelay?: number | undefined;
/**
* Icon of the filter.
*/
Expand Down
11 changes: 7 additions & 4 deletions components/lib/treeselect/TreeSelect.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import PrimeReact, { PrimeReactContext, localeOption, ariaLabel } from '../api/Api';
import PrimeReact, { PrimeReactContext, ariaLabel, localeOption } from '../api/Api';
import { useHandleStyle } from '../componentbase/ComponentBase';
import { useMergeProps, useMountEffect, useOverlayListener, useUnmountEffect, useUpdateEffect } from '../hooks/Hooks';
import { useDebounce, useMergeProps, useMountEffect, useOverlayListener, useUnmountEffect, useUpdateEffect } from '../hooks/Hooks';
import { ChevronDownIcon } from '../icons/chevrondown';
import { SearchIcon } from '../icons/search';
import { TimesIcon } from '../icons/times';
Expand All @@ -22,7 +22,7 @@ export const TreeSelect = React.memo(
const [focusedState, setFocusedState] = React.useState(false);
const [overlayVisibleState, setOverlayVisibleState] = React.useState(false);
const [expandedKeysState, setExpandedKeysState] = React.useState(props.expandedKeys);
const [filterValueState, setFilterValueState] = React.useState('');
const [filterValue, filterValueState, setFilterValueState] = useDebounce('', props.filterDelay || 0);
const elementRef = React.useRef(null);
const overlayRef = React.useRef(null);
const filterInputRef = React.useRef(null);
Expand Down Expand Up @@ -667,6 +667,7 @@ export const TreeSelect = React.memo(
expandedKeys={expandedKeys}
filter={props.filter}
filterBy={props.filterBy}
filterDelay={props.filterDelay}
filterLocale={props.filterLocale}
filterMode={props.filterMode}
filterPlaceholder={props.filterPlaceholder}
Expand Down Expand Up @@ -696,7 +697,9 @@ export const TreeSelect = React.memo(

const createFilterElement = () => {
if (props.filter) {
const filterValue = ObjectUtils.isNotEmpty(filteredValue) ? filteredValue : '';
let filterValue = props.onFilterValueChange ? props.filterValue : filterValue;

filterValue = ObjectUtils.isNotEmpty(filterValue) ? filterValue : '';
const filterContainerProps = mergeProps(
{
className: cx('filterContainer')
Expand Down
1 change: 1 addition & 0 deletions components/lib/treeselect/TreeSelectBase.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ export const TreeSelectBase = ComponentBase.extend({
expandedKeys: null,
filter: false,
filterBy: 'label',
filterDelay: 300,
filterIcon: null,
filterInputAutoFocus: true,
filterLocale: undefined,
Expand Down
5 changes: 5 additions & 0 deletions components/lib/treeselect/treeselect.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,11 @@ export interface TreeSelectProps extends Omit<React.DetailedHTMLProps<React.Inpu
* @defaultValue label
*/
filterBy?: string | undefined;
/**
* Delay in milliseconds before filtering the data.
* @defaultValue 300
*/
filterDelay?: number | undefined;
/**
* Icon of the filter.
*/
Expand Down
Loading