fix: compatibility list is empty (alibaba#2206)

jiaoruogu · Jun 2, 2023 · f96e61a · f96e61a
1 parent a80979e
commit f96e61a
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/packages/hooks/src/useInfiniteScroll/__tests__/index.test.ts b/packages/hooks/src/useInfiniteScroll/__tests__/index.test.ts
@@ -323,4 +323,29 @@ describe('useInfiniteScroll', () => {
 
  expect(result.current.loading).toBeFalsy();
  });
+
+ it('list can be null or undefined', async () => {
+ // @ts-ignore
+ const { result } = setup(async function () {
+ await sleep(1000);
+ count++;
+ return {
+ list: Math.random() < 0.5 ? null : undefined,
+ nextId: count,
+ };
+ });
+
+ expect(result.current.loading).toBeTruthy();
+
+ const { loadMore } = result.current;
+ await act(async () => {
+ jest.advanceTimersByTime(1000);
+ });
+
+ expect(result.current.loading).toBeFalsy();
+
+ act(() => {
+ loadMore();
+ });
+ });
 });
diff --git a/packages/hooks/src/useInfiniteScroll/index.tsx b/packages/hooks/src/useInfiniteScroll/index.tsx
@@ -35,12 +35,14 @@ const useInfiniteScroll = <TData extends Data>(
  async (lastData?: TData) => {
  const currentData = await service(lastData);
  if (!lastData) {
- setFinalData(currentData);
+ setFinalData({
+ ...currentData,
+ list: [...(currentData.list ?? [])],
+ });
  } else {
  setFinalData({
  ...currentData,
- // @ts-ignore
- list: [...lastData.list, ...currentData.list],
+ list: [...(lastData.list ?? []), ...currentData.list],
  });
  }
  return currentData;