From 05458a0753e532f94aab9a61391c21a71e06d456 Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Sun, 19 Nov 2023 18:21:10 -0800 Subject: [PATCH] Remove Tauri context menu plugin --- package-lock.json | 9 -- package.json | 1 - src-tauri/Cargo.lock | 165 --------------------------------- src-tauri/Cargo.toml | 1 - src-tauri/src/main.rs | 1 - src-web/components/Sidebar.tsx | 41 -------- 6 files changed, 218 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4e572e93..7b4f20b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,6 @@ "react-router-dom": "^6.8.1", "react-use": "^17.4.0", "slugify": "^1.6.6", - "tauri-plugin-context-menu": "^0.5.0", "tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log#v1", "uuid": "^9.0.0" }, @@ -7775,14 +7774,6 @@ "postcss": "^8.2.14" } }, - "node_modules/tauri-plugin-context-menu": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/tauri-plugin-context-menu/-/tauri-plugin-context-menu-0.5.0.tgz", - "integrity": "sha512-CkAjSyxLx26hTXabG5Unbv+GWeH0XYNQB3zTqRxHpp257mWX8I4oASp8YF5T3zxFQEK++ZHqMZHpLrQ3usShRQ==", - "dependencies": { - "@tauri-apps/api": "^1.5.0" - } - }, "node_modules/tauri-plugin-log-api": { "version": "0.0.0", "resolved": "git+ssh://git@github.com/tauri-apps/tauri-plugin-log.git#e5266f6719039c32b8f51ae86c9b726c2c9f3e42", diff --git a/package.json b/package.json index 38387701..7ffcf4e3 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,6 @@ "react-router-dom": "^6.8.1", "react-use": "^17.4.0", "slugify": "^1.6.6", - "tauri-plugin-context-menu": "^0.5.0", "tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log#v1", "uuid": "^9.0.0" }, diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 454e3ddc..967b582b 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -171,12 +171,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - [[package]] name = "bitflags" version = "1.3.2" @@ -717,30 +711,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - [[package]] name = "crossbeam-queue" version = "0.3.8" @@ -760,12 +730,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - [[package]] name = "crypto-common" version = "0.1.6" @@ -1062,22 +1026,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "exr" -version = "1.71.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - [[package]] name = "fast-float" version = "0.2.0" @@ -1465,16 +1413,6 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gimli" version = "0.28.0" @@ -1660,15 +1598,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "half" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" -dependencies = [ - "crunchy", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -2056,14 +1985,8 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", - "exr", - "gif", - "jpeg-decoder", "num-rational", "num-traits", - "png", - "qoi", - "tiff", ] [[package]] @@ -2196,15 +2119,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" -[[package]] -name = "jpeg-decoder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] - [[package]] name = "js-sys" version = "0.3.65" @@ -2260,12 +2174,6 @@ dependencies = [ "spin 0.5.2", ] -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - [[package]] name = "libc" version = "0.2.150" @@ -3229,15 +3137,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - [[package]] name = "quick-xml" version = "0.31.0" @@ -3343,26 +3242,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" -[[package]] -name = "rayon" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - [[package]] name = "redox_syscall" version = "0.1.57" @@ -4579,23 +4458,6 @@ dependencies = [ "tauri-utils", ] -[[package]] -name = "tauri-plugin-context-menu" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93737f332761822f2d1ee6f7dbe4c1f94c4d03020a349bc1f8070d75b6409e8" -dependencies = [ - "cocoa 0.24.1", - "dispatch", - "image", - "lazy_static", - "libc", - "objc", - "serde", - "tauri", - "winapi", -] - [[package]] name = "tauri-plugin-log" version = "0.0.0" @@ -4773,17 +4635,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tiff" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - [[package]] name = "time" version = "0.3.30" @@ -5430,12 +5281,6 @@ dependencies = [ "windows-metadata", ] -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - [[package]] name = "whoami" version = "1.4.1" @@ -5887,7 +5732,6 @@ dependencies = [ "sqlx", "tauri", "tauri-build", - "tauri-plugin-context-menu", "tauri-plugin-log", "tauri-plugin-window-state", "tokio", @@ -5998,12 +5842,3 @@ dependencies = [ "crc32fast", "crossbeam-utils", ] - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index eb7f157e..d4cb9fcf 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -47,7 +47,6 @@ tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", br tokio = { version = "1.25.0", features = ["sync"] } uuid = "1.3.0" log = "0.4.20" -tauri-plugin-context-menu = "0.5.0" datetime = "0.5.2" [features] diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 90fba22d..118e5246 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -657,7 +657,6 @@ fn main() { .build(), ) .plugin(tauri_plugin_window_state::Builder::default().build()) - .plugin(tauri_plugin_context_menu::init()) .setup(|app| { let dir = match is_dev() { true => current_dir().unwrap(), diff --git a/src-web/components/Sidebar.tsx b/src-web/components/Sidebar.tsx index e604a217..03869d1f 100644 --- a/src-web/components/Sidebar.tsx +++ b/src-web/components/Sidebar.tsx @@ -5,7 +5,6 @@ import type { XYCoord } from 'react-dnd'; import { useDrag, useDrop } from 'react-dnd'; import { useKey, useKeyPressEvent } from 'react-use'; -import { showMenu } from 'tauri-plugin-context-menu'; import { useActiveEnvironmentId } from '../hooks/useActiveEnvironmentId'; import { useActiveRequestId } from '../hooks/useActiveRequestId'; import { useActiveWorkspace } from '../hooks/useActiveWorkspace'; @@ -14,7 +13,6 @@ import { useCreateFolder } from '../hooks/useCreateFolder'; import { useCreateRequest } from '../hooks/useCreateRequest'; import { useDeleteAnyRequest } from '../hooks/useDeleteAnyRequest'; import { useDeleteFolder } from '../hooks/useDeleteFolder'; -import { useDeleteRequest } from '../hooks/useDeleteRequest'; import { useFolders } from '../hooks/useFolders'; import { useKeyValue } from '../hooks/useKeyValue'; import { useLatestResponse } from '../hooks/useLatestResponse'; @@ -22,7 +20,6 @@ import { useListenToTauriEvent } from '../hooks/useListenToTauriEvent'; import { usePrompt } from '../hooks/usePrompt'; import { useRequests } from '../hooks/useRequests'; import { useSendManyRequests } from '../hooks/useSendFolder'; -import { useSendRequest } from '../hooks/useSendRequest'; import { useSidebarHidden } from '../hooks/useSidebarHidden'; import { useUpdateAnyFolder } from '../hooks/useUpdateAnyFolder'; import { useUpdateAnyRequest } from '../hooks/useUpdateAnyRequest'; @@ -512,9 +509,7 @@ const SidebarItem = forwardRef(function SidebarItem( const createRequest = useCreateRequest(); const createFolder = useCreateFolder(); const deleteFolder = useDeleteFolder(itemId); - const sendRequest = useSendRequest(itemId); const sendManyRequests = useSendManyRequests(); - const deleteRequest = useDeleteRequest(itemId); const latestResponse = useLatestResponse(itemId); const updateRequest = useUpdateRequest(itemId); const updateAnyFolder = useUpdateAnyFolder(); @@ -565,41 +560,6 @@ const SidebarItem = forwardRef(function SidebarItem( [handleSubmitNameEdit], ); - const handleContextMenu = useCallback( - (e: React.MouseEvent) => { - e.preventDefault(); - e.stopPropagation(); - showMenu({ - pos: { x: e.clientX, y: e.clientY }, - items: - itemModel === 'http_request' - ? [ - { - label: 'Send Request', - event: () => sendRequest.mutate(), - }, - { - label: 'Delete Request', - event: () => deleteRequest.mutate(), - }, - ] - : [ - { - label: 'Send All', - event: () => sendManyRequests.mutate(child.children.map((c) => c.item.id)), - }, - { - label: 'Delete Folder', - event: () => deleteFolder.mutate(), - }, - ], - }) - .then((r) => console.log(r)) - .catch((e) => console.log(e)); - }, - [itemModel, sendRequest, deleteRequest, sendManyRequests, child.children, deleteFolder], - ); - const handleSelect = useCallback(() => onSelect(itemId), [onSelect, itemId]); return ( @@ -669,7 +629,6 @@ const SidebarItem = forwardRef(function SidebarItem( disabled={editing} onClick={handleSelect} onDoubleClick={handleStartEditing} - onContextMenu={handleContextMenu} data-active={isActive} data-selected={selected} className={classNames(