tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-07-14 19:10:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): Update webview metadata on window close (#9360)

Browse Source 
* fix(core): Update webview metadata on window close

* make it multiwebview friendlier

* support webview.close() too -> THIS IS STILL MISSING AN EVENT LIKE tauri://destroyed !!!
This commit is contained in:
Fabian-Lars 2024-04-03 17:18:13 +02:00 committed by GitHub
parent 4c2e7477e6
commit 6251645acf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/fix-metadata-on-close.md Normal file
View File

@ -0,0 +1,5 @@
---
"tauri": patch:bug
---
Fixes an issue causing `getAll()` to list webviews that were already destroyed.

6
core/tauri/src/manager/mod.rs
View File

@ -544,6 +544,12 @@ impl<R: Runtime> AppManager<R> {
pub(crate) fn on_webview_close(&self, label: &str) {
self.webview.webviews_lock().remove(label);
if let Ok(webview_labels_array) = serde_json::to_string(&self.webview.labels()) {
let _ = self.webview.eval_script_all(format!(
r#"(function () {{ const metadata = window.__TAURI_INTERNALS__.metadata; if (metadata != null) {{ metadata.webviews = {webview_labels_array}.map(function (label) {{ return {{ label: label }} }}) }} }})()"#,
));
}
}
pub fn windows(&self) -> HashMap<String, Window<R>> {

11
core/tauri/src/manager/window.rs
View File

@ -167,12 +167,11 @@ fn on_window_event<R: Runtime>(window: &Window<R>, event: &WindowEvent) -> crate
WindowEvent::Destroyed => {
window.emit_to_window(WINDOW_DESTROYED_EVENT, ())?;
let label = window.label();
let webviews_map = window.manager().webview.webviews_lock();
let webviews = webviews_map.values();
for webview in webviews {
webview.eval(&format!(
r#"(function () {{ const metadata = window.__TAURI_INTERNALS__.metadata; if (metadata != null) {{ metadata.windows = window.__TAURI_INTERNALS__.metadata.windows.filter(w => w.label !== "{label}"); }} }})()"#,
))?;
if let Ok(webview_labels_array) = serde_json::to_string(&window.manager().webview.labels()) {
let _ = window.manager().webview.eval_script_all(format!(
r#"(function () {{ const metadata = window.__TAURI_INTERNALS__.metadata; if (metadata != null) {{ metadata.windows = window.__TAURI_INTERNALS__.metadata.windows.filter(w => w.label !== "{label}"); metadata.webviews = {webview_labels_array}.map(function (label) {{ return {{ label: label }} }}) }} }})()"#,
));
}
}
WindowEvent::Focused(focused) => window.emit_to_window(