Skip to content

Commit

Permalink
fix(useLoadMore): 重新加载应重置 data
Browse files Browse the repository at this point in the history
  • Loading branch information
fjc0k committed Jul 9, 2020
1 parent 6c982f4 commit 10389c5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 24 deletions.
26 changes: 2 additions & 24 deletions src/react/__snapshots__/useLoadMore.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,7 @@ Object {

exports[`useLoadMore total, noMore 表现正常: 已无更多数据后重新加载中 1`] = `
Object {
"data": Array [
Array [
0,
1,
],
Array [
1,
2,
],
],
"data": Array [],
"incrementalLoading": false,
"initialLoading": true,
"loadMore": [Function anonymous],
Expand Down Expand Up @@ -201,20 +192,7 @@ Object {

exports[`useLoadMore 加载表现正常: 重新加载中 1`] = `
Object {
"data": Array [
Array [
0,
1,
],
Array [
1,
2,
],
Array [
2,
3,
],
],
"data": Array [],
"incrementalLoading": false,
"initialLoading": true,
"loadMore": [Function anonymous],
Expand Down
3 changes: 3 additions & 0 deletions src/react/useLoadMore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ export function useLoadMore<TItem>(
return new Promise<void>((resolve, reject) => {
const { data, service } = latest.current
const isFirstPage = nextPageNumber === 1
if (isFirstPage) {
setData([])
}
setInitialLoading(isFirstPage)
setIncrementalLoading(!isFirstPage)
setPageNumber(nextPageNumber)
Expand Down

0 comments on commit 10389c5

Please sign in to comment.