From 43230cb6b7a4b14a23ea8f05636ae06f03c718e9 Mon Sep 17 00:00:00 2001 From: Tony <68118705+Legend-Master@users.noreply.github.com> Date: Tue, 19 Mar 2024 20:40:25 +0800 Subject: [PATCH] fix(core): menu `remove` js binding not working (#9219) * Fix menu `remove` js binding not working * add change file [skip ci] --------- Co-authored-by: Lucas Nogueira --- .changes/fix-menu-remove-api.md | 5 +++++ core/tauri/src/menu/plugin.rs | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 .changes/fix-menu-remove-api.md diff --git a/.changes/fix-menu-remove-api.md b/.changes/fix-menu-remove-api.md new file mode 100644 index 00000000000..81b738aeb47 --- /dev/null +++ b/.changes/fix-menu-remove-api.md @@ -0,0 +1,5 @@ +--- +"tauri": patch:bug +--- + +Fixes the menu plugin `remove` command signature. diff --git a/core/tauri/src/menu/plugin.rs b/core/tauri/src/menu/plugin.rs index 39accca477b..b577601071f 100644 --- a/core/tauri/src/menu/plugin.rs +++ b/core/tauri/src/menu/plugin.rs @@ -536,19 +536,19 @@ fn insert( #[command(root = "crate")] fn remove( app: AppHandle, - menu_rid: ResourceId, - menu_kind: ItemKind, + rid: ResourceId, + kind: ItemKind, item: (ResourceId, ItemKind), ) -> crate::Result<()> { let resources_table = app.resources_table(); let (rid, kind) = item; - match menu_kind { + match kind { ItemKind::Menu => { - let menu = resources_table.get::>(menu_rid)?; + let menu = resources_table.get::>(rid)?; do_menu_item!(resources_table, rid, kind, |i| menu.remove(&*i))?; } ItemKind::Submenu => { - let submenu = resources_table.get::>(menu_rid)?; + let submenu = resources_table.get::>(rid)?; do_menu_item!(resources_table, rid, kind, |i| submenu.remove(&*i))?; } _ => return Err(anyhow::anyhow!("unexpected menu item kind").into()),