CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-01 10:01:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: impl AsRef<Window> and on_webview_event for WebviewWindow (#14012)

Browse Source
This commit is contained in:
Sean Wang
2025-08-16 11:01:53 +08:00
committed by GitHub
parent 0e6b5cbe5f
commit 7261a14368
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.changes/WebviewWindow-on_webview_event.md Normal file
View File

@@ -0,0 +1,11 @@
---
tauri: minor:enhance
---
- Implemented `Webview::on_webview_event` for `WebviewWindow` as well
- Implemented `AsRef<Window<R>>` for `WebviewWindow<R>`
This can be considered a *BREAKING CHANGE* in very specific cases:
Typically, this means you are relying on implicit type inference, such as `let webview: _ = WebviewWindow.as_ref()`.
To resolve this, you should explicitly specify the type, for example `let webview: &Window<R> = WebviewWindow.as_ref()`
or `let webview: _ = AsRef::<Webview<R>>::as_ref(&WebviewWindow)`.

2
crates/tauri/src/webview/mod.rs
View File

@@ -1121,7 +1121,7 @@ impl<R: Runtime> Webview<R> {
self.use_https_scheme
}
/// Registers a window event listener.
/// Registers a webview event listener.
pub fn on_webview_event<F: Fn(&WebviewEvent) + Send + 'static>(&self, f: F) {
self
.webview

15
crates/tauri/src/webview/webview_window.rs
View File

@@ -34,7 +34,7 @@ use crate::{
ipc::{CommandArg, CommandItem, InvokeError, OwnedInvokeResponder},
manager::AppManager,
sealed::{ManagerBase, RuntimeOrDispatch},
webview::{Cookie, PageLoadPayload, WebviewBuilder},
webview::{Cookie, PageLoadPayload, WebviewBuilder, WebviewEvent},
window::WindowBuilder,
AppHandle, Event, EventId, Manager, Runtime, Webview, WindowEvent,
};
@@ -1193,6 +1193,12 @@ impl<R: Runtime> AsRef<Webview<R>> for WebviewWindow<R> {
}
}
impl<R: Runtime> AsRef<Window<R>> for WebviewWindow<R> {
fn as_ref(&self) -> &Window<R> {
&self.window
}
}
impl<R: Runtime> Clone for WebviewWindow<R> {
fn clone(&self) -> Self {
Self {
@@ -1204,7 +1210,7 @@ impl<R: Runtime> Clone for WebviewWindow<R> {
impl<R: Runtime> Eq for WebviewWindow<R> {}
impl<R: Runtime> PartialEq for WebviewWindow<R> {
/// Only use the [`Window`]'s label to compare equality.
/// Only use the [`Webview`]'s label to compare equality.
fn eq(&self, other: &Self) -> bool {
self.webview.eq(&other.webview)
}
@@ -1269,6 +1275,11 @@ impl<R: Runtime> WebviewWindow<R> {
self.window.on_window_event(f);
}
/// Registers a webview event listener.
pub fn on_webview_event<F: Fn(&WebviewEvent) + Send + 'static>(&self, f: F) {
self.webview.on_webview_event(f);
}
/// Resolves the given command scope for this webview on the currently loaded URL.
///
/// If the command is not allowed, returns None.