@easyv/biz-components 0.0.35 → 0.0.36

package/dist/hooks/useWatchValue/useWatchValue.d.ts

@@ -1,17 +1,16 @@
 type BaseValueType = string | number | boolean | object | Array<unknown> | null | undefined;
 interface Params<T> {
     value: T;
-    callback: (newValue: T, oldValue?: T | undefined) => void | Promise<void> | (() => void);
+    callback: (newValue: T, oldValue?: T) => void | Promise<void> | (() => void);
     options?: {
         equalFn?: (value1: T, value2: T) => boolean;
         immediate?: boolean;
     };
 }
-/** 监听值变化，
- * - 值变化时调用 callback
- * - 判断值是否变化默认使用 lodash 的 isEqual
- * @param params { value: T; callback: (newValue: T, oldValue?: T) => void | Promise<void>; options?: { equalFn: (value1: T, value2: T) => boolean; immediate?: boolean; }}
- * - 注意：如果你需要使用 useEffect 的 cleanUp 函数，可以考虑在 callback 中使用。或者使用 useEffect。
+/**监听值变化，
+ * 值变化时调用 callback
+ * 判断值是否变化默认使用 lodash 的 isEqual
+ * @param params { value: T; callback: (newValue: T, oldValue?: T) => void | Promise<void>; options?: { equalFn: (value1: T, value2: T) => boolean; immediate?: boolean; } }
  */
 export declare function useWatchValue<T extends BaseValueType>(params: Params<T>): void;
 export {};

package/dist/hooks/useWatchValue/useWatchValue.es.js

@@ -1,41 +1,23 @@
 import { useRef, useEffect } from "react";
 import isEqual from "../../node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/isEqual.es.js";
+const initValue = Symbol("initValue");
 function useWatchValue(params) {
   const { value, callback, options } = params;
-  const ref = useRef(void 0);
+  const ref = useRef(initValue);
   const initialRef = useRef(false);
-  const { equalFn = isEqual, immediate } = options || {};
-  const fnObj = useRef({
-    callback,
-    equalFn,
-    immediate
-  });
-  fnObj.current = {
-    callback,
-    equalFn,
-    immediate
-  };
+  const { equalFn = isEqual } = options || {};
   useEffect(() => {
-    const {
-      callback: callbackInner,
-      equalFn: equalFnInner,
-      immediate: immediateInner
-    } = fnObj.current;
-    if (immediateInner && !initialRef.current) {
-      callbackInner(value);
-      ref.current = value;
-    }
-    if (initialRef.current === false) {
+    if ((options == null ? void 0 : options.immediate) && !initialRef.current) {
+      callback(value, value);
       initialRef.current = true;
     }
-    const isEqualValue = equalFnInner(value, ref.current);
-    if (ref.current === void 0) {
+    if (ref.current === initValue) {
       ref.current = value;
-    } else if (isEqualValue === false) {
-      callbackInner(value, ref.current);
+    } else if (equalFn(value, ref.current) === false) {
+      callback(value, ref.current);
       ref.current = value;
     }
-  }, [value]);
+  });
 }
 export {
   useWatchValue

package/dist/hooks/useWatchValue/useWatchValue.es.js.map

@@ -1 +1 @@
-{"version":3,"file":"useWatchValue.es.js","sources":["../../../src/hooks/useWatchValue/useWatchValue.ts"],"sourcesContent":["import { useEffect, useRef } from 'react';\nimport { isEqual } from 'lodash-es';\n\ntype BaseValueType = string | number | boolean | object | Array<unknown> | null | undefined;\n\ninterface Params<T> {\n  value: T;\n  callback: (newValue: T, oldValue?: T | undefined) => void | Promise<void> | (() => void);\n  options?: {\n    equalFn?: (value1: T, value2: T) => boolean;\n    immediate?: boolean;\n  };\n}\n\n/** 监听值变化，\n * - 值变化时调用 callback\n * - 判断值是否变化默认使用 lodash 的 isEqual\n * @param params { value: T; callback: (newValue: T, oldValue?: T) => void | Promise<void>; options?: { equalFn: (value1: T, value2: T) => boolean; immediate?: boolean; }}\n * - 注意：如果你需要使用 useEffect 的 cleanUp 函数，可以考虑在 callback 中使用。或者使用 useEffect。\n */\nexport function useWatchValue<T extends BaseValueType>(params: Params<T>) {\n  const { value, callback, options } = params;\n  const ref = useRef<T | undefined>(undefined);\n  const initialRef = useRef(false);\n\n  const { equalFn = isEqual, immediate } = options || {};\n  const fnObj = useRef({\n    callback,\n    equalFn,\n    immediate,\n  });\n  fnObj.current = {\n    callback,\n    equalFn,\n    immediate,\n  };\n\n  useEffect(() => {\n    const {\n      callback: callbackInner,\n      equalFn: equalFnInner,\n      immediate: immediateInner,\n    } = fnObj.current;\n    if (immediateInner && !initialRef.current) {\n      callbackInner(value);\n      ref.current = value;\n    }\n    if (initialRef.current === false) {\n      initialRef.current = true;\n    }\n\n    const isEqualValue = equalFnInner(value, ref.current);\n    if (ref.current === undefined) {\n      ref.current = value;\n    } else if (isEqualValue === false) {\n      callbackInner(value, ref.current);\n      ref.current = value;\n    }\n  }, [value]);\n}\n"],"names":[],"mappings":";;AAoBO,SAAS,cAAuC,QAAmB;AACxE,QAAM,EAAE,OAAO,UAAU,QAAY,IAAA;AAC/B,QAAA,MAAM,OAAsB,MAAS;AACrC,QAAA,aAAa,OAAO,KAAK;AAE/B,QAAM,EAAE,UAAU,SAAS,UAAU,IAAI,WAAW,CAAC;AACrD,QAAM,QAAQ,OAAO;AAAA,IACnB;AAAA,IACA;AAAA,IACA;AAAA,EAAA,CACD;AACD,QAAM,UAAU;AAAA,IACd;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAEA,YAAU,MAAM;AACR,UAAA;AAAA,MACJ,UAAU;AAAA,MACV,SAAS;AAAA,MACT,WAAW;AAAA,QACT,MAAM;AACN,QAAA,kBAAkB,CAAC,WAAW,SAAS;AACzC,oBAAc,KAAK;AACnB,UAAI,UAAU;AAAA,IAAA;AAEZ,QAAA,WAAW,YAAY,OAAO;AAChC,iBAAW,UAAU;AAAA,IAAA;AAGvB,UAAM,eAAe,aAAa,OAAO,IAAI,OAAO;AAChD,QAAA,IAAI,YAAY,QAAW;AAC7B,UAAI,UAAU;AAAA,IAAA,WACL,iBAAiB,OAAO;AACnB,oBAAA,OAAO,IAAI,OAAO;AAChC,UAAI,UAAU;AAAA,IAAA;AAAA,EAChB,GACC,CAAC,KAAK,CAAC;AACZ;"}
+{"version":3,"file":"useWatchValue.es.js","sources":["../../../src/hooks/useWatchValue/useWatchValue.ts"],"sourcesContent":["import { useEffect, useRef } from 'react';\nimport { isEqual } from 'lodash-es';\n\ntype BaseValueType = string | number | boolean | object | Array<unknown> | null | undefined;\n\nconst initValue = Symbol('initValue');\n\ninterface Params<T> {\n  value: T;\n  callback: (newValue: T, oldValue?: T) => void | Promise<void> | (() => void);\n  options?: {\n    equalFn?: (value1: T, value2: T) => boolean;\n    immediate?: boolean;\n  };\n}\n/**监听值变化，\n * 值变化时调用 callback\n * 判断值是否变化默认使用 lodash 的 isEqual\n * @param params { value: T; callback: (newValue: T, oldValue?: T) => void | Promise<void>; options?: { equalFn: (value1: T, value2: T) => boolean; immediate?: boolean; } }\n */\nexport function useWatchValue<T extends BaseValueType>(params: Params<T>) {\n  const { value, callback, options } = params;\n  const ref = useRef<T | typeof initValue>(initValue);\n  const initialRef = useRef(false);\n\n  const { equalFn = isEqual } = options || {};\n\n  useEffect(() => {\n    if (options?.immediate && !initialRef.current) {\n      callback(value, value);\n      initialRef.current = true;\n    }\n\n    if (ref.current === initValue) {\n      ref.current = value;\n    } else if (equalFn(value, ref.current) === false) {\n      callback(value, ref.current as T);\n      ref.current = value;\n    }\n  });\n}\n"],"names":[],"mappings":";;AAKA,MAAM,YAAY,OAAO,WAAW;AAe7B,SAAS,cAAuC,QAAmB;AACxE,QAAM,EAAE,OAAO,UAAU,QAAY,IAAA;AAC/B,QAAA,MAAM,OAA6B,SAAS;AAC5C,QAAA,aAAa,OAAO,KAAK;AAE/B,QAAM,EAAE,UAAU,QAAQ,IAAI,WAAW,CAAC;AAE1C,YAAU,MAAM;AACd,SAAI,mCAAS,cAAa,CAAC,WAAW,SAAS;AAC7C,eAAS,OAAO,KAAK;AACrB,iBAAW,UAAU;AAAA,IAAA;AAGnB,QAAA,IAAI,YAAY,WAAW;AAC7B,UAAI,UAAU;AAAA,IAAA,WACL,QAAQ,OAAO,IAAI,OAAO,MAAM,OAAO;AACvC,eAAA,OAAO,IAAI,OAAY;AAChC,UAAI,UAAU;AAAA,IAAA;AAAA,EAChB,CACD;AACH;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/biz-components",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "type": "module",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",