@react-native-ohos/react-native-webview 13.15.1-rc.5 → 13.15.1-rc.7

package/harmony/rn_webview/oh-package.json5

@@ -6,7 +6,7 @@
   "name": "@react-native-ohos/react-native-webview",
   "description": "main cpai architecture",
   "main": "index.ets",
-  "version": "13.15.1-rc.5",
+  "version": "13.15.1-rc.7",
   "dependencies": {
     "@rnoh/react-native-openharmony": "../react_native_openharmony.har"
   }

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

@@ -8,7 +8,7 @@ import { url as OSUrl } from '@kit.ArkTS';
 import { RNC, TM } from './generated';
 import Logger from './Logger';
 import { BaseOperate } from './WebViewBaseOperate';
-import { deviceInfo } from '@kit.BasicServicesKit';
+import { deviceInfo ,BusinessError} from '@kit.BasicServicesKit';
 import {
   AlertEvent,
   CACHE_MODE,
@@ -39,6 +39,7 @@ export const WEB_VIEW = "RNCWebView"
 @Sendable
 class WorkerRunnable implements WorkerTaskRunnable<ShouldStartParams> {
   run(rnInstance: AnyThreadRNInstance, params: ShouldStartParams): void {
+     params.lockState = ShouldOverrideCallbackState.UNDECIDED
     rnInstance.getTurboModule<WebViewTurboModule>(TM.RNCWebViewModule.NAME).setShouldStartParams(params)
   }
 }
@@ -338,6 +339,14 @@ export struct RNCWebView {
     return getContext(this).resourceManager.getStringSync(resource)
   }
 
+  onLoadFinished() {
+    this.onLoadingFinish()
+  }
+
+  onPageEndExecuteRunInjectedJavaScript(){
+    this.runInjectedJavaScript()
+  }
+
   onPageEnd() {
     this.runInjectedJavaScript()
     this.onLoadingFinish()
@@ -443,7 +452,8 @@ export struct RNCWebView {
               scrollBackward: this.nestedScroll,
             })
             .onLoadStarted(() => this.onPageBegin())
-            .onLoadFinished(() => this.onPageEnd())
+            .onLoadFinished(() => this.onLoadFinished())
+            .onPageEnd(() => {this.onPageEndExecuteRunInjectedJavaScript()})
             .onErrorReceive((event: OnErrorReceiveEvent) => this.webViewBaseOperate?.emitLoadingError(event))
             .onHttpErrorReceive((event: OnHttpErrorReceiveEvent) => this.webViewBaseOperate?.emitHttpError(event))
             .onControllerAttached(() => this.controllerAttachedInit())

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

@@ -36,7 +36,7 @@ export class WebViewTurboModule extends AnyThreadTurboModule implements TM.RNCWe
 // 锁状态
 export enum ShouldOverrideCallbackState {
   /**
-   * 初始状态
+   * 等待返回状态
    */
   UNDECIDED,
   /**
@@ -47,6 +47,11 @@ export enum ShouldOverrideCallbackState {
    * 允许加载
    */
   ALLOW_LOADING,
+
+   /**
+   * 允许加载
+   */
+  DEFAULT,
 }
 
 @Sendable
@@ -54,5 +59,5 @@ export class ShouldStartParams {
   shouldStart: boolean = true
   lockIdentifier: number = -1
   // 对应ShouldOverrideCallbackState
-  lockState: number = 0
+  lockState: number = ShouldOverrideCallbackState.DEFAULT
 }

package/package.json

@@ -9,7 +9,7 @@
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
   ],
   "license": "MIT",
-  "version": "13.15.1-rc.5",
+  "version": "13.15.1-rc.7",
   "homepage": "https://gitcode.com/openharmony-sig/rntpc_react-native-webview/tree/br_rnoh0.77#readme",
   "scripts": {
     "macos": "react-native run-macos --scheme WebviewExample --project-path example/macos",