Skip to content

fix: 同步sig分支代码 #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 1, 2025
Merged

fix: 同步sig分支代码 #273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions harmony/rn_webview/src/main/ets/RNCWebView.ets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ import {
MINHEIGHT,
} from './Magic';
import { bundleManager } from '@kit.AbilityKit';

export const TAG = "WebView"

export const WEB_VIEW = "RNCWebView"
Expand Down Expand Up @@ -366,7 +365,7 @@ export struct RNCWebView {
Web({ src: "", controller: this.controller, renderMode: this.renderMode })
.mixedMode(this.mode)
.onPermissionRequest((event: OnPermissionRequestEvent) => {
if (event) {
if (event && (this.getPermissionDialogMessage(event) != "TYPE_SENSOR")) {
AlertDialog.show({
title: this.resourceToString($r('app.string.on_confirm')) + event.request.getOrigin(),
message: this.getPermissionDialogMessage(event),
Expand Down Expand Up @@ -401,6 +400,7 @@ export struct RNCWebView {
.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)
Expand Down Expand Up @@ -492,8 +492,8 @@ export struct RNCWebView {
})
}
this.html = this.source.html
this.webviewWidth = this.descriptorWrapper.rawProps.width
this.webviewHeight = this.descriptorWrapper.rawProps.height
this.webviewWidth = this.descriptorWrapper.layoutMetrics.frame.size.width
this.webviewHeight = this.descriptorWrapper.layoutMetrics.frame.size.height
this.scrollEnabled = this.descriptorWrapper.rawProps.scrollEnabled;
// 当禁止滚动时，使用父组件滚动
this.nestedScroll = this.scrollEnabled ? NestedScrollMode.SELF_FIRST : NestedScrollMode.PARENT_FIRST;
Expand Down