fix: reload after loadMore should set loading to true (#2120)

* fix: reload after loadMore should set loading to true * test: add test case
alibaba · Mar 15, 2023 · bafd70d · bafd70d
1 parent 86ec596
commit bafd70d
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 2 deletions.
diff --git a/packages/hooks/src/useInfiniteScroll/__tests__/index.test.ts b/packages/hooks/src/useInfiniteScroll/__tests__/index.test.ts
@@ -248,4 +248,50 @@ describe('useInfiniteScroll', () => {
       Promise.resolve();
     });
   });
+
+  it('loading should be true when reload after loadMore', async () => {
+    const { result } = setup(mockRequest);
+    expect(result.current.loading).toBeTruthy();
+    const { reload, loadMore } = result.current;
+    await act(async () => {
+      jest.advanceTimersByTime(1000);
+    });
+
+    expect(result.current.loading).toBeFalsy();
+
+    act(() => {
+      loadMore();
+      reload();
+    });
+    expect(result.current.loading).toBeTruthy();
+
+    await act(async () => {
+      jest.advanceTimersByTime(1000);
+    });
+
+    expect(result.current.loading).toBeFalsy();
+  });
+
+  it('loading should be true when reloadAsync after loadMore', async () => {
+    const { result } = setup(mockRequest);
+    expect(result.current.loading).toBeTruthy();
+    const { reloadAsync, loadMore } = result.current;
+    await act(async () => {
+      jest.advanceTimersByTime(1000);
+    });
+
+    expect(result.current.loading).toBeFalsy();
+
+    act(() => {
+      loadMore();
+      reloadAsync();
+    });
+    expect(result.current.loading).toBeTruthy();
+
+    await act(async () => {
+      jest.advanceTimersByTime(1000);
+    });
+
+    expect(result.current.loading).toBeFalsy();
+  });
 });
diff --git a/packages/hooks/src/useInfiniteScroll/index.tsx b/packages/hooks/src/useInfiniteScroll/index.tsx
@@ -75,8 +75,15 @@ const useInfiniteScroll = <TData extends Data>(
     return runAsync(finalData);
   };
 
-  const reload = () => run();
-  const reloadAsync = () => runAsync();
+  const reload = () => {
+    setLoadingMore(false);
+    return run();
+  };
+
+  const reloadAsync = () => {
+    setLoadingMore(false);
+    return runAsync();
+  };
 
   const scrollMethod = () => {
     const el = getTargetElement(target);