feat: support tauri v2

.changes/config.json

@@ -20,7 +20,7 @@
       "getPublishedVersion": "cargo search ${ pkg.pkg } --limit 1 | sed -nE 's/^[^\"]*\"//; s/\".*//1p' -",
       "prepublish": [
         "sudo apt-get update",
-        "sudo apt-get install -y webkit2gtk-4.0"
+        "sudo apt-get install -y webkit2gtk-4.1"
       ],
       "publish": [
         "cargo publish"

.changes/v2.md

@@ -0,0 +1,9 @@
+---
+"@crabnebula/tauri-plugin-drag": major
+"@crabnebula/tauri-plugin-drag-as-window": major
+"drag": major
+"tauri-plugin-drag": major
+"tauri-plugin-drag-as-window": major
+---
+
+Update to tauri v2.

.github/workflows/check.yml

@@ -51,7 +51,7 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y  webkit2gtk-4.0
+          sudo apt-get install -y  webkit2gtk-4.1
       - uses: Swatinem/rust-cache@v2
       - run: cargo clippy --workspace --all-targets --all-features -- -D warnings
 
@@ -69,7 +69,7 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0
+          sudo apt-get install -y webkit2gtk-4.1
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
       - run: cargo test --workspace --lib --bins --tests --benches --all-features --no-fail-fast

.github/workflows/covector-status.yml

@@ -10,7 +10,7 @@ jobs:
         with:
           fetch-depth: 0 # required for use of git history
       - name: covector status
-        uses: jbolda/covector/packages/action@covector-v0.10
+        uses: jbolda/covector/packages/action@covector-v0
         id: covector
         with:
           command: 'status'

.github/workflows/covector-version-or-publish.yml

@@ -29,7 +29,7 @@ jobs:
           git config --global user.name "${{ github.event.pusher.name }}"
           git config --global user.email "${{ github.event.pusher.email }}"
       - name: covector version or publish (publish when no change files present)
-        uses: jbolda/covector/packages/action@covector-v0.10
+        uses: jbolda/covector/packages/action@covector-v0
         id: covector
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -38,6 +38,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           command: 'version-or-publish'
           createRelease: true
+          recognizeContributors: true
       - name: Create Pull Request With Versions Bumped
         id: cpr
         uses: peter-evans/create-pull-request@v3

.gitignore

@@ -1,2 +1,3 @@
 target
 /Cargo.lock
+gen/

Cargo.toml

@@ -5,4 +5,20 @@ members = ["crates/*", "examples/*"]
 [workspace.package]
 edition = "2021"
 authors = ["CrabNebula Ltd."]
-license = "Apache-2.0 OR MIT"
+license = "Apache-2.0 OR MIT"
+
+[workspace.dependencies]
+tauri = "2"
+serde = "1"
+serde_json = "1"
+thiserror = "1"
+base64 = "0.21"
+tao = "0.30.3"
+winit = "0.30.5"
+wry = "0.46.1"
+dunce = "1.0.5"
+tauri-build = "2.0.1"
+tauri-plugin = { version = "2.0.1", features = ["build"] }
+drag = { path = "./crates/drag", features = [ "serde" ] }
+tauri-plugin-drag = { path = "./crates/tauri-plugin-drag" }
+tauri-plugin-drag-as-window = { path = "./crates/tauri-plugin-drag-as-window" }

README.md

@@ -24,7 +24,7 @@ There's two ways to consume this crate API: from Rust code via the `drag` crate
   let preview_icon = drag::Image::Raw(include_bytes!("../../icon.png").to_vec());
   ```
 
-- Use the `drag::start_drag` function. It takes a `&T: raw_window_handle::HasRawWindowHandle` type on macOS and Windows, and a `&gtk::ApplicationWindow` on Linux:
+- Use the `drag::start_drag` function. It takes a `&T: raw_window_handle::HasWindowHandle` type on macOS and Windows, and a `&gtk::ApplicationWindow` on Linux:
 
   - tao:
   ```rust
@@ -46,18 +46,18 @@ There's two ways to consume this crate API: from Rust code via the `drag` crate
 
   - wry:
   ```rust
-  let event_loop = wry::application::event_loop::EventLoop::new();
-  let window = wry::application::window::WindowBuilder::new().build(&event_loop).unwrap();
-  let webview = wry::webview::WebViewBuilder::new(window).unwrap().build().unwrap();
+  let event_loop = tao::event_loop::EventLoop::new();
+  let window = tao::window::WindowBuilder::new().build(&event_loop).unwrap();
+  let webview = wry::WebViewBuilder::new().build(&window).unwrap();
 
   drag::start_drag(
     #[cfg(target_os = "linux")]
     {
-      use wry::application::platform::unix::WindowExtUnix;
-      webview.window().gtk_window()
+      use tao::platform::unix::WindowExtUnix;
+      window.gtk_window()
     },
     #[cfg(not(target_os = "linux"))]
-    &webview.window(),
+    &window,
     item,
     preview_icon,
   );
@@ -160,7 +160,7 @@ fn main() {
 
 ```javascript
 import { dragAsWindow, dragBack } from "@crabnebula/tauri-plugin-drag-as-window";
-import { appWindow, WebviewWindow } from "@tauri-apps/api/window";
+import { getCurrentWebviewWindow, WebviewWindow } from "@tauri-apps/api/webviewWindow";
 // alternatively you can pass a DOM element instead of its selector
 dragAsWindow('#my-drag-element', (payload) => {
   console.log('dropped!')
@@ -176,7 +176,7 @@ el.ondragstart = (event) => {
   event.preventDefault()
 
   dragBack(event.target, { data: 'some data' }, (payload) => {
-    appWindow.close()
+    getCurrentWebviewWindow().close()
   })
 }
 ```

crates/drag/Cargo.toml

@@ -1,52 +1,36 @@
 [package]
 name = "drag"
-version = "0.4.0"
+version = "1.0.0"
 description = "Start a drag operation out of a window"
 authors = [ "CrabNebula Ltd." ]
 edition = { workspace = true }
 license = { workspace = true }
 
 [dependencies]
-raw-window-handle = "0.5"
-thiserror = "1"
-serde = { version = "1", optional = true }
+raw-window-handle = "0.6.2"
+thiserror.workspace = true
+serde = { workspace = true, optional = true }
 
 [dev-dependencies]
-tao = "0.16"
-winit = "0.29"
-wry = "0.24"
-tauri = "1"
+tao.workspace = true
+winit.workspace = true
+wry.workspace = true
+tauri.workspace = true
 
 [target."cfg(target_os = \"macos\")".dependencies]
-cocoa = "0.25"
-objc = "0.2"
-core-graphics = "0.23"
+cocoa = "0.26.0"
+objc = "0.2.7"
+core-graphics = "0.24.0"
 
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
-gtk = { version = "0.15", features = [ "v3_20" ] }
-gdk = { version = "0.15", features = [ "v3_20" ] }
-gdkx11 = "0.15"
+gtk = { version = "0.18.1" }
+gdk = { version = "0.18.0" }
+gdkx11 = "0.18.0"
 
 [target."cfg(target_os = \"windows\")".dependencies]
-dunce = "1"
-
-  [target."cfg(target_os = \"windows\")".dependencies.windows]
-  version = "0.52"
-  features = [
-  "implement",
-  "Win32_Foundation",
-  "Win32_Graphics_Gdi",
-  "Win32_System_Com",
-  "Win32_System_Com_StructuredStorage",
-  "Win32_System_Ole",
-  "Win32_System_Memory",
-  "Win32_System_SystemServices",
-  "Win32_UI_Shell",
-  "Win32_UI_Shell_Common",
-  "Win32_UI_WindowsAndMessaging",
-  "Win32_Graphics_Imaging",
-  "Win32_Graphics_Gdi"
-]
+dunce.workspace = true
+windows-core = "0.58"
+windows = { version = "0.52", features = [ "implement", "Win32_Foundation", "Win32_Graphics_Gdi", "Win32_System_Com", "Win32_System_Com_StructuredStorage", "Win32_System_Ole", "Win32_System_Memory", "Win32_System_SystemServices", "Win32_UI_Shell", "Win32_UI_Shell_Common", "Win32_UI_WindowsAndMessaging",  "Win32_Graphics_Imaging", "Win32_Graphics_Gdi" ] }
 
 [features]
 serde = [ "dep:serde" ]

crates/drag/src/lib.rs

@@ -15,7 +15,7 @@
 //!
 //! `$ cargo add drag`
 //!
-//! - Use the `drag::start_drag` function. It takes a `&T: raw_window_handle::HasRawWindowHandle` type on macOS and Windows, and a `&gtk::ApplicationWindow` on Linux:
+//! - Use the `drag::start_drag` function. It takes a `&T: raw_window_handle::HasWindowHandle` type on macOS and Windows, and a `&gtk::ApplicationWindow` on Linux:
 //!
 //! - tao:
 //!   ```rust,no_run
@@ -44,21 +44,21 @@
 //!
 //!   - wry:
 //!   ```rust,no_run
-//!   let event_loop = wry::application::event_loop::EventLoop::new();
-//!   let window = wry::application::window::WindowBuilder::new().build(&event_loop).unwrap();
-//!   let webview = wry::webview::WebViewBuilder::new(window).unwrap().build().unwrap();
+//!   let event_loop = tao::event_loop::EventLoop::new();
+//!   let window = tao::window::WindowBuilder::new().build(&event_loop).unwrap();
+//!   let webview = wry::WebViewBuilder::new().build(&window).unwrap();
 //!
 //!   let item = drag::DragItem::Files(vec![std::fs::canonicalize("./examples/icon.png").unwrap()]);
 //!   let preview_icon = drag::Image::File("./examples/icon.png".into());
 //!
 //!   drag::start_drag(
 //!     #[cfg(target_os = "linux")]
 //!     {
-//!       use wry::application::platform::unix::WindowExtUnix;
-//!       webview.window().gtk_window()
+//!       use tao::platform::unix::WindowExtUnix;
+//!       window.gtk_window()
 //!     },
 //!     #[cfg(not(target_os = "linux"))]
-//!     &webview.window(),
+//!     &window,
 //!     item,
 //!     preview_icon,
 //!     |result, cursor_position| {
@@ -69,9 +69,8 @@
 //!   ```
 //!
 //!   - winit:
-//!   ```rust,no_run
-//!   let event_loop = winit::event_loop::EventLoop::new().unwrap();
-//!   let window = winit::window::WindowBuilder::new().build(&event_loop).unwrap();
+//!   ```rust,ignore
+//!   let window = ...winit window;
 //!
 //!   let item = drag::DragItem::Files(vec![std::fs::canonicalize("./examples/icon.png").unwrap()]);
 //!   let preview_icon = drag::Image::File("./examples/icon.png".into());
@@ -116,7 +115,7 @@ pub enum Error {
     FailedToGetCursorPosition,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone, Copy)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 pub enum DragResult {
     Dropped,
@@ -160,7 +159,7 @@ pub enum Image {
 /// Logical position of the cursor.
 ///
 /// - **Windows**: Currently the win32 API for logical position reports physical position as well, due to the complicated nature of potential multiple monitor with different scaling there's no trivial solution to be incorporated.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 pub struct CursorPosition {
     pub x: i32,

crates/drag/src/platform_impl/gtk/mod.rs

@@ -5,12 +5,13 @@
 use crate::{CursorPosition, DragItem, DragResult, Error, Image, Options};
 use gdkx11::{
     gdk,
-    glib::{ObjectExt, SignalHandlerId},
+    glib::{ObjectExt, Propagation, SignalHandlerId},
 };
 use gtk::{
     gdk_pixbuf,
-    prelude::{DragContextExtManual, PixbufLoaderExt, WidgetExt, WidgetExtManual},
-    Inhibit,
+    prelude::{
+        DeviceExt, DragContextExtManual, PixbufLoaderExt, SeatExt, WidgetExt, WidgetExtManual,
+    },
 };
 use std::{
     rc::Rc,
@@ -120,7 +121,11 @@ fn on_drop_failed<F: Fn(DragResult, CursorPosition) + Send + 'static>(
             );
 
             cleanup_signal_handlers(&handler_ids_clone, &window_clone);
-            Inhibit(skip_animatation_on_cancel_or_failure)
+            if skip_animatation_on_cancel_or_failure {
+                Propagation::Stop
+            } else {
+                Propagation::Proceed
+            }
         }));
 }
 

crates/drag/src/platform_impl/macos/mod.rs

@@ -14,7 +14,7 @@ use objc::{
     declare::ClassDecl,
     runtime::{Class, Object, Protocol, Sel, BOOL, NO, YES},
 };
-use raw_window_handle::{HasRawWindowHandle, RawWindowHandle};
+use raw_window_handle::{HasWindowHandle, RawWindowHandle};
 
 use crate::{CursorPosition, DragItem, DragResult, Image, Options};
 
@@ -50,16 +50,16 @@ impl NSString {
     }
 }
 
-pub fn start_drag<W: HasRawWindowHandle, F: Fn(DragResult, CursorPosition) + Send + 'static>(
+pub fn start_drag<W: HasWindowHandle, F: Fn(DragResult, CursorPosition) + Send + 'static>(
     handle: &W,
     item: DragItem,
     image: Image,
     on_drop_callback: F,
     options: Options,
 ) -> crate::Result<()> {
-    if let RawWindowHandle::AppKit(w) = handle.raw_window_handle() {
+    if let Ok(RawWindowHandle::AppKit(w)) = handle.window_handle().map(|h| h.as_raw()) {
         unsafe {
-            let window = w.ns_window as id;
+            let window: id = msg_send![w.ns_view.as_ptr() as id, window];
             // wry replaces the ns_view so we don't really use AppKitWindowHandle::ns_view
             let ns_view: id = msg_send![window, contentView];
 
@@ -238,7 +238,7 @@ pub fn start_drag<W: HasRawWindowHandle, F: Fn(DragResult, CursorPosition) + Sen
                             1
                         } else {
                             // NSDragOperationEvery
-                            NSUInteger::max_value()
+                            NSUInteger::MAX
                         }
                     }
 

crates/drag/src/platform_impl/windows/mod.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use raw_window_handle::{HasRawWindowHandle, RawWindowHandle};
+use raw_window_handle::{HasWindowHandle, RawWindowHandle};
 
 use crate::{CursorPosition, DragItem, DragResult, Image, Options};
 
@@ -210,18 +210,19 @@ impl IDataObject_Impl for DataObject {
     }
 }
 
-pub fn start_drag<W: HasRawWindowHandle, F: Fn(DragResult, CursorPosition) + Send + 'static>(
+pub fn start_drag<W: HasWindowHandle, F: Fn(DragResult, CursorPosition) + Send + 'static>(
     handle: &W,
     item: DragItem,
     image: Image,
     on_drop_callback: F,
     _options: Options,
 ) -> crate::Result<()> {
-    if let RawWindowHandle::Win32(_w) = handle.raw_window_handle() {
+    if let Ok(RawWindowHandle::Win32(_w)) = handle.window_handle().map(|h| h.as_raw()) {
         match item {
             DragItem::Files(files) => {
                 init_ole();
                 unsafe {
+                    #[allow(static_mut_refs)]
                     if let Err(e) = &OLE_RESULT {
                         return Err(e.clone().into());
                     }
@@ -264,6 +265,7 @@ pub fn start_drag<W: HasRawWindowHandle, F: Fn(DragResult, CursorPosition) + Sen
             DragItem::Data { .. } => {
                 init_ole();
                 unsafe {
+                    #[allow(static_mut_refs)]
                     if let Err(e) = &OLE_RESULT {
                         return Err(e.clone().into());
                     }