From 809092766a881a1898a4fa9057e125be95114387 Mon Sep 17 00:00:00 2001 From: Tony <68118705+Legend-Master@users.noreply.github.com> Date: Wed, 15 Jul 2026 16:01:35 +0800 Subject: [PATCH 1/2] docs: clarify drag and drop settings (#15717) --- crates/tauri-cli/config.schema.json | 2 +- crates/tauri-runtime/src/webview.rs | 4 +++- .../tauri-schema-generator/schemas/config.schema.json | 2 +- crates/tauri-utils/src/config.rs | 10 ++++++++-- crates/tauri/src/webview/mod.rs | 4 +++- crates/tauri/src/webview/webview_window.rs | 8 ++++++-- 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/crates/tauri-cli/config.schema.json b/crates/tauri-cli/config.schema.json index 83e3f88a3d0e..4022d224f363 100644 --- a/crates/tauri-cli/config.schema.json +++ b/crates/tauri-cli/config.schema.json @@ -257,7 +257,7 @@ ] }, "dragDropEnabled": { - "description": "Whether the drag and drop is enabled or not on the webview. By default it is enabled.\n\n Disabling it is required to use HTML5 drag and drop on the frontend on Windows.", + "description": "Whether the drag and drop handlers used internally to generate [`DragDropEvent`]s are enabled on the webview. By default it is enabled.\n\n Disabling it is required to use HTML5 drag and drop on the frontend on Windows since we replace the drag drop handler of WebView2.\n\n Note: this setting maps to [`WebviewBuilder::disable_drag_drop_handler`], not [`WindowBuilder::drag_and_drop`].\n\n [`DragDropEvent`]: https://docs.rs/tauri/latest/tauri/enum.DragDropEvent.html\n [`WebviewBuilder::disable_drag_drop_handler`]: https://docs.rs/tauri/latest/tauri/webview/struct.WebviewBuilder.html#method.disable_drag_drop_handler\n [`WindowBuilder::drag_and_drop`]: https://docs.rs/tauri/latest/x86_64-pc-windows-msvc/tauri/window/struct.WindowBuilder.html#method.drag_and_drop", "default": true, "type": "boolean" }, diff --git a/crates/tauri-runtime/src/webview.rs b/crates/tauri-runtime/src/webview.rs index d7fb9c80f311..8700041e9353 100644 --- a/crates/tauri-runtime/src/webview.rs +++ b/crates/tauri-runtime/src/webview.rs @@ -619,7 +619,9 @@ impl WebviewAttributes { self } - /// Disables the drag and drop handler. This is required to use HTML5 drag and drop APIs on the frontend on Windows. + /// Disables the drag and drop handler used internally to generate [`DragDropEvent`](crate::window::DragDropEvent)s. + /// + /// This is required to use HTML5 drag and drop APIs on the frontend on Windows since we replace the drag drop handler of WebView2. #[must_use] pub fn disable_drag_drop_handler(mut self) -> Self { self.drag_drop_handler_enabled = false; diff --git a/crates/tauri-schema-generator/schemas/config.schema.json b/crates/tauri-schema-generator/schemas/config.schema.json index 83e3f88a3d0e..4022d224f363 100644 --- a/crates/tauri-schema-generator/schemas/config.schema.json +++ b/crates/tauri-schema-generator/schemas/config.schema.json @@ -257,7 +257,7 @@ ] }, "dragDropEnabled": { - "description": "Whether the drag and drop is enabled or not on the webview. By default it is enabled.\n\n Disabling it is required to use HTML5 drag and drop on the frontend on Windows.", + "description": "Whether the drag and drop handlers used internally to generate [`DragDropEvent`]s are enabled on the webview. By default it is enabled.\n\n Disabling it is required to use HTML5 drag and drop on the frontend on Windows since we replace the drag drop handler of WebView2.\n\n Note: this setting maps to [`WebviewBuilder::disable_drag_drop_handler`], not [`WindowBuilder::drag_and_drop`].\n\n [`DragDropEvent`]: https://docs.rs/tauri/latest/tauri/enum.DragDropEvent.html\n [`WebviewBuilder::disable_drag_drop_handler`]: https://docs.rs/tauri/latest/tauri/webview/struct.WebviewBuilder.html#method.disable_drag_drop_handler\n [`WindowBuilder::drag_and_drop`]: https://docs.rs/tauri/latest/x86_64-pc-windows-msvc/tauri/window/struct.WindowBuilder.html#method.drag_and_drop", "default": true, "type": "boolean" }, diff --git a/crates/tauri-utils/src/config.rs b/crates/tauri-utils/src/config.rs index d464af84e874..e7d4afec9a04 100644 --- a/crates/tauri-utils/src/config.rs +++ b/crates/tauri-utils/src/config.rs @@ -1953,9 +1953,15 @@ pub struct WindowConfig { /// The user agent for the webview #[serde(alias = "user-agent")] pub user_agent: Option, - /// Whether the drag and drop is enabled or not on the webview. By default it is enabled. + /// Whether the drag and drop handlers used internally to generate [`DragDropEvent`]s are enabled on the webview. By default it is enabled. /// - /// Disabling it is required to use HTML5 drag and drop on the frontend on Windows. + /// Disabling it is required to use HTML5 drag and drop on the frontend on Windows since we replace the drag drop handler of WebView2. + /// + /// Note: this setting maps to [`WebviewBuilder::disable_drag_drop_handler`], not [`WindowBuilder::drag_and_drop`]. + /// + /// [`DragDropEvent`]: https://docs.rs/tauri/latest/tauri/enum.DragDropEvent.html + /// [`WebviewBuilder::disable_drag_drop_handler`]: https://docs.rs/tauri/latest/tauri/webview/struct.WebviewBuilder.html#method.disable_drag_drop_handler + /// [`WindowBuilder::drag_and_drop`]: https://docs.rs/tauri/latest/x86_64-pc-windows-msvc/tauri/window/struct.WindowBuilder.html#method.drag_and_drop #[serde(default = "default_true", alias = "drag-drop-enabled")] pub drag_drop_enabled: bool, /// Whether or not the window starts centered or not. diff --git a/crates/tauri/src/webview/mod.rs b/crates/tauri/src/webview/mod.rs index b89d3c95d0e8..605691749ab4 100644 --- a/crates/tauri/src/webview/mod.rs +++ b/crates/tauri/src/webview/mod.rs @@ -968,7 +968,9 @@ fn main() { self } - /// Disables the drag and drop handler. This is required to use HTML5 drag and drop APIs on the frontend on Windows. + /// Disables the drag and drop handler used internally to generate [`DragDropEvent`](crate::DragDropEvent)s. + /// + /// This is required to use HTML5 drag and drop APIs on the frontend on Windows since we replace the drag drop handler of WebView2. #[must_use] pub fn disable_drag_drop_handler(mut self) -> Self { self.webview_attributes.drag_drop_handler_enabled = false; diff --git a/crates/tauri/src/webview/webview_window.rs b/crates/tauri/src/webview/webview_window.rs index 33a393ded798..5be5d441eafa 100644 --- a/crates/tauri/src/webview/webview_window.rs +++ b/crates/tauri/src/webview/webview_window.rs @@ -722,7 +722,9 @@ impl<'a, R: Runtime, M: Manager> WebviewWindowBuilder<'a, R, M> { self } - /// Enables or disables drag and drop support. + /// Enables or disables drag and drop support of this window. + /// + /// Note: this is a different config from [`Self::disable_drag_drop_handler`] #[cfg(windows)] #[must_use] pub fn drag_and_drop(mut self, enabled: bool) -> Self { @@ -1036,7 +1038,9 @@ impl> WebviewWindowBuilder<'_, R, M> { self } - /// Disables the drag and drop handler. This is required to use HTML5 drag and drop APIs on the frontend on Windows. + /// Disables the webview drag and drop handler used internally to generate [`DragDropEvent`](crate::DragDropEvent)s. + /// + /// This is required to use HTML5 drag and drop APIs on the frontend on Windows since we replace the drag drop handler of WebView2. #[must_use] pub fn disable_drag_drop_handler(mut self) -> Self { self.webview_builder = self.webview_builder.disable_drag_drop_handler(); From 6d4643e942b9b3ad3ce1ce19f20494b6a35676a6 Mon Sep 17 00:00:00 2001 From: Tony <68118705+Legend-Master@users.noreply.github.com> Date: Wed, 15 Jul 2026 16:53:55 +0800 Subject: [PATCH 2/2] chore(deps): update pnpm to v11 (#15716) --- package.json | 2 +- pnpm-workspace.yaml | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 3dc1a3601a1d..e64c63a2d553 100644 --- a/package.json +++ b/package.json @@ -28,5 +28,5 @@ "prettier": "^3.8.1" }, "minimumReleaseAge": 4320, - "packageManager": "pnpm@10.30.3" + "packageManager": "pnpm@11.13.0" } diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 5f07e0b4acca..dfdf65d52188 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -6,9 +6,10 @@ packages: - examples/resources - examples/file-associations -onlyBuiltDependencies: - - esbuild - - workerd +allowBuilds: + esbuild: true + sharp: true + workerd: true overrides: esbuild@>=0.27.3 <0.28.1: '>=0.28.1'