chore(release): v1.4.9

easy-form · May 6, 2024 · 9040b68 · 9040b68
2 parents f60ac50 + 45ffa31
commit 9040b68
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-form-simple",
-  "version": "1.4.8",
+  "version": "1.4.9",
   "description": "A form library for quickly controlling react form input",
   "keywords": [
     "react",

diff --git a/src/use/useForm.ts b/src/use/useForm.ts
@@ -24,6 +24,11 @@ const useForm = <T extends Record<string, any>>(
 
   const { contextProps, overlayApis, globalDatas } = useContextApi();
 
+  const globalMaps = useRef({
+    proxyMap: new WeakMap(),
+    rawMap: new WeakMap(),
+  });
+
   const debounceFn = useRef({
     watch: debounce(() => {
       watchInstance.emit();
@@ -44,6 +49,8 @@ const useForm = <T extends Record<string, any>>(
       {
         path: [],
         onChangeLength: debounceFn.onChangeLength,
+        rawMap: globalMaps.current.rawMap,
+        proxyMap: globalMaps.current.proxyMap,
       },
     );
   }).current;

diff --git a/src/utils/controller.ts b/src/utils/controller.ts
@@ -14,8 +14,8 @@ const Proxys = window.Proxy || proxyPolyfill;
 
 export type ObserverOptions = {
   path?: string[];
-  proxyMap?: WeakMap<object, any>;
-  rawMap?: WeakMap<object, any>;
+  proxyMap: WeakMap<object, any>;
+  rawMap: WeakMap<object, any>;
   onChangeLength?: () => void;
 };
 
@@ -136,15 +136,29 @@ export const observer = <T extends object>(
   cb?: (args: ObserverCb) => void,
   options?: ObserverOptions,
 ): T => {
-  const { path = [], onChangeLength } = options || {};
+  const {
+    path = [],
+    onChangeLength,
+    proxyMap,
+    rawMap,
+  } = (options || {}) as ObserverOptions;
+
+  const existingProxy = proxyMap.get(initialVal);
+  if (existingProxy) {
+    return existingProxy;
+  }
+
+  if (rawMap.has(initialVal)) {
+    return initialVal;
+  }
 
   const proxy = new Proxys(initialVal, {
     get(target, key, receiver) {
       const ret = Reflect.get(target, key, receiver);
       if (React.isValidElement(ret)) return ret;
       return isObjectOrArray(ret)
         ? observer(ret as T, cb, {
-            ...options,
+            ...(options as ObserverOptions),
             path: [...path, key.toString()],
           })
         : ret;
@@ -192,7 +206,7 @@ export const createControllerObserver = <T extends object>(
       if (React.isValidElement(ret)) return ret;
       return isObjectOrArray(ret)
         ? createControllerObserver(ret as T, cb, {
-            ...options,
+            ...(options as ObserverOptions),
             path: [...path, key.toString()],
           })
         : ret;