Merge branch 'master' into feat-useInfiniteScroll-top

alibaba · Jul 11, 2024 · 5ec6d6f · 5ec6d6f
2 parents 23dfe69 + b2f1218
commit 5ec6d6f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
@@ -21,7 +21,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: pnpm run intall, build
+      - name: pnpm run install, build
         run: |
           pnpm run init
         env:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: pnpm run intall, build
+      - name: pnpm run install, build
         run: |
           pnpm run init
 

diff --git a/packages/hooks/src/createDeepCompareEffect/index.ts b/packages/hooks/src/createDeepCompareEffect/index.ts
@@ -10,9 +10,9 @@ export const createDeepCompareEffect: CreateUpdateEffect = (hook) => (effect, de
   const signalRef = useRef<number>(0);
 
   if (deps === undefined || !depsEqual(deps, ref.current)) {
-    ref.current = deps;
     signalRef.current += 1;
   }
+  ref.current = deps;
 
   hook(effect, [signalRef.current]);
 };
diff --git a/packages/hooks/src/useLatest/__tests__/index.test.ts b/packages/hooks/src/useLatest/__tests__/index.test.ts
@@ -18,11 +18,13 @@ describe('useLatest', () => {
   });
 
   it('useLatest with reference variable should work', async () => {
-    const { result, rerender } = setUp({});
+    const val1 = {};
+    const { result, rerender } = setUp(val1);
 
-    expect(result.current.current).toEqual({});
+    expect(result.current.current).toBe(val1);
 
-    rerender([]);
-    expect(result.current.current).toEqual([]);
+    const val2 = [];
+    rerender(val2);
+    expect(result.current.current).toBe(val2);
   });
 });
diff --git a/packages/hooks/src/utils/useDeepCompareWithTarget.ts b/packages/hooks/src/utils/useDeepCompareWithTarget.ts
@@ -13,9 +13,9 @@ const useDeepCompareEffectWithTarget = (
   const signalRef = useRef<number>(0);
 
   if (!depsEqual(deps, ref.current)) {
-    ref.current = deps;
     signalRef.current += 1;
   }
+  ref.current = deps;
 
   useEffectWithTarget(effect, [signalRef.current], target);
 };