fix: raf.cancel not clean up correct map id (#482)

* test: test driven * fix: raf canel logic
react-component · Nov 6, 2023 · d7901b2 · d7901b2
1 parent 677d3ac
commit d7901b2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/raf.ts b/src/raf.ts
@@ -44,8 +44,12 @@ const wrapperRaf = (callback: () => void, times = 1): number => {
 
 wrapperRaf.cancel = (id: number) => {
   const realId = rafIds.get(id);
-  cleanup(realId);
+  cleanup(id);
   return caf(realId);
 };
 
+if (process.env.NODE_ENV !== 'production') {
+  wrapperRaf.ids = () => rafIds;
+}
+
 export default wrapperRaf;
diff --git a/tests/raf.test.js b/tests/raf.test.js
@@ -20,11 +20,19 @@ describe('raf', () => {
   it('cancel', done => {
     let bamboo = false;
 
+    // Call some native raf
+    for (let i = 0; i < 10; i += 1) {
+      const nativeId = requestAnimationFrame(() => {});
+      cancelAnimationFrame(nativeId);
+    }
+
     const id = raf(() => {
       bamboo = true;
     }, 2);
+    expect(raf.ids().has(id)).toBeTruthy();
 
     raf.cancel(id);
+    expect(raf.ids().has(id)).toBeFalsy();
 
     requestAnimationFrame(() => {
       requestAnimationFrame(() => {