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

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

@@ -8,12 +8,10 @@
  * @generated by codegen project: GenerateShadowNodeCpp.js
  */
 
-#include <react/renderer/components/react_native_webview/ShadowNodes.h>
+#include "ShadowNodes.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
-const char RNC_WEB_VIEW_COMPONENT_NAME[] = "RNCWebView";
+extern const char RNCWebViewComponentName[] = "RNCWebView";
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

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

@@ -10,25 +10,23 @@
 
 #pragma once
 
-#include <react/renderer/components/react_native_webview/EventEmitters.h>
-#include <react/renderer/components/react_native_webview/Props.h>
-#include <react/renderer/components/react_native_webview/States.h>
+#include "EventEmitters.h"
+#include "Props.h"
+#include "States.h"
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
-JSI_EXPORT extern const char RNC_WEB_VIEW_COMPONENT_NAME[32];
+JSI_EXPORT extern const char RNCWebViewComponentName[];
 
 /*
  * `ShadowNode` for <RNCWebView> component.
  */
 using RNCWebViewShadowNode = ConcreteViewShadowNode<
-    RNC_WEB_VIEW_COMPONENT_NAME,
+    RNCWebViewComponentName,
     RNCWebViewProps,
     RNCWebViewEventEmitter,
     RNCWebViewState>;
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

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

@@ -7,10 +7,10 @@
  *
  * @generated by codegen project: GenerateStateCpp.js
  */
-#include <react/renderer/components/react_native_webview/States.h>
+#include "States.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
-} // namespace react
-} // namespace facebook
+
+
+} // namespace facebook::react

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

@@ -8,13 +8,22 @@
  */
 #pragma once
 
-namespace facebook {
-namespace react {
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#endif
+
+namespace facebook::react {
 
 class RNCWebViewState {
 public:
-    RNCWebViewState() = default;
+  RNCWebViewState() = default;
+
+#ifdef ANDROID
+  RNCWebViewState(RNCWebViewState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+#endif
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/rn_webview/src/main/ets/CutomReference.ts

@@ -1,26 +1,6 @@
-/**
- * MIT License
- *
- * Copyright (C) 2025 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// 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.
 
 export class CustomReference {
   private atomicValue: number;

package/harmony/rn_webview/src/main/ets/Logger.ts

@@ -1,26 +1,6 @@
-/**
- * MIT License
- *
- * Copyright (C) 2025 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// 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 hilog from '@ohos.hilog';
 

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

@@ -1,26 +1,6 @@
-/**
- * MIT License
- *
- * Copyright (C) 2025 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// 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 { Descriptor, ViewBaseProps, ViewDescriptorWrapperBase, ViewRawProps } from '@rnoh/react-native-openharmony'
 
@@ -84,7 +64,6 @@ export interface WebViewProps extends ViewRawProps {
   geolocationEnabled: boolean
   applicationNameForUserAgent: string
   pullToRefreshEnabled: boolean
-  schemeList: Array<string>
 }
 
 

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

@@ -1,26 +1,6 @@
-/**
- * MIT License
- *
- * Copyright (C) 2025 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// 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 { RNComponentContext } from '@rnoh/react-native-openharmony';
 import webview from '@ohos.web.webview';
@@ -78,7 +58,6 @@ export struct RNCWebView {
   url: string | Resource = "";
   body: string | undefined = "";
   controller: webview.WebviewController = new webview.WebviewController();
-  schemeHandler: webview.WebSchemeHandler = new webview.WebSchemeHandler();
   javaScriptEnable: boolean = true;
   allowFileAccess: boolean = true;
   forceDark: boolean = true;
@@ -294,25 +273,6 @@ export struct RNCWebView {
     this.webViewBaseOperate.setCustomUserAgent(this.descriptorWrapper.rawProps.userAgent,
       this.descriptorWrapper.rawProps.applicationNameForUserAgent)
     this.webViewBaseOperate.setFraudulentWebsiteWarningEnabled(this.descriptorWrapper.rawProps.fraudulentWebsiteWarningEnabled)
-
-    let schemeList = this.descriptorWrapper.rawProps.schemeList
-    if(schemeList?.length){
-      schemeList.forEach(scheme=>{
-        this.schemeHandler.onRequestStart((request: webview.WebSchemeHandlerRequest, resourceHandler: webview.WebResourceHandler) => {
-          console.log("[schemeHandler] onRequestStart");
-          return true;
-        })
-        this.schemeHandler.onRequestStop((request: webview.WebSchemeHandlerRequest) => {
-          console.log("[schemeHandler] onRequestStop");
-        });
-        this.controller.setWebSchemeHandler(scheme, this.schemeHandler);
-      })
-    }
-
-    if (!this.hasRegisterJavaScriptProxy && this.descriptorWrapper.rawProps.messagingEnabled) {
-      this.registerJavaScriptProxyOnly()
-    }
-
     let baseUrl = this.source.baseUrl
     let uri = this.source.uri
     if (this.source.html != undefined && this.source.html != "") {
@@ -474,8 +434,8 @@ export struct RNCWebView {
           scrollForward: this.nestedScroll,
           scrollBackward: this.nestedScroll,
         })
-        .onLoadStarted(() => this.onPageBegin())
-        .onLoadFinished(() => this.onPageEnd())
+        .onPageBegin(() => this.onPageBegin())
+        .onPageEnd(() => this.onPageEnd())
         .onErrorReceive((event: OnErrorReceiveEvent) => this.webViewBaseOperate?.emitLoadingError(event))
         .onHttpErrorReceive((event: OnHttpErrorReceiveEvent) => this.webViewBaseOperate?.emitHttpError(event))
         .onControllerAttached(() => this.controllerAttachedInit())
@@ -583,41 +543,12 @@ export struct RNCWebView {
     }
   }
 
-  private registerJavaScriptProxyOnly() {
-    if (this.messagingEnabled == this.descriptorWrapper.rawProps.messagingEnabled && this.hasRegisterJavaScriptProxy) {
-      return;
-    }
-    this.messagingEnabled = this.descriptorWrapper.rawProps.messagingEnabled;
-    if (this.messagingEnabled) {
-      let bridge: RNCWebViewBridge = {
-        postMessage: (data: string) => {
-          Logger.debug(TAG, `[RNOH] bridge postMessage,  ${JSON.stringify(data)}`);
-          if (this.controller != null) {
-            let result: WebViewEventParams = this.createWebViewEvent("onMessage")
-            if (result) {
-              result.data = data.toString()
-              result.lockIdentifier = this.webViewBaseOperate?.getLockIdentifier()
-              this.eventEmitter!.emit("message", result as ResultType);
-            }
-          }
-        }
-      };
-      this.controller.registerJavaScriptProxy(bridge, JAVASCRIPT_INTERFACE, ["postMessage"])
-      this.hasRegisterJavaScriptProxy = true
-      Logger.debug(TAG, "[RNOH] JavaScript Proxy registered without reloading page")
-    }
-  }
-
   private registerPostMessage() {
     if (this.messagingEnabled == this.descriptorWrapper.rawProps.messagingEnabled) {
       return;
     }
     this.messagingEnabled = this.descriptorWrapper.rawProps.messagingEnabled;
     if (this.messagingEnabled) {
-      if (this.hasRegisterJavaScriptProxy) {
-        Logger.debug(TAG, "[RNOH] JavaScript Proxy already registered")
-        return
-      }
       let bridge: RNCWebViewBridge = {
         postMessage: (data: string) => {
           Logger.debug(TAG, `[RNOH] bridge postMessage,  ${JSON.stringify(data)}`);
@@ -632,13 +563,8 @@ export struct RNCWebView {
         }
       };
       this.controller.registerJavaScriptProxy(bridge, JAVASCRIPT_INTERFACE, ["postMessage"])
-      if (this.source.uri && !this.source.html) {
-        this.controller.loadUrl(this.source.uri, this.headers)
-      } else if (this.source.html) {
-        Logger.debug(TAG, "[RNOH] JavaScript Proxy registered, HTML content will use it on next load")
-      } else {
-        this.controller.refresh()
-      }
+      this.source.uri ?
+      this.controller.loadUrl(this.source.uri, this.headers) : this.controller.refresh()
       this.hasRegisterJavaScriptProxy = true
     }
   }

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

@@ -1,26 +1,6 @@
-/**
- * MIT License
- *
- * Copyright (C) 2025 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// 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 type {
   DescriptorWrapperFactoryByDescriptorType,
@@ -28,14 +8,10 @@ import type {
 } from '@rnoh/react-native-openharmony/ts';
 import { RNC, TM } from './generated/ts';
 import { AnyThreadTurboModuleFactory, AnyThreadTurboModule } from '@rnoh/react-native-openharmony/ts';
-import { RNOHPackage, ComponentBuilderContext } from '@rnoh/react-native-openharmony';
+import { RNOHPackage } from '@rnoh/react-native-openharmony';
 import { WebViewTurboModule } from './WebViewTurboModule'
 import { WorkerTurboModuleContext } from '@rnoh/react-native-openharmony/src/main/ets/RNOH/RNOHContext';
-import { RNCWebView } from './RNCWebView';
-@Builder
-function buildWebView(ctx: ComponentBuilderContext) {
-  RNCWebView({ ctx: ctx.rnComponentContext, tag: ctx.tag, })
-}
+
 export class RNCWebViewPackage extends RNOHPackage  {
   createDescriptorWrapperFactoryByDescriptorType(ctx: DescriptorWrapperFactoryByDescriptorTypeCtx): DescriptorWrapperFactoryByDescriptorType {
     return {
@@ -46,10 +22,6 @@ export class RNCWebViewPackage extends RNOHPackage  {
   createAnyThreadTurboModuleFactory(ctx: WorkerTurboModuleContext): AnyThreadTurboModuleFactory {
     return new WebViewTurboModulesFactory(ctx);
   }
-
-  createWrappedCustomRNComponentBuilderByComponentNameMap(): Map<string, WrappedBuilder<[ComponentBuilderContext]>> {
-    return new Map().set(RNCWebView.NAME, wrapBuilder(buildWebView))
-  }
 }
 
 class WebViewTurboModulesFactory extends AnyThreadTurboModuleFactory {

package/harmony/rn_webview/src/main/ets/ShouldRequestUrl.ts

@@ -1,26 +1,6 @@
-/**
- * MIT License
- *
- * Copyright (C) 2025 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// 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 { CustomReference } from './CutomReference';
 import HashMap from '@ohos.util.HashMap';

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

@@ -1,26 +1,6 @@
-/**
- * MIT License
- *
- * Copyright (C) 2025 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// 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 { RNC } from './generated/ts'
 import { webview } from '@kit.ArkWeb'

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

@@ -1,26 +1,6 @@
-/**
- * MIT License
- *
- * Copyright (C) 2025 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// 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';