From d4275ba6d505babc8b2ba438221581ad4d59ac7e Mon Sep 17 00:00:00 2001 From: Arnab Chakraborty <11457760+Rocky43007@users.noreply.github.com> Date: Sun, 2 Feb 2025 02:59:28 -0500 Subject: [PATCH] Fix drag working in dev & prod --- Cargo.lock | 6 +++--- apps/desktop/src-tauri/src/drag.rs | 2 +- apps/desktop/src/App.tsx | 4 +++- apps/desktop/src/commands.ts | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f0328c3282d4..826eb8c4c8f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3725,7 +3725,7 @@ dependencies = [ "presser", "thiserror 1.0.64", "winapi", - "windows 0.52.0", + "windows 0.51.1", ] [[package]] @@ -4419,7 +4419,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.52.0", + "windows-core 0.51.1", ] [[package]] @@ -5471,7 +5471,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] diff --git a/apps/desktop/src-tauri/src/drag.rs b/apps/desktop/src-tauri/src/drag.rs index 126b45fa3569..6764cb57f060 100644 --- a/apps/desktop/src-tauri/src/drag.rs +++ b/apps/desktop/src-tauri/src/drag.rs @@ -66,7 +66,7 @@ static TRACKING: AtomicBool = AtomicBool::new(false); /// * `window` - The Tauri window instance /// * `_state` - Current drag state (unused) /// * `files` - Vector of file paths to be dragged -/// * `icon_path` - Path to the preview icon for the drag operation +/// * `image` - Base64 encoded image to be used as drag icon /// * `on_event` - Channel for communicating drag operation events back to the frontend #[tauri::command(async)] #[specta::specta] diff --git a/apps/desktop/src/App.tsx b/apps/desktop/src/App.tsx index 9c0ec1bb41f4..0a438135f815 100644 --- a/apps/desktop/src/App.tsx +++ b/apps/desktop/src/App.tsx @@ -142,9 +142,11 @@ function useDragAndDrop() { explorerStore.drag = null; }; + const image = !Transparent.includes('/@fs/') ? Transparent : Transparent.replace('/@fs', ''); + await invoke('start_drag', { files: validFiles, - image: Transparent, + image: image, onEvent: channel }); console.log('start_drag invoked successfully'); diff --git a/apps/desktop/src/commands.ts b/apps/desktop/src/commands.ts index 8516120a8af6..21e45b6bd9d9 100644 --- a/apps/desktop/src/commands.ts +++ b/apps/desktop/src/commands.ts @@ -56,7 +56,7 @@ export const commands = { * * `window` - The Tauri window instance * * `_state` - Current drag state (unused) * * `files` - Vector of file paths to be dragged - * * `icon_path` - Path to the preview icon for the drag operation + * * `image` - Base64 encoded image to be used as drag icon * * `on_event` - Channel for communicating drag operation events back to the frontend */ async startDrag(