Merge branch 'tauri-apps:dev' into dev

modrinth · Sep 10, 2024 · 5840108 · 5840108
2 parents 23b0ee4 + b863d38
commit 5840108
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 13 deletions.
diff --git a/.changes/1344-with_scroll_bar_style.md b/.changes/1344-with_scroll_bar_style.md
diff --git a/.changes/change-pr-1356.md b/.changes/change-pr-1356.md
@@ -0,0 +1,5 @@
+---
+"wry": patch
+---
+
+Expose ability to enable browser extensions in WebView2
diff --git a/.changes/linux-shared-webcontext-ipc.md b/.changes/linux-shared-webcontext-ipc.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## \[0.43.1]
+
+- [`5cea504`](https://github.com/tauri-apps/wry/commit/5cea5045c9e646ace1f94767d91b746c2afd3c14) ([#1352](https://github.com/tauri-apps/wry/pull/1352) by [@lucasfernog](https://github.com/tauri-apps/wry/../../lucasfernog)) Fixes Android file picker result processing.
+
+## \[0.43.0]
+
+- [`7b1c26a`](https://github.com/tauri-apps/wry/commit/7b1c26adff5fdf13a3364b6fc26c8444c120d5c1) ([#1344](https://github.com/tauri-apps/wry/pull/1344) by [@Themayu](https://github.com/tauri-apps/wry/../../Themayu)) Windows: Implement `WebViewBuilderExtWindows::with_scroll_bar_style` to allow opting into Fluent Overlay style scrollbars.
+- [`98d1a83`](https://github.com/tauri-apps/wry/commit/98d1a835e2c818e9f733a55b074e7de3c0cd725f) ([#1326](https://github.com/tauri-apps/wry/pull/1326) by [@ollpu](https://github.com/tauri-apps/wry/../../ollpu)) Fix Linux IPC handler and initialization scripts when sharing a WebContext between multiple WebViews.
+
 ## \[0.42.0]
 
 - [`556a359`](https://github.com/tauri-apps/wry/commit/556a359d3739ac3a3e671ab2d1c3dda2784c511e) ([#1301](https://github.com/tauri-apps/wry/pull/1301) by [@pewsheen](https://github.com/tauri-apps/wry/../../pewsheen)) On macOS, emit an error when the URL scheme registration fails.

diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@ workspace = { }
 
 [package]
 name = "wry"
-version = "0.42.0"
+version = "0.43.1"
 authors = [ "Tauri Programme within The Commons Conservancy" ]
 edition = "2021"
 license = "Apache-2.0 OR MIT"

diff --git a/src/android/kotlin/RustWebChromeClient.kt b/src/android/kotlin/RustWebChromeClient.kt
@@ -391,8 +391,7 @@ class RustWebChromeClient(appActivity: WryActivity) : WebChromeClient() {
         override fun onActivityResult(result: ActivityResult?) {
           val res: Array<Uri?>?
           val resultIntent = result?.data
-          if (result?.resultCode == Activity.RESULT_OK && resultIntent!!.clipData != null && resultIntent.clipData!!.itemCount > 1
-          ) {
+          if (result?.resultCode == Activity.RESULT_OK && resultIntent!!.clipData != null) {
             val numFiles = resultIntent.clipData!!.itemCount
             res = arrayOfNulls(numFiles)
             for (i in 0 until numFiles) {

diff --git a/src/lib.rs b/src/lib.rs
@@ -1091,6 +1091,7 @@ pub(crate) struct PlatformSpecificWebViewAttributes {
   theme: Option<Theme>,
   use_https: bool,
   scroll_bar_style: ScrollBarStyle,
+  browser_extensions_enabled: bool,
 }
 
 #[cfg(windows)]
@@ -1102,6 +1103,7 @@ impl Default for PlatformSpecificWebViewAttributes {
       theme: None,
       use_https: false, // To match macOS & Linux behavior in the context of mixed content.
       scroll_bar_style: ScrollBarStyle::default(),
+      browser_extensions_enabled: false,
     }
   }
 }
@@ -1153,6 +1155,14 @@ pub trait WebViewBuilderExtWindows {
   /// Requires WebView2 Runtime version 125.0.2535.41 or higher, does nothing on older versions,
   /// see https://learn.microsoft.com/en-us/microsoft-edge/webview2/release-notes/?tabs=dotnetcsharp#10253541
   fn with_scroll_bar_style(self, style: ScrollBarStyle) -> Self;
+
+  /// Determines whether the ability to install and enable extensions is enabled.
+  ///
+  /// By default, extensions are disabled.
+  ///
+  /// Requires WebView2 Runtime version 1.0.2210.55 or higher, does nothing on older versions,
+  /// see https://learn.microsoft.com/en-us/microsoft-edge/webview2/release-notes/archive?tabs=dotnetcsharp#10221055
+  fn with_browser_extensions_enabled(self, enabled: bool) -> Self;
 }
 
 #[cfg(windows)]
@@ -1181,6 +1191,11 @@ impl WebViewBuilderExtWindows for WebViewBuilder<'_> {
     self.platform_specific.scroll_bar_style = style;
     self
   }
+
+  fn with_browser_extensions_enabled(mut self, enabled: bool) -> Self {
+    self.platform_specific.browser_extensions_enabled = enabled;
+    self
+  }
 }
 
 #[cfg(target_os = "android")]

diff --git a/src/webview2/mod.rs b/src/webview2/mod.rs
@@ -293,6 +293,7 @@ impl InnerWebView {
         let options = CoreWebView2EnvironmentOptions::default();
 
         options.set_additional_browser_arguments(additional_browser_args);
+        options.set_are_browser_extensions_enabled(pl_attrs.browser_extensions_enabled);
 
         // Get user's system language
         let lcid = GetUserDefaultUILanguage();