@react-native-ohos/react-native-webview 13.16.2-beta.2 → 13.16.2

package/harmony/rn_webview/src/main/ets/WebViewTurboModule.ets

@@ -1,63 +1,67 @@
-// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
-// Use of this source code is governed by a Apache-2.0 license that can be
-// found in the LICENSE file.
-
-import { TM } from './generated/ts';
-import { AnyThreadTurboModule } from '@rnoh/react-native-openharmony/ts';
-import Logger from './Logger';
-
-const TAG = "WebViewTurboModule"
-
-export class WebViewTurboModule extends AnyThreadTurboModule implements TM.RNCWebViewModule.Spec {
-  private shouldStartParamsMap : Map<number,ShouldStartParams> = new Map();
-
-  isFileUploadSupported(): Promise<boolean> {
-    return Promise.resolve(true)
-  }
-
-  shouldStartLoadWithLockIdentifier(shouldStart: boolean, lockIdentifier: number): void {
-    Logger.debug("shouldStartLoadWithLockIdentifier:" + shouldStart + " lockIdentifier:" + lockIdentifier)
-    let shouldStartParams = this.shouldStartParamsMap.get(lockIdentifier)
-    Logger.debug("shouldStartLoadWithLockIdentifier setShouldStartParams:" + JSON.stringify(shouldStartParams))
-    if (shouldStartParams) {
-      shouldStartParams.shouldStart = shouldStart
-      shouldStartParams.lockState = shouldStart ? ShouldOverrideCallbackState.ALLOW_LOADING : ShouldOverrideCallbackState.SHOULD_OVERRIDE;
-    }
-    this.shouldStartParamsMap.set(lockIdentifier,shouldStartParams || new ShouldStartParams())
-  }
-
-
-  setShouldStartParams(params: ShouldStartParams){
-    Logger.debug("setShouldStartParams:" + JSON.stringify(params))
-    this.shouldStartParamsMap.set(params.lockIdentifier,params)
-  }
-}
-
-// 锁状态
-export enum ShouldOverrideCallbackState {
-  /**
-   * 等待返回状态
-   */
-  UNDECIDED,
-  /**
-   * 阻止加载
-   */
-  SHOULD_OVERRIDE,
-  /**
-   * 允许加载
-   */
-  ALLOW_LOADING,
-
-   /**
-   * 允许加载
-   */
-  DEFAULT,
-}
-
-@Sendable
-export class ShouldStartParams {
-  shouldStart: boolean = true
-  lockIdentifier: number = -1
-  // 对应ShouldOverrideCallbackState
-  lockState: number = ShouldOverrideCallbackState.DEFAULT
-}
+// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+// Use of this source code is governed by a Apache-2.0 license that can be
+// found in the LICENSE file.
+
+import { TM } from './generated/ts';
+import { AnyThreadTurboModule } from '@rnoh/react-native-openharmony/ts';
+import Logger from './Logger';
+
+const TAG = "WebViewTurboModule"
+
+export class WebViewTurboModule extends AnyThreadTurboModule implements TM.RNCWebViewModule.Spec {
+  private shouldStartParamsMap : Map<number,ShouldStartParams> = new Map();
+
+  isFileUploadSupported(): Promise<boolean> {
+    return Promise.resolve(true)
+  }
+
+  shouldStartLoadWithLockIdentifier(shouldStart: boolean, lockIdentifier: number): void {
+    Logger.debug("shouldStartLoadWithLockIdentifier:" + shouldStart + " lockIdentifier:" + lockIdentifier)
+    let shouldStartParams = this.shouldStartParamsMap.get(lockIdentifier)
+    Logger.debug("shouldStartLoadWithLockIdentifier setShouldStartParams:" + JSON.stringify(shouldStartParams))
+    if (shouldStartParams) {
+      shouldStartParams.shouldStart = shouldStart
+      shouldStartParams.lockState = shouldStart ? ShouldOverrideCallbackState.ALLOW_LOADING : ShouldOverrideCallbackState.SHOULD_OVERRIDE;
+      this.shouldStartParamsMap.delete(lockIdentifier)
+    }
+  }
+
+
+  setShouldStartParams(params: ShouldStartParams){
+    Logger.debug("setShouldStartParams:" + JSON.stringify(params))
+    this.shouldStartParamsMap.set(params.lockIdentifier,params)
+  }
+
+  __onDestroy__(): void {
+    this.shouldStartParamsMap.clear()
+  }
+}
+
+// 锁状态
+export enum ShouldOverrideCallbackState {
+  /**
+   * 等待返回状态
+   */
+  UNDECIDED,
+  /**
+   * 阻止加载
+   */
+  SHOULD_OVERRIDE,
+  /**
+   * 允许加载
+   */
+  ALLOW_LOADING,
+
+   /**
+   * 允许加载
+   */
+  DEFAULT,
+}
+
+@Sendable
+export class ShouldStartParams {
+  shouldStart: boolean = true
+  lockIdentifier: number = -1
+  // 对应ShouldOverrideCallbackState
+  lockState: number = ShouldOverrideCallbackState.DEFAULT
+}