@react-native-ohos/react-native-webview 13.15.1 → 13.16.1-rc.1

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",
+  "version": "13.16.1-rc.1",
   "dependencies": {
     "@rnoh/react-native-openharmony": "../react_native_openharmony.har"
   }

package/harmony/rn_webview/src/main/cpp/generated/RNOH/generated/BaseReactNativeWebviewPackage.h

@@ -47,6 +47,7 @@ class BaseReactNativeWebviewPackageEventEmitRequestHandler : public EventEmitReq
             "customMenuSelection",
             "fileDownload",
             "loadingError",
+            "loadingSubResourceError",
             "loadingFinish",
             "loadingProgress",
             "loadingStart",

package/harmony/rn_webview/src/main/cpp/generated/RNOH/generated/components/RNCWebViewJSIBinder.h

@@ -105,6 +105,7 @@ class RNCWebViewJSIBinder : public ViewComponentJSIBinder {
         events.setProperty(rt, "topCustomMenuSelection", createDirectEvent(rt, "onCustomMenuSelection"));
         events.setProperty(rt, "topFileDownload", createDirectEvent(rt, "onFileDownload"));
         events.setProperty(rt, "topLoadingError", createDirectEvent(rt, "onLoadingError"));
+        events.setProperty(rt, "topLoadingSubResourceError", createDirectEvent(rt, "onLoadingSubResourceError"));
         events.setProperty(rt, "topLoadingFinish", createDirectEvent(rt, "onLoadingFinish"));
         events.setProperty(rt, "topLoadingProgress", createDirectEvent(rt, "onLoadingProgress"));
         events.setProperty(rt, "topLoadingStart", createDirectEvent(rt, "onLoadingStart"));

package/harmony/rn_webview/src/main/cpp/generated/react/renderer/components/react_native_webview/EventEmitters.cpp

@@ -87,6 +87,23 @@ $payload.setProperty(runtime, "description", $event.description);
 }
 
 
+void RNCWebViewEventEmitter::onLoadingSubResourceError(OnLoadingSubResourceError $event) const {
+  dispatchEvent("loadingSubResourceError", [$event=std::move($event)](jsi::Runtime &runtime) {
+    auto $payload = jsi::Object(runtime);
+    $payload.setProperty(runtime, "url", $event.url);
+$payload.setProperty(runtime, "loading", $event.loading);
+$payload.setProperty(runtime, "title", $event.title);
+$payload.setProperty(runtime, "canGoBack", $event.canGoBack);
+$payload.setProperty(runtime, "canGoForward", $event.canGoForward);
+$payload.setProperty(runtime, "lockIdentifier", $event.lockIdentifier);
+$payload.setProperty(runtime, "domain", $event.domain);
+$payload.setProperty(runtime, "code", $event.code);
+$payload.setProperty(runtime, "description", $event.description);
+    return $payload;
+  });
+}
+
+
 void RNCWebViewEventEmitter::onLoadingFinish(OnLoadingFinish $event) const {
   dispatchEvent("loadingFinish", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);

package/harmony/rn_webview/src/main/cpp/generated/react/renderer/components/react_native_webview/EventEmitters.h

@@ -61,6 +61,18 @@ class RNCWebViewEventEmitter : public ViewEventEmitter {
     std::string description;
     };
 
+  struct OnLoadingSubResourceError {
+      std::string url;
+    bool loading;
+    std::string title;
+    bool canGoBack;
+    bool canGoForward;
+    double lockIdentifier;
+    std::string domain;
+    int code;
+    std::string description;
+    };
+
   enum class OnLoadingFinishNavigationType {
     Click,
     Formsubmit,
@@ -244,6 +256,8 @@ class RNCWebViewEventEmitter : public ViewEventEmitter {
 
   void onLoadingError(OnLoadingError value) const;
 
+  void onLoadingSubResourceError(OnLoadingSubResourceError value) const;
+
   void onLoadingFinish(OnLoadingFinish value) const;
 
   void onLoadingProgress(OnLoadingProgress value) const;

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

@@ -39,7 +39,7 @@ export const WEB_VIEW = "RNCWebView"
 @Sendable
 class WorkerRunnable implements WorkerTaskRunnable<ShouldStartParams> {
   run(rnInstance: AnyThreadRNInstance, params: ShouldStartParams): void {
-     params.lockState = ShouldOverrideCallbackState.UNDECIDED
+    params.lockState = ShouldOverrideCallbackState.UNDECIDED
     rnInstance.getTurboModule<WebViewTurboModule>(TM.RNCWebViewModule.NAME).setShouldStartParams(params)
   }
 }
@@ -95,6 +95,9 @@ export struct RNCWebView {
   private shouldInterceptLoad: boolean = true
   private callLoadTimer: number = -1
   static readonly SHOULD_OVERRIDE_URL_LOADING_TIMEOUT: number = 250
+  private debounceTimer: number = -1
+  static readonly DEBOUNCE_TIME: number = 100
+  private isFirstDebounce: boolean = true
 
   aboutToAppear() {
     try {
@@ -398,6 +401,10 @@ export struct RNCWebView {
     return false
   }
 
+  onSslErrorEventCallback(event: SslErrorEvent){
+    this.webViewBaseOperate?.emitOnSslErrorEventCallback(event);
+  }
+
   build() {
     Stack() {
         if ( deviceInfo.sdkApiVersion >= 20) {
@@ -472,6 +479,7 @@ export struct RNCWebView {
             .onRenderExited((event: OnRenderExitedEvent) => this.webViewBaseOperate?.onRenderExited(event))
             .onLoadIntercept((event: OnLoadInterceptEvent) => this.onLoadIntercept(event))
             .onTitleReceive((event: OnTitleReceiveEvent) => this.webViewBaseOperate?.onTitleReceive(event))
+            .onSslErrorEvent((event: SslErrorEvent) => this.onSslErrorEventCallback(event))
         } else {
           Web({ src: "", controller: this.controller, renderMode: this.renderMode })
             .mixedMode(this.mode)
@@ -544,7 +552,7 @@ export struct RNCWebView {
             .onRenderExited((event: OnRenderExitedEvent) => this.webViewBaseOperate?.onRenderExited(event))
             .onLoadIntercept((event: OnLoadInterceptEvent) => this.onLoadIntercept(event))
             .onTitleReceive((event: OnTitleReceiveEvent) => this.webViewBaseOperate?.onTitleReceive(event))
-
+            .onSslErrorEvent((event: SslErrorEvent) => this.onSslErrorEventCallback(event))
           }
       }
     .width(this.webviewWidth)
@@ -613,8 +621,24 @@ export struct RNCWebView {
       })
     }
     // this.html = this.source.html
-    this.webviewWidth = this.descriptorWrapper.layoutMetrics.frame.size.width
-    this.webviewHeight = this.descriptorWrapper.layoutMetrics.frame.size.height
+    const newWidth = this.descriptorWrapper.layoutMetrics.frame.size.width
+    const newHeight = this.descriptorWrapper.layoutMetrics.frame.size.height
+
+    if (this.debounceTimer !== -1) {
+      clearTimeout(this.debounceTimer)
+      this.debounceTimer = -1
+    }
+
+    if (this.isFirstDebounce) {
+      this.webviewWidth = newWidth
+      this.webviewHeight = newHeight
+      this.isFirstDebounce = false
+    } else {
+      this.debounceTimer = setTimeout(() => {
+        this.webviewWidth = newWidth
+        this.webviewHeight = newHeight
+      }, RNCWebView.DEBOUNCE_TIME)
+    }
     this.scrollEnabled = this.descriptorWrapper.rawProps.scrollEnabled;
     // 当禁止滚动时，使用父组件滚动
     this.nestedScroll = this.scrollEnabled ? NestedScrollMode.SELF_FIRST : NestedScrollMode.PARENT_FIRST;

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

@@ -135,6 +135,50 @@ export class BaseOperate {
     }
   }
 
+  emitOnSslErrorEventCallback(event: SslErrorEvent) {
+    try {
+      const referrerUrl = event.referrer;
+      const url = event.url;
+      event.handler.handleCancel(true);
+      if (referrerUrl.toLowerCase() != url.toLowerCase()) {
+        Logger.debug(TAG, "[RNOH] Resource blocked from loading due to SSL error. Blocked URL: " + url);
+        let description = "";
+        const descriptionPrefix = "SSL error: ";
+        switch (event.error) {
+          case SslError.DateInvalid:
+            description = "The date of the certificate is invalid";
+            break;
+          case SslError.HostMismatch:
+            description = "Hostname mismatch";
+            break;
+          case SslError.Invalid:
+            description = "A generic error occurred";
+            break;
+          case SslError.Untrusted:
+            description = "The certificate authority is not trusted";
+            break;
+          default:
+            description = "Unknown SSL Error";
+            break;
+        }
+        description = descriptionPrefix + description;
+        this.eventEmitter!.emit('loadingSubResourceError', {
+          url: event.url,
+          loading: false,
+          title: this.controller.getTitle(),
+          canGoBack: this.controller.accessBackward(),
+          canGoForward: this.controller.accessForward(),
+          lockIdentifier: this.lockIdentifier,
+          domain: "",
+          code: event.error,
+          description: description
+        })
+      }
+    } catch (error) {
+      Logger.error(TAG, `[RNOH] emitLoadingError Errorcode: ${error.code}`);
+    }
+  }
+
   emitHttpError(event: OnHttpErrorReceiveEvent) {
     try {
       this.eventEmitter!.emit('httpError', {

package/harmony/rn_webview/src/main/ets/generated/components/RNCWebView.ts

@@ -453,6 +453,7 @@ export namespace RNCWebView {
     "customMenuSelection": {label: string, key: string, selectedText: string}
     "fileDownload": {downloadUrl: string}
     "loadingError": {url: string, loading: boolean, title: string, canGoBack: boolean, canGoForward: boolean, lockIdentifier: number, domain?: string, code: number, description: string}
+    "loadingSubResourceError": {url: string, loading: boolean, title: string, canGoBack: boolean, canGoForward: boolean, lockIdentifier: number, domain?: string, code: number, description: string}
     "loadingFinish": {url: string, loading: boolean, title: string, canGoBack: boolean, canGoForward: boolean, lockIdentifier: number, navigationType: 'click' | 'formsubmit' | 'backforward' | 'reload' | 'formresubmit' | 'other', mainDocumentURL?: string}
     "loadingProgress": {url: string, loading: boolean, title: string, canGoBack: boolean, canGoForward: boolean, lockIdentifier: number, progress: number}
     "loadingStart": {url: string, loading: boolean, title: string, canGoBack: boolean, canGoForward: boolean, lockIdentifier: number, navigationType: 'click' | 'formsubmit' | 'backforward' | 'reload' | 'formresubmit' | 'other', mainDocumentURL?: string}

package/package.json

@@ -9,7 +9,7 @@
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
   ],
   "license": "MIT",
-  "version": "13.15.1",
+  "version": "13.16.1-rc.1",
   "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",
@@ -37,7 +37,7 @@
   "dependencies": {
     "escape-string-regexp": "^4.0.0",
     "invariant": "2.2.4",
-    "react-native-webview": "13.15.0"
+    "react-native-webview": "13.16.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.20.0",
@@ -48,7 +48,7 @@
     "@react-native/eslint-config": "0.73.2",
     "@react-native/metro-config": "0.73.5",
     "@react-native/typescript-config": "0.73.1",
-    "@react-native-oh/react-native-harmony-cli": "file:./packages/react-native-oh-react-native-harmony-cli-0.77.18.tgz",
+    "@react-native-oh/react-native-harmony-cli": "file:./packages/rnoh-react-native-harmony-cli-0.82.1.tgz",
     "@rnx-kit/metro-config": "1.3.15",
     "@semantic-release/git": "7.0.16",
     "@types/invariant": "^2.2.30",

package/src/RNCWebViewNativeComponent.ts

@@ -279,6 +279,7 @@ export interface NativeProps extends ViewProps {
   messagingEnabled: boolean;
   shouldStartLoadWithRequestEnabled: boolean;
   onLoadingError: DirectEventHandler<WebViewErrorEvent>;
+  onLoadingSubResourceError: DirectEventHandler<WebViewErrorEvent>;
   onLoadingFinish: DirectEventHandler<WebViewNavigationEvent>;
   onLoadingProgress: DirectEventHandler<WebViewNativeProgressEvent>;
   onLoadingStart: DirectEventHandler<WebViewNavigationEvent>;

package/src/WebView.harmony.tsx

@@ -52,7 +52,7 @@ const useWarnIfChanges = <T extends unknown>(value: T, name: string) => {
   }
 };
 
-const WebViewComponent = forwardRef<{}, IOSWebViewProps & { scalesPageToFit: boolean, minimumFontSize: number, thirdPartyCookiesEnabled: boolean, geolocationEnabled: boolean }>(
+const WebViewComponent = forwardRef<{}, IOSWebViewProps & {onLoadSubResourceError:()=>void, scalesPageToFit: boolean, minimumFontSize: number, thirdPartyCookiesEnabled: boolean, geolocationEnabled: boolean }>(
   (
     {
       fraudulentWebsiteWarningEnabled = true,
@@ -75,6 +75,7 @@ const WebViewComponent = forwardRef<{}, IOSWebViewProps & { scalesPageToFit: boo
       webviewDebuggingEnabled = false,
       paymentRequestEnabled = false,
       startInLoadingState,
+      onLoadSubResourceError,
       onNavigationStateChange,
       onLoadStart,
       onCustomMenuSelection,
@@ -134,6 +135,7 @@ const WebViewComponent = forwardRef<{}, IOSWebViewProps & { scalesPageToFit: boo
       lastErrorEvent,
       onHttpError,
       onLoadingError,
+      onLoadingSubResourceError,
       onLoadingFinish,
       onLoadingProgress,
       onOpenWindow,
@@ -142,6 +144,7 @@ const WebViewComponent = forwardRef<{}, IOSWebViewProps & { scalesPageToFit: boo
       onNavigationStateChange,
       onLoad,
       onError,
+      onLoadSubResourceError,
       onHttpErrorProp,
       onLoadEnd,
       onLoadProgress,
@@ -275,6 +278,7 @@ const WebViewComponent = forwardRef<{}, IOSWebViewProps & { scalesPageToFit: boo
         messagingEnabled={typeof onMessageProp === 'function'}
         messagingModuleName="" // android ONLY
         onLoadingError={onLoadingError}
+        onLoadingSubResourceError = {onLoadingSubResourceError}
         onLoadingFinish={onLoadingFinish}
         onLoadingProgress={onLoadingProgress}
         onScroll={onScroll}