refactor: move to muda and tray_icon crates

core/tauri/src/app.rs

@@ -655,7 +655,7 @@ macro_rules! shared_app_impl {
         {
           let menu_ = menu.clone();
           self.run_on_main_thread(move || {
-            menu_.inner().init_for_nsapp();
+            let _ = init_app_menu(&menu_);
           })?;
         }
 
@@ -1451,7 +1451,7 @@ impl<R: Runtime> Builder<R> {
         .insert(menu.id().clone(), menu.clone());
 
       #[cfg(target_os = "macos")]
-      menu.inner().init_for_nsapp();
+      init_app_menu(&menu)?;
 
       app.manager.menu_lock().replace(menu);
     }
@@ -1527,6 +1527,24 @@ impl<R: Runtime> Builder<R> {
   }
 }
 
+#[cfg(target_os = "macos")]
+fn init_app_menu<R: Runtime>(menu: &Menu<R>) -> crate::Result<()> {
+  menu.inner().init_for_nsapp();
+
+  if let Some(window_menu) = menu.get(crate::menu::WINDOW_SUBMENU_ID) {
+    if let Some(m) = window_menu.as_submenu() {
+      m.set_as_windows_menu_for_nsapp()?;
+    }
+  }
+  if let Some(help_menu) = menu.get(crate::menu::HELP_SUBMENU_ID) {
+    if let Some(m) = help_menu.as_submenu() {
+      m.set_as_help_menu_for_nsapp()?;
+    }
+  }
+
+  Ok(())
+}
+
 unsafe impl<R: Runtime> HasRawDisplayHandle for AppHandle<R> {
   fn raw_display_handle(&self) -> raw_window_handle::RawDisplayHandle {
     self.runtime_handle.raw_display_handle()

core/tauri/src/menu/menu.rs

@@ -9,6 +9,11 @@ use crate::{run_main_thread, AppHandle, Manager, Position, Runtime};
 use muda::ContextMenu;
 use muda::{AboutMetadata, MenuId};
 
+/// Expected submenu id of the Window menu for macOS.
+pub const WINDOW_SUBMENU_ID: &str = "__tauri_window_menu__";
+/// Expected submenu id of the Help menu for macOS.
+pub const HELP_SUBMENU_ID: &str = "__tauri_help_menu__";
+
 /// A type that is either a menu bar on the window
 /// on Windows and Linux or as a global menu in the menubar on macOS.
 pub struct Menu<R: Runtime> {
@@ -143,8 +148,9 @@ impl<R: Runtime> Menu<R> {
       ..Default::default()
     };
 
-    let window_menu = Submenu::with_items(
+    let window_menu = Submenu::with_id_and_items(
       app_handle,
+      WINDOW_SUBMENU_ID,
       "Window",
       true,
       &[
@@ -156,8 +162,9 @@ impl<R: Runtime> Menu<R> {
       ],
     )?;
 
-    let help_menu = Submenu::with_items(
+    let help_menu = Submenu::with_id_and_items(
       app_handle,
+      HELP_SUBMENU_ID,
       "Help",
       true,
       &[
@@ -228,12 +235,6 @@ impl<R: Runtime> Menu<R> {
       ],
     )?;
 
-    #[cfg(target_os = "macos")]
-    {
-      window_menu.set_as_windows_menu_for_nsapp()?;
-      help_menu.set_as_help_menu_for_nsapp()?;
-    }
-
     Ok(menu)
   }
 
@@ -342,6 +343,16 @@ impl<R: Runtime> Menu<R> {
       .map_err(Into::into)
   }
 
+  /// Retrieves the menu item matching the given identifier.
+  pub fn get<I: Into<MenuId>>(&self, id: I) -> Option<MenuItemKind<R>> {
+    let id = id.into();
+    self
+      .items()
+      .unwrap_or_default()
+      .into_iter()
+      .find(|i| i.id() == &id)
+  }
+
   /// Returns a list of menu items that has been added to this menu.
   pub fn items(&self) -> crate::Result<Vec<MenuItemKind<R>>> {
     let handle = self.app_handle.clone();

core/tauri/src/menu/mod.rs

@@ -19,7 +19,7 @@ mod submenu;
 pub use builders::*;
 pub use check::CheckMenuItem;
 pub use icon::IconMenuItem;
-pub use menu::Menu;
+pub use menu::{Menu, HELP_SUBMENU_ID, WINDOW_SUBMENU_ID};
 pub use normal::MenuItem;
 pub use predefined::PredefinedMenuItem;
 pub use submenu::Submenu;