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.

Sign up for GitHub

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: always change treeProps.expandedKeys to avoid wrong loadling data #576

Merged
merged 13 commits into from
Oct 24, 2024
Merged

fix: always change treeProps.expandedKeys to avoid wrong loadling data #576

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
91d4cac
fix: should not pass `loadData` when expandedKeys is not changed, whi…
bbb169 Oct 14, 2024
c1ca588
Merge branch 'master' into fix/search-cause-all-load-data
afc163 Oct 16, 2024
d879dbf
Merge branch 'master' into fix/search-cause-all-load-data
afc163 Oct 16, 2024
b817881
Merge branch 'master' into fix/search-cause-all-load-data
bbb169 Oct 18, 2024
1f79277
feat: add test cases
bbb169 Oct 18, 2024
9a2ef31
chore: add all dependencies to loadDataFun
bbb169 Oct 18, 2024
ce94a41
chore: optimize test cases
bbb169 Oct 18, 2024
8acc1c8
feat: optimize `loadDataFun`'s calculation
bbb169 Oct 21, 2024
dccd5d2
feat: simplify `loadDataFun`'s logic
bbb169 Oct 22, 2024
b0e20bf
chore: delete notes and change logic
Oct 23, 2024
471df43
simplify `loadDataFun` return
bbb169 Oct 23, 2024
729c613
simplify `loadDataFun` change logic
bbb169 Oct 23, 2024
cf496e4
Update src/OptionList.tsx
afc163 Oct 24, 2024
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
12 changes: 11 additions & 1 deletion src/OptionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,16 @@ const OptionList: React.ForwardRefRenderFunction<ReviseRefOptionListProps> = (_,
onKeyUp: () => {},
}));


const loadDataFun = React.useMemo(() => {
// should not pass `loadData` when expandedKeys is not changed
if (!searchValue && searchExpandedKeys?.length && !mergedExpandedKeys) {
bbb169 marked this conversation as resolved.
Show resolved Hide resolved
return null
}

return searchValue ? null : (loadData as any)
}, [searchValue])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
}, [searchValue])
}, [searchValue, searchExpandedKeys, mergedExpandedKeys]);


// ========================== Render ==========================
if (memoTreeData.length === 0) {
return (
Expand Down Expand Up @@ -237,7 +247,7 @@ const OptionList: React.ForwardRefRenderFunction<ReviseRefOptionListProps> = (_,
showIcon={showTreeIcon}
switcherIcon={switcherIcon}
showLine={treeLine}
loadData={searchValue ? null : (loadData as any)}
loadData={loadDataFun}
motion={treeMotion}
activeKey={activeKey}
// We handle keys by out instead tree self
Expand Down
Loading