@react-native-ohos/react-native-webview 13.10.5-rc.2 → 13.10.5-rc.4

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.10.5-rc.2",
+  "version": "13.10.5-rc.4",
   "dependencies": {
     "@rnoh/react-native-openharmony": "0.72.59"
   }

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

@@ -28,6 +28,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 {
   AlertEvent,
   CACHE_MODE,
@@ -370,6 +371,14 @@ export struct RNCWebView {
     return getContext(this).resourceManager.getStringSync(resource)
   }
 
+  onLoadFinished() {
+    this.onLoadingFinish()
+  }
+
+  onPageEndExecuteRunInjectedJavaScript(){
+    this.runInjectedJavaScript()
+  }
+
   onPageEnd() {
     this.runInjectedJavaScript()
     this.onLoadingFinish()
@@ -421,78 +430,153 @@ export struct RNCWebView {
 
   build() {
     Stack() {
-      Web({ src: "", controller: this.controller, renderMode: this.renderMode })
-        .mixedMode(this.mode)
-        .onPermissionRequest((event: OnPermissionRequestEvent) => {
-          if (event && (this.getPermissionDialogMessage(event) != "TYPE_SENSOR")) {
-            AlertDialog.show({
-              title: this.resourceToString($r('app.string.on_confirm')) + event.request.getOrigin(),
-              message: this.getPermissionDialogMessage(event),
-              alignment: DialogAlignment.Center,
-              primaryButton: {
-                value: $r('app.string.deny'),
-                action: () => {
-                  event.request.deny();
-                }
-              },
-              secondaryButton: {
-                value: $r('app.string.on_confirm'),
-                action: () => {
-                  event.request.grant(event.request.getAccessibleResource());
-                }
-              },
-              cancel: () => {
-                event.request.deny();
+        if ( deviceInfo.sdkApiVersion >= 20) {
+          Web({ src: "", controller: this.controller, renderMode: this.renderMode })
+            .mixedMode(this.mode)
+            .onPermissionRequest((event: OnPermissionRequestEvent) => {
+              if (event && (this.getPermissionDialogMessage(event) != "TYPE_SENSOR")) {
+                AlertDialog.show({
+                  title: this.resourceToString($r('app.string.on_confirm')) + event.request.getOrigin(),
+                  message: this.getPermissionDialogMessage(event),
+                  alignment: DialogAlignment.Center,
+                  primaryButton: {
+                    value: $r('app.string.deny'),
+                    action: () => {
+                      event.request.deny();
+                    }
+                  },
+                  secondaryButton: {
+                    value: $r('app.string.on_confirm'),
+                    action: () => {
+                      event.request.grant(event.request.getAccessibleResource());
+                    }
+                  },
+                  cancel: () => {
+                    event.request.deny();
+                  }
+                })
+              }
+            })
+            .width(this.webviewWidth)
+            .height(this.webviewHeight)
+            .fileAccess(this.allowFileAccess)
+            .constraintSize({ minHeight: MINHEIGHT })
+            .overScrollMode(this.overScrollMode)
+            .javaScriptAccess(this.javaScriptEnable)
+            .javaScriptOnDocumentStart(this.injectedJavaScriptBeforeContentLoaded)
+            .horizontalScrollBarAccess(this.descriptorWrapper.rawProps.showsHorizontalScrollIndicator)
+            .verticalScrollBarAccess(this.descriptorWrapper.rawProps.showsVerticalScrollIndicator)
+            .overviewModeAccess(this.descriptorWrapper.rawProps.scalesPageToFit)
+            .textZoomRatio(this.descriptorWrapper.rawProps.textZoom)
+            .backgroundColor(BaseOperate.getColorMode(this.ctx.uiAbilityContext,
+              this.descriptorWrapper.rawProps.forceDarkOn) === WebDarkMode.On ? Color.White : Color.Transparent)
+            .darkMode(BaseOperate.getColorMode(this.ctx.uiAbilityContext, this.descriptorWrapper.rawProps.forceDarkOn))
+            .forceDarkAccess(this.forceDark)
+            .cacheMode(this.cacheMode)
+            .minFontSize(this.minFontSize)
+            .domStorageAccess(this.descriptorWrapper.rawProps.domStorageEnabled)
+            .zoomAccess(this.descriptorWrapper.rawProps.scalesPageToFit)
+            .overScrollMode(this.overScrollMode)
+            .onProgressChange((event: OnProgressChangeEvent) => this.onProgressChange(event))
+            .onScroll((event: OnScrollEvent) => this.webViewBaseOperate?.emitScroll(event))
+            .nestedScroll({
+              scrollForward: this.nestedScroll,
+              scrollBackward: this.nestedScroll,
+            })
+            .onLoadStarted(() => this.onPageBegin())
+            .onLoadFinished(() => this.onLoadFinished())
+            .onPageEnd(() => {this.onPageEndExecuteRunInjectedJavaScript()})
+            .onErrorReceive((event: OnErrorReceiveEvent) => this.webViewBaseOperate?.emitLoadingError(event))
+            .onHttpErrorReceive((event: OnHttpErrorReceiveEvent) => this.webViewBaseOperate?.emitHttpError(event))
+            .onControllerAttached(() => this.controllerAttachedInit())
+            .onAlert((event: AlertEvent) => this.onJavascriptAlert(event))
+            .onConfirm((event: AlertEvent) => this.onJavascriptConfirm(event))
+            .onDownloadStart((event: OnDownloadStartEvent) => this.webViewBaseOperate?.onDownloadStart(event))
+            .geolocationAccess(this.descriptorWrapper.rawProps.geolocationEnabled)
+            .onGeolocationShow((event) => {
+              if (event && (this.descriptorWrapper.rawProps.geolocationEnabled != undefined)) {
+                event.geolocation.invoke(event.origin, this.descriptorWrapper.rawProps.geolocationEnabled, true);
+              }
+            })
+            .mediaPlayGestureAccess(this.descriptorWrapper.rawProps.mediaPlaybackRequiresUserAction)
+            .onRenderExited((event: OnRenderExitedEvent) => this.webViewBaseOperate?.onRenderExited(event))
+            .onLoadIntercept((event: OnLoadInterceptEvent) => this.onLoadIntercept(event))
+            .onTitleReceive((event: OnTitleReceiveEvent) => this.webViewBaseOperate?.onTitleReceive(event))
+        } else {
+          Web({ src: "", controller: this.controller, renderMode: this.renderMode })
+            .mixedMode(this.mode)
+            .onPermissionRequest((event: OnPermissionRequestEvent) => {
+              if (event && (this.getPermissionDialogMessage(event) != "TYPE_SENSOR")) {
+                AlertDialog.show({
+                  title: this.resourceToString($r('app.string.on_confirm')) + event.request.getOrigin(),
+                  message: this.getPermissionDialogMessage(event),
+                  alignment: DialogAlignment.Center,
+                  primaryButton: {
+                    value: $r('app.string.deny'),
+                    action: () => {
+                      event.request.deny();
+                    }
+                  },
+                  secondaryButton: {
+                    value: $r('app.string.on_confirm'),
+                    action: () => {
+                      event.request.grant(event.request.getAccessibleResource());
+                    }
+                  },
+                  cancel: () => {
+                    event.request.deny();
+                  }
+                })
               }
             })
-          }
-        })
 
-        .width(this.webviewWidth)
-        .height(this.webviewHeight)
-        .fileAccess(this.allowFileAccess)
-        .constraintSize({ minHeight: MINHEIGHT })
-        .overScrollMode(this.overScrollMode)
-        .javaScriptAccess(this.javaScriptEnable)
-        .javaScriptOnDocumentStart(this.injectedJavaScriptBeforeContentLoaded)
-        .horizontalScrollBarAccess(this.descriptorWrapper.rawProps.showsHorizontalScrollIndicator)
-        .verticalScrollBarAccess(this.descriptorWrapper.rawProps.showsVerticalScrollIndicator)
-        .overviewModeAccess(this.descriptorWrapper.rawProps.scalesPageToFit)
-        .textZoomRatio(this.descriptorWrapper.rawProps.textZoom)
-        .backgroundColor(BaseOperate.getColorMode(this.ctx.uiAbilityContext,
-          this.descriptorWrapper.rawProps.forceDarkOn) === WebDarkMode.On ? Color.White : Color.Transparent)
-        .darkMode(BaseOperate.getColorMode(this.ctx.uiAbilityContext, this.descriptorWrapper.rawProps.forceDarkOn))
-        .forceDarkAccess(this.forceDark)
-        .cacheMode(this.cacheMode)
-        .minFontSize(this.minFontSize)
-        .domStorageAccess(this.descriptorWrapper.rawProps.domStorageEnabled)
-        .zoomAccess(this.descriptorWrapper.rawProps.scalesPageToFit)
-        .overScrollMode(this.overScrollMode)
-        .onProgressChange((event: OnProgressChangeEvent) => this.onProgressChange(event))
-        .onScroll((event: OnScrollEvent) => this.webViewBaseOperate?.emitScroll(event))
-        .nestedScroll({
-          scrollForward: this.nestedScroll,
-          scrollBackward: this.nestedScroll,
-        })
-        .onLoadStarted(() => this.onPageBegin())
-        .onLoadFinished(() => this.onPageEnd())
-        .onErrorReceive((event: OnErrorReceiveEvent) => this.webViewBaseOperate?.emitLoadingError(event))
-        .onHttpErrorReceive((event: OnHttpErrorReceiveEvent) => this.webViewBaseOperate?.emitHttpError(event))
-        .onControllerAttached(() => this.controllerAttachedInit())
-        .onAlert((event: AlertEvent) => this.onJavascriptAlert(event))
-        .onConfirm((event: AlertEvent) => this.onJavascriptConfirm(event))
-        .onDownloadStart((event: OnDownloadStartEvent) => this.webViewBaseOperate?.onDownloadStart(event))
-        .geolocationAccess(this.descriptorWrapper.rawProps.geolocationEnabled)
-        .onGeolocationShow((event) => {
-          if (event && (this.descriptorWrapper.rawProps.geolocationEnabled != undefined)) {
-            event.geolocation.invoke(event.origin, this.descriptorWrapper.rawProps.geolocationEnabled, true);
+            .width(this.webviewWidth)
+            .height(this.webviewHeight)
+            .fileAccess(this.allowFileAccess)
+            .constraintSize({ minHeight: MINHEIGHT })
+            .overScrollMode(this.overScrollMode)
+            .javaScriptAccess(this.javaScriptEnable)
+            .javaScriptOnDocumentStart(this.injectedJavaScriptBeforeContentLoaded)
+            .horizontalScrollBarAccess(this.descriptorWrapper.rawProps.showsHorizontalScrollIndicator)
+            .verticalScrollBarAccess(this.descriptorWrapper.rawProps.showsVerticalScrollIndicator)
+            .overviewModeAccess(this.descriptorWrapper.rawProps.scalesPageToFit)
+            .textZoomRatio(this.descriptorWrapper.rawProps.textZoom)
+            .backgroundColor(BaseOperate.getColorMode(this.ctx.uiAbilityContext,
+              this.descriptorWrapper.rawProps.forceDarkOn) === WebDarkMode.On ? Color.White : Color.Transparent)
+            .darkMode(BaseOperate.getColorMode(this.ctx.uiAbilityContext, this.descriptorWrapper.rawProps.forceDarkOn))
+            .forceDarkAccess(this.forceDark)
+            .cacheMode(this.cacheMode)
+            .minFontSize(this.minFontSize)
+            .domStorageAccess(this.descriptorWrapper.rawProps.domStorageEnabled)
+            .zoomAccess(this.descriptorWrapper.rawProps.scalesPageToFit)
+            .overScrollMode(this.overScrollMode)
+            .onProgressChange((event: OnProgressChangeEvent) => this.onProgressChange(event))
+            .onScroll((event: OnScrollEvent) => this.webViewBaseOperate?.emitScroll(event))
+            .nestedScroll({
+              scrollForward: this.nestedScroll,
+              scrollBackward: this.nestedScroll,
+            })
+            .onPageBegin(() => this.onPageBegin())
+            .onPageEnd(() => this.onPageEnd())
+            .onErrorReceive((event: OnErrorReceiveEvent) => this.webViewBaseOperate?.emitLoadingError(event))
+            .onHttpErrorReceive((event: OnHttpErrorReceiveEvent) => this.webViewBaseOperate?.emitHttpError(event))
+            .onControllerAttached(() => this.controllerAttachedInit())
+            .onAlert((event: AlertEvent) => this.onJavascriptAlert(event))
+            .onConfirm((event: AlertEvent) => this.onJavascriptConfirm(event))
+            .onDownloadStart((event: OnDownloadStartEvent) => this.webViewBaseOperate?.onDownloadStart(event))
+            .geolocationAccess(this.descriptorWrapper.rawProps.geolocationEnabled)
+            .onGeolocationShow((event) => {
+              if (event && (this.descriptorWrapper.rawProps.geolocationEnabled != undefined)) {
+                event.geolocation.invoke(event.origin, this.descriptorWrapper.rawProps.geolocationEnabled, true);
+              }
+            })
+            .mediaPlayGestureAccess(this.descriptorWrapper.rawProps.mediaPlaybackRequiresUserAction)
+            .onRenderExited((event: OnRenderExitedEvent) => this.webViewBaseOperate?.onRenderExited(event))
+            .onLoadIntercept((event: OnLoadInterceptEvent) => this.onLoadIntercept(event))
+            .onTitleReceive((event: OnTitleReceiveEvent) => this.webViewBaseOperate?.onTitleReceive(event))
+
           }
-        })
-        .mediaPlayGestureAccess(this.descriptorWrapper.rawProps.mediaPlaybackRequiresUserAction)
-        .onRenderExited((event: OnRenderExitedEvent) => this.webViewBaseOperate?.onRenderExited(event))
-        .onLoadIntercept((event: OnLoadInterceptEvent) => this.onLoadIntercept(event))
-        .onTitleReceive((event: OnTitleReceiveEvent) => this.webViewBaseOperate?.onTitleReceive(event))
-    }
+      }
     .width(this.webviewWidth)
     .height(this.webviewHeight)
     .position({

package/package.json

@@ -9,7 +9,7 @@
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
   ],
   "license": "MIT",
-  "version": "13.10.5-rc.2",
+  "version": "13.10.5-rc.4",
   "homepage": "https://github.com/react-native-oh-library/react-native-webview#readme",
   "scripts": {
     "macos": "react-native run-macos --scheme WebviewExample --project-path example/macos",