Use inner muda id

Author: Legend-Master

crates/tauri/src/menu/check.rs

@@ -82,7 +82,7 @@ impl<R: Runtime> CheckMenuItem<R> {
 
   /// Returns a unique identifier associated with this menu item.
   pub fn id(&self) -> &MenuId {
-    &self.0.id
+    self.0.inner.id()
   }
 
   /// Get the text for this menu item.

crates/tauri/src/menu/icon.rs

@@ -161,7 +161,7 @@ impl<R: Runtime> IconMenuItem<R> {
 
   /// Returns a unique identifier associated with this menu item.
   pub fn id(&self) -> &MenuId {
-    &self.0.id
+    self.0.inner.id()
   }
 
   /// Get the text for this menu item.

crates/tauri/src/menu/menu.rs

@@ -251,7 +251,7 @@ impl<R: Runtime> Menu<R> {
 
   /// Returns a unique identifier associated with this menu.
   pub fn id(&self) -> &MenuId {
-    &self.0.id
+    self.0.inner.id()
   }
 
   /// Add a menu item to the end of this menu.

crates/tauri/src/menu/mod.rs

@@ -70,7 +70,6 @@ macro_rules! gen_wrappers {
     $(
       #[tauri_macros::default_runtime(crate::Wry, wry)]
       pub(crate) struct $inner<R: $crate::Runtime> {
-        id: $crate::menu::MenuId,
         // SAFETY: we only call `ManuallyDrop::take` in [`Self::drop`] to drop it on main thread
         inner: ManuallyDrop<::muda::$type>,
         app_handle: $crate::AppHandle<R>,
@@ -79,7 +78,6 @@ macro_rules! gen_wrappers {
       impl<R: $crate::Runtime> $inner<R> {
         fn new(app_handle: $crate::AppHandle<R>, menu: ::muda::$type) -> Self {
           Self {
-            id: menu.id().clone(),
             inner: ManuallyDrop::new(menu),
             app_handle,
           }
@@ -133,7 +131,7 @@ macro_rules! gen_wrappers {
           }
 
           fn id(&self) -> &MenuId {
-            &self.0.id
+            self.0.inner.id()
           }
         }
       )*

crates/tauri/src/menu/normal.rs

@@ -80,7 +80,7 @@ impl<R: Runtime> MenuItem<R> {
 
   /// Returns a unique identifier associated with this menu item.
   pub fn id(&self) -> &MenuId {
-    &self.0.id
+    self.0.inner.id()
   }
 
   /// Get the text for this menu item.

crates/tauri/src/menu/predefined.rs

@@ -337,7 +337,7 @@ impl<R: Runtime> PredefinedMenuItem<R> {
 
   /// Returns a unique identifier associated with this menu item.
   pub fn id(&self) -> &MenuId {
-    &self.0.id
+    self.0.inner.id()
   }
 
   /// Get the text for this menu item.

crates/tauri/src/menu/submenu.rs

@@ -246,7 +246,7 @@ impl<R: Runtime> Submenu<R> {
 
   /// Returns a unique identifier associated with this submenu.
   pub fn id(&self) -> &MenuId {
-    &self.0.id
+    self.0.inner.id()
   }
 
   /// Add a menu item to the end of this submenu.