Merge branch 'react-component:master' into preact-supportRef-fix

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-util",
-  "version": "5.38.0",
+  "version": "5.38.1",
   "description": "Common Utils For React Component",
   "keywords": [
     "react",
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@rc-component/father-plugin": "1.0.0",
-    "@testing-library/react": "^13.0.0",
+    "@testing-library/react": "^14.1.2",
     "@types/jest": "^29.4.0",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
@@ -53,16 +53,18 @@
     "create-react-class": "^15.6.3",
     "cross-env": "^7.0.2",
     "dumi": "^2.1.3",
-    "eslint": "~7.32.0",
+    "eslint": "^8.54.0",
+    "eslint-plugin-jest": "^27.6.0",
+    "eslint-plugin-unicorn": "^49.0.0",
     "father": "^4.1.3",
     "glob": "^9.2.1",
     "husky": "^8.0.3",
-    "lint-staged": "^13.1.2",
-    "np": "^7.6.3",
+    "lint-staged": "^15.1.0",
+    "np": "^9.0.0",
     "rc-test": "^7.0.14",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "typescript": "^4.1.3"
+    "typescript": "^5.3.2"
   },
   "peerDependencies": {
     "react": ">=16.9.0",

src/composeProps.ts

@@ -17,7 +17,7 @@ function composeProps<T extends Record<string, any>>(
       };
     }
   });
-  return composedProps;
+  return composedProps as T;
 }
 
 export default composeProps;

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;

src/warning.ts

@@ -16,8 +16,18 @@ export const preMessage = (fn: preMessageFn) => {
   preWarningFns.push(fn);
 };
 
+/**
+ * Warning if condition not match.
+ * @param valid Condition
+ * @param message Warning message
+ * @example
+ * ```js
+ * warning(false, 'some error'); // print some error
+ * warning(true, 'some error'); // print nothing
+ * warning(1 === 2, 'some error'); // print some error
+ * ```
+ */
 export function warning(valid: boolean, message: string) {
-  // Support uglify
   if (
     process.env.NODE_ENV !== 'production' &&
     !valid &&
@@ -34,8 +44,8 @@ export function warning(valid: boolean, message: string) {
   }
 }
 
+/** @see Similar to {@link warning} */
 export function note(valid: boolean, message: string) {
-  // Support uglify
   if (
     process.env.NODE_ENV !== 'production' &&
     !valid &&
@@ -67,10 +77,12 @@ export function call(
   }
 }
 
+/** @see Same as {@link warning}, but only warn once for the same message */
 export function warningOnce(valid: boolean, message: string) {
   call(warning, valid, message);
 }
 
+/** @see Same as {@link warning}, but only warn once for the same message */
 export function noteOnce(valid: boolean, message: string) {
   call(note, valid, message);
 }
@@ -80,4 +92,3 @@ warningOnce.resetWarned = resetWarned;
 warningOnce.noteOnce = noteOnce;
 
 export default warningOnce;
-/* eslint-enable */

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(() => {