fix api example build for mobile

tauri-apps · Aug 5, 2023 · 1bdd397 · 1bdd397
1 parent 4eb031a
commit 1bdd397
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/examples/api/src-tauri/src/cmd.rs b/examples/api/src-tauri/src/cmd.rs
@@ -2,9 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use crate::PopupMenu;
 use serde::Deserialize;
-use tauri::{command, Runtime, State, Window};
+use tauri::command;
 
 #[derive(Debug, Deserialize)]
 #[allow(unused)]
@@ -24,9 +23,9 @@ pub fn perform_request(endpoint: String, body: RequestBody) -> String {
   "message response".into()
 }
 
-#[cfg(not(target_os = "macos"))]
+#[cfg(all(desktop, not(target_os = "macos")))]
 #[command]
-pub fn toggle_menu<R: Runtime>(window: Window<R>) {
+pub fn toggle_menu<R: tauri::Runtime>(window: tauri::Window<R>) {
   if window.is_menu_visible().unwrap_or_default() {
     let _ = window.hide_menu();
   } else {
@@ -36,7 +35,10 @@ pub fn toggle_menu<R: Runtime>(window: Window<R>) {
 
 #[cfg(target_os = "macos")]
 #[command]
-pub fn toggle_menu<R: Runtime>(app: tauri::AppHandle<R>, app_menu: State<'_, crate::AppMenu<R>>) {
+pub fn toggle_menu<R: tauri::Runtime>(
+  app: tauri::AppHandle<R>,
+  app_menu: tauri::State<'_, crate::AppMenu<R>>,
+) {
   if let Some(menu) = app.remove_menu().unwrap() {
     app_menu.0.lock().unwrap().replace(menu);
   } else {
@@ -46,7 +48,11 @@ pub fn toggle_menu<R: Runtime>(app: tauri::AppHandle<R>, app_menu: State<'_, cra
   }
 }
 
+#[cfg(desktop)]
 #[command]
-pub fn popup_context_menu<R: Runtime>(window: Window<R>, popup_menu: State<'_, PopupMenu<R>>) {
+pub fn popup_context_menu<R: tauri::Runtime>(
+  window: tauri::Window<R>,
+  popup_menu: tauri::State<'_, crate::PopupMenu<R>>,
+) {
   window.popup_menu(&popup_menu.0).unwrap();
 }
diff --git a/examples/api/src-tauri/src/lib.rs b/examples/api/src-tauri/src/lib.rs
@@ -12,13 +12,12 @@ mod cmd;
 mod tray;
 
 use serde::Serialize;
-use tauri::{
-  menu::{Menu, MenuBuilder},
-  window::WindowBuilder,
-  App, AppHandle, Manager, RunEvent, Runtime, WindowUrl,
-};
+use tauri::{window::WindowBuilder, App, AppHandle, RunEvent, Runtime, WindowUrl};
 use tauri_plugin_sample::{PingRequest, SampleExt};
 
+#[cfg(desktop)]
+use tauri::Manager;
+
 pub type SetupHook = Box<dyn FnOnce(&mut App) -> Result<(), Box<dyn std::error::Error>> + Send>;
 pub type OnEvent = Box<dyn FnMut(&AppHandle, RunEvent)>;
 
@@ -30,7 +29,8 @@ struct Reply {
 #[cfg(target_os = "macos")]
 pub struct AppMenu<R: Runtime>(pub std::sync::Mutex<Option<tauri::menu::Menu<R>>>);
 
-pub struct PopupMenu<R: Runtime>(Menu<R>);
+#[cfg(desktop)]
+pub struct PopupMenu<R: Runtime>(tauri::menu::Menu<R>);
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
@@ -60,8 +60,9 @@ pub fn run_app<R: Runtime, F: FnOnce(&App<R>) + Send + 'static>(
       #[cfg(target_os = "macos")]
       app.manage(AppMenu::<R>(Default::default()));
 
+      #[cfg(desktop)]
       app.manage(PopupMenu(
-        MenuBuilder::new(app)
+        tauri::menu::MenuBuilder::new(app)
           .check("Tauri is awesome!")
           .text("Do something")
           .copy()
@@ -141,7 +142,9 @@ pub fn run_app<R: Runtime, F: FnOnce(&App<R>) + Send + 'static>(
     .invoke_handler(tauri::generate_handler![
       cmd::log_operation,
       cmd::perform_request,
+      #[cfg(desktop)]
       cmd::toggle_menu,
+      #[cfg(desktop)]
       cmd::popup_context_menu
     ])
     .build(tauri::tauri_build_context!())