@react-native-ohos/react-native-webview 13.10.5-rc.3 → 13.10.5-rc.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/harmony/rn_webview/oh-package.json5 +1 -1
  2. package/harmony/rn_webview/src/main/ets/RNCWebView.ets +11 -1
  3. package/harmony/rn_webview/src/main/ets/WebViewTurboModule.ets +6 -2
  4. package/harmony/rn_webview.har +0 -0
  5. package/package.json +1 -1
package/harmony/rn_webview/oh-package.json5 CHANGED
@@ -6,7 +6,7 @@
6
6
  "name": "@react-native-ohos/react-native-webview",
7
7
  "description": "main cpai architecture",
8
8
  "main": "index.ets",
9
- "version": "13.10.5-rc.3",
9
+ "version": "13.10.5-rc.5",
10
10
  "dependencies": {
11
11
  "@rnoh/react-native-openharmony": "0.72.59"
12
12
  }
package/harmony/rn_webview/src/main/ets/RNCWebView.ets CHANGED
@@ -59,6 +59,7 @@ export const WEB_VIEW = "RNCWebView"
59
59
  @Sendable
60
60
  class WorkerRunnable implements WorkerTaskRunnable<ShouldStartParams> {
61
61
  run(rnInstance: AnyThreadRNInstance, params: ShouldStartParams): void {
62
+ params.lockState = ShouldOverrideCallbackState.UNDECIDED
62
63
  rnInstance.getTurboModule<WebViewTurboModule>(TM.RNCWebViewModule.NAME).setShouldStartParams(params)
63
64
  }
64
65
  }
@@ -371,6 +372,14 @@ export struct RNCWebView {
371
372
  return getContext(this).resourceManager.getStringSync(resource)
372
373
  }
373
374
 
375
+ onLoadFinished() {
376
+ this.onLoadingFinish()
377
+ }
378
+
379
+ onPageEndExecuteRunInjectedJavaScript(){
380
+ this.runInjectedJavaScript()
381
+ }
382
+
374
383
  onPageEnd() {
375
384
  this.runInjectedJavaScript()
376
385
  this.onLoadingFinish()
@@ -476,7 +485,8 @@ export struct RNCWebView {
476
485
  scrollBackward: this.nestedScroll,
477
486
  })
478
487
  .onLoadStarted(() => this.onPageBegin())
479
- .onLoadFinished(() => this.onPageEnd())
488
+ .onLoadFinished(() => this.onLoadFinished())
489
+ .onPageEnd(() => {this.onPageEndExecuteRunInjectedJavaScript()})
480
490
  .onErrorReceive((event: OnErrorReceiveEvent) => this.webViewBaseOperate?.emitLoadingError(event))
481
491
  .onHttpErrorReceive((event: OnHttpErrorReceiveEvent) => this.webViewBaseOperate?.emitHttpError(event))
482
492
  .onControllerAttached(() => this.controllerAttachedInit())
package/harmony/rn_webview/src/main/ets/WebViewTurboModule.ets CHANGED
@@ -56,7 +56,7 @@ export class WebViewTurboModule extends AnyThreadTurboModule implements TM.RNCWe
56
56
  // 锁状态
57
57
  export enum ShouldOverrideCallbackState {
58
58
  /**
59
- * 初始状态
59
+ * 等待返回状态
60
60
  */
61
61
  UNDECIDED,
62
62
  /**
@@ -67,6 +67,10 @@ export enum ShouldOverrideCallbackState {
67
67
  * 允许加载
68
68
  */
69
69
  ALLOW_LOADING,
70
+ /**
71
+ * 允许加载
72
+ */
73
+ DEFAULT,
70
74
  }
71
75
 
72
76
  @Sendable
@@ -74,5 +78,5 @@ export class ShouldStartParams {
74
78
  shouldStart: boolean = true
75
79
  lockIdentifier: number = -1
76
80
  // 对应ShouldOverrideCallbackState
77
- lockState: number = 0
81
+ lockState: number = ShouldOverrideCallbackState.DEFAULT
78
82
  }
package/harmony/rn_webview.har CHANGED
Binary file
package/package.json CHANGED
@@ -9,7 +9,7 @@
9
9
  "Thibault Malbranche <malbranche.thibault@gmail.com>"
10
10
  ],
11
11
  "license": "MIT",
12
- "version": "13.10.5-rc.3",
12
+ "version": "13.10.5-rc.5",
13
13
  "homepage": "https://github.com/react-native-oh-library/react-native-webview#readme",
14
14
  "scripts": {
15
15
  "macos": "react-native run-macos --scheme WebviewExample --project-path example/macos",