@react-native-ohos/react-native-webview 13.15.1-rc.6 → 13.15.1-rc.8

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.6",
+  "version": "13.15.1-rc.8",
   "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)
   }
 }
@@ -119,10 +120,12 @@ export struct RNCWebView {
           }
         })
       }
-      atManager.requestPermissionsFromUser(this.ctx.uiAbilityContext, ["ohos.permission.APPROXIMATELY_LOCATION"]).then((data) => {
-      }).catch((error: BusinessError) => {
-        console.error(`Failed to request permissions from user. Code is ${error.code}, message is ${error.message}`);
-      })
+      if (this.descriptorWrapper.rawProps.geolocationEnabled) {
+        atManager.requestPermissionsFromUser(this.ctx.uiAbilityContext, ["ohos.permission.APPROXIMATELY_LOCATION"]).then((data) => {
+        }).catch((error: BusinessError) => {
+          console.error(`Failed to request permissions from user. Code is ${error.code}, message is ${error.message}`);
+        })
+      }
     } catch (error) {
       Logger.error(TAG, `[RNOH]Errorcode: ${error.code}, Message: ${error.message}`);
     }

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.6",
+  "version": "13.15.1-rc.8",
   "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",
@@ -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:./package/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.77.18.tgz",
     "@rnx-kit/metro-config": "1.3.15",
     "@semantic-release/git": "7.0.16",
     "@types/invariant": "^2.2.30",