From 6fbe4d695e7eda8b8c442a9cba08bd3df9d11d62 Mon Sep 17 00:00:00 2001 From: liwenzhen Date: Fri, 12 Sep 2025 08:42:51 +0800 Subject: [PATCH] fix review comments Signed-off-by: liwenzhen --- .../state_mgmt/src/lib/common/weakref_pool.ts | 2 +- .../state_mgmt/src/lib/v2/v2_change_observation.ts | 8 ++++---- .../state_mgmt/src/lib/v2/v2_computed.ts | 2 +- .../state_mgmt/src/lib/v2/v2_monitor.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frameworks/bridge/declarative_frontend/state_mgmt/src/lib/common/weakref_pool.ts b/frameworks/bridge/declarative_frontend/state_mgmt/src/lib/common/weakref_pool.ts index f7771235a34..cf0b0998916 100644 --- a/frameworks/bridge/declarative_frontend/state_mgmt/src/lib/common/weakref_pool.ts +++ b/frameworks/bridge/declarative_frontend/state_mgmt/src/lib/common/weakref_pool.ts @@ -54,7 +54,7 @@ class WeakRefPool { // Create a WeakRef for the given object and put it into the pool, or get // existing WeakRef from the pool if the object is already there. WeakRefs // for the same object are always identical. - public static getWeekRef(obj: T): WeakRef { + public static getWeakRef(obj: T): WeakRef { let observedV2ClassInfo = WeakRefPool.wmap_.get(obj); if (observedV2ClassInfo === undefined) { WeakRefPool.wmap_.set(obj, observedV2ClassInfo = { weakRef: new WeakRef(obj), cleanupInfo: {} }); diff --git a/frameworks/bridge/declarative_frontend/state_mgmt/src/lib/v2/v2_change_observation.ts b/frameworks/bridge/declarative_frontend/state_mgmt/src/lib/v2/v2_change_observation.ts index 63d28b11086..b918a0ae36f 100644 --- a/frameworks/bridge/declarative_frontend/state_mgmt/src/lib/v2/v2_change_observation.ts +++ b/frameworks/bridge/declarative_frontend/state_mgmt/src/lib/v2/v2_change_observation.ts @@ -204,7 +204,7 @@ class ObserveV2 { this.id2cmp_[id] = new WeakRef(cmp); return; } - const weakRef = WeakRefPool.getWeekRef(cmp); + const weakRef = WeakRefPool.getWeakRef(cmp); // this instance, which maybe MonitorV2/ComputedV2 have been already recorded in id2Others if (this.id2Others_[id] === weakRef) { return; @@ -408,7 +408,7 @@ class ObserveV2 { idRefs[id].add(attrName); } - const weakRef = WeakRefPool.getWeekRef(target); + const weakRef = WeakRefPool.getWeakRef(target); if (this.id2targets_?.[id]?.has(weakRef)) { return; } @@ -1070,7 +1070,7 @@ class ObserveV2 { public clearMonitorPath(target: object, path: string | string[], monitorFunc?: MonitorCallback): void { const refs = target[ObserveV2.ADD_MONITOR_REFS] ??= {}; const paths = Array.isArray(path) ? path : [path]; - + if (monitorFunc) { const funcName = monitorFunc.name; let monitor = refs[funcName]; @@ -1148,7 +1148,7 @@ class ObserveV2 { } public registerMonitor(monitor: MonitorV2, id: number): void { - const weakRef = WeakRefPool.getWeekRef(monitor); + const weakRef = WeakRefPool.getWeakRef(monitor); // this instance, which maybe MonitorV2/ComputedV2 have been already recorded in id2Others if (this.id2Others_[id] === weakRef) { return; diff --git a/frameworks/bridge/declarative_frontend/state_mgmt/src/lib/v2/v2_computed.ts b/frameworks/bridge/declarative_frontend/state_mgmt/src/lib/v2/v2_computed.ts index 58d5e32f250..5e5935d0a2a 100644 --- a/frameworks/bridge/declarative_frontend/state_mgmt/src/lib/v2/v2_computed.ts +++ b/frameworks/bridge/declarative_frontend/state_mgmt/src/lib/v2/v2_computed.ts @@ -130,7 +130,7 @@ class ComputedV2 { public static clearComputedFromTarget(target: Object): void { const computedIds = ComputedV2.getComputedIds(target); stateMgmtConsole.debug(`ComputedV2: clearComputedFromTarget: from target ${target.constructor?.name} computedIds to clear ${JSON.stringify(computedIds)}`); - computedIds?.forEach((computedId: number) => { + computedIds.forEach((computedId: number) => { ObserveV2.getObserve().clearWatch(computedId); delete ObserveV2.getObserve().id2Others_[computedId]; }); diff --git a/frameworks/bridge/declarative_frontend/state_mgmt/src/lib/v2/v2_monitor.ts b/frameworks/bridge/declarative_frontend/state_mgmt/src/lib/v2/v2_monitor.ts index cf9d9caea0e..97756555c6c 100644 --- a/frameworks/bridge/declarative_frontend/state_mgmt/src/lib/v2/v2_monitor.ts +++ b/frameworks/bridge/declarative_frontend/state_mgmt/src/lib/v2/v2_monitor.ts @@ -354,7 +354,7 @@ public notifyChangeForEachPath(pathId: number): number { public static clearWatchesFromTarget(target: Object): void { const monitorIds = MonitorV2.getMonitorIds(target); stateMgmtConsole.debug(`MonitorV2: clearWatchesFromTarget: from target ${target.constructor?.name} watchIds to clear ${JSON.stringify(monitorIds)}`); - monitorIds?.forEach((watchId) => { + monitorIds.forEach((watchId) => { ObserveV2.getObserve().clearWatch(watchId); delete ObserveV2.getObserve().id2Others_[watchId]; }); -- Gitee