diff --git a/incremental/compat/src/arkts/observable.ts b/incremental/compat/src/arkts/observable.ts index e123c9f52b7e598fe58f353a18584b77d6d2baba..8b48b02a54b417d10f4d17667bf48a7175a27e7b 100644 --- a/incremental/compat/src/arkts/observable.ts +++ b/incremental/compat/src/arkts/observable.ts @@ -13,12 +13,12 @@ * limitations under the License. */ -export function getObservableTarget(proxy: Object): Object { - if (PROXY_DISABLED) return proxy +export function getObservableTarget(proxyObj: Object): Object { + if (PROXY_DISABLED) return proxyObj try { - return (Proxy.tryGetTarget(proxy) ?? proxy) as Object + return (proxy.Proxy.tryGetTarget(proxyObj) ?? proxyObj) as Object } catch (error) { - return proxy + return proxyObj } } @@ -213,10 +213,10 @@ export function observableProxy(value: Value, parent?: ObservableHandler, } if (PROXY_DISABLED) return value as Value // TODO: proxy the given object - return Proxy.create(value as Object, new CustomProxyHandler()) as Value + return proxy.Proxy.create(value as Object, new CustomProxyHandler()) as Value } -class CustomProxyHandler extends DefaultProxyHandler { +class CustomProxyHandler extends proxy.DefaultProxyHandler { override get(target: T, name: string): NullishType { const observable = ObservableHandler.find(target) if (observable) observable.onAccess()