Match-id-17719191991ce335a66dd99e1b57c5e119685a4b

libs/horizon/index.ts

@@ -69,6 +69,7 @@ import {
 } from './src/dom/DOMExternal';
 
 import { syncUpdates as flushSync } from './src/renderer/TreeBuilder';
+import { toRaw } from './src/horizonx/proxy/ProxyHandler';
 
 const Horizon = {
   Children,
@@ -157,6 +158,7 @@ export {
   clearStore,
   reduxAdapter,
   watch,
+  toRaw,
   // 兼容ReactIs
   isFragment,
   isElement,

libs/horizon/src/horizonx/Constants.ts

@@ -13,4 +13,4 @@
  * See the Mulan PSL v2 for more details.
  */
 
-export const OBSERVER_KEY = '_horizonObserver';
+export const OBSERVER_KEY = typeof Symbol === 'function' ? Symbol('_horizonObserver') : '_horizonObserver';

libs/horizon/src/horizonx/proxy/ProxyHandler.ts

@@ -52,7 +52,15 @@ export function createProxy(rawObj: any, listener: { current: (...args) => any }
   let observer: IObserver = getObserver(rawObj);
   if (!observer) {
     observer = isHookObserver ? new Observer() : new HooklessObserver();
-    rawObj[OBSERVER_KEY] = observer;
+    if (typeof OBSERVER_KEY === 'string') {
+      Object.defineProperty(rawObj, OBSERVER_KEY, {
+        configurable: false,
+        enumerable: false,
+        value: observer,
+      });
+    } else {
+      rawObj[OBSERVER_KEY] = observer;
+    }
   }
 
   hookObserverMap.set(rawObj, isHookObserver);
@@ -96,3 +104,7 @@ export function createProxy(rawObj: any, listener: { current: (...args) => any }
 
   return proxyObj;
 }
+
+export function toRaw<T>(observed: T): T {
+  return observed && (observed)['_rawValue'];
+}

libs/horizon/src/horizonx/proxy/handlers/ArrayProxyHandler.ts

@@ -137,6 +137,10 @@ export function createArrayProxy(rawObj: any[], listener: { current: (...args) =
       return objectGet(rawObj, key, receiver);
     }
 
+    if (key === '_rawValue') {
+      return rawObj;
+    }
+
     return Reflect.get(rawObj, key, receiver);
   }
 

libs/horizon/src/horizonx/proxy/handlers/MapProxy.ts

@@ -388,6 +388,10 @@ export function createMapProxy(
       };
     }
 
+    if (key === '_rawValue') {
+      return rawObj;
+    }
+
     return Reflect.get(rawObj, key, receiver);
   }
   //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

libs/horizon/src/horizonx/proxy/handlers/ObjectProxyHandler.ts

@@ -78,6 +78,10 @@ export function createObjectProxy<T extends object>(
       };
     }
 
+    if (key === '_rawValue') {
+      return rawObj;
+    }
+
     observer.useProp(key);
 
     const value = Reflect.get(rawObj, key, receiver);

libs/horizon/src/horizonx/proxy/handlers/SetProxy.ts

@@ -179,6 +179,11 @@ export function createSetProxy<T extends object>(
         };
       };
     }
+
+    if (key === '_rawValue') {
+      return rawObj;
+    }
+
     return Reflect.get(rawObj, key, receiver);
   }
   //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

libs/horizon/src/horizonx/proxy/handlers/WeakMapProxy.ts

@@ -96,6 +96,10 @@ export function createWeakMapProxy(
       };
     }
 
+    if (key === '_rawValue') {
+      return rawObj;
+    }
+
     return Reflect.get(rawObj, key, receiver);
   }
 

libs/horizon/src/horizonx/proxy/handlers/WeakSetProxy.ts

@@ -60,6 +60,11 @@ export function createWeakSetProxy<T extends object>(
         };
       };
     }
+
+    if (key === '_rawValue') {
+      return rawObj;
+    }
+
     return Reflect.get(rawObj, key, receiver);
   }
   //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////