run_return on mobile

lucasfernog · lucasfernog · commit 15002c0b68e3 · 2025-03-15T16:14:22.000-03:00
diff --git a/.changes/run-return-mobile.md b/.changes/run-return-mobile.md
@@ -0,0 +1,5 @@
+---
+"tauri-runtime": minor:feat
+---
+
+`Runtime::run_return` now must also be implemented on mobile targets.
diff --git a/crates/tauri-runtime-wry/src/lib.rs b/crates/tauri-runtime-wry/src/lib.rs
@@ -2836,14 +2836,20 @@ impl<T: UserEvent> Runtime<T> for Wry<T> {
     self.event_loop.run(event_handler)
   }
 
-  #[cfg(desktop)]
+  #[cfg(not(target_os = "ios"))]
   fn run_return<F: FnMut(RunEvent<T>) + 'static>(mut self, callback: F) -> i32 {
     use tao::platform::run_return::EventLoopExtRunReturn;
 
     let event_handler = make_event_handler(&self, callback);
 
     self.event_loop.run_return(event_handler)
   }
+
+  #[cfg(target_os = "ios")]
+  fn run_return<F: FnMut(RunEvent<T>) + 'static>(mut self, callback: F) -> i32 {
+    self.run(callback);
+    0
+  }
 }
 
 fn make_event_handler<T, F>(
diff --git a/crates/tauri-runtime/src/lib.rs b/crates/tauri-runtime/src/lib.rs
@@ -438,7 +438,6 @@ pub trait Runtime<T: UserEvent>: Debug + Sized + 'static {
   fn run_iteration<F: FnMut(RunEvent<T>) + 'static>(&mut self, callback: F);
 
   /// Equivalent to [`Runtime::run`] but returns the exit code instead of exiting the process.
-  #[cfg(desktop)]
   fn run_return<F: FnMut(RunEvent<T>) + 'static>(self, callback: F) -> i32;
 
   /// Run the webview runtime.
diff --git a/crates/tauri/src/app.rs b/crates/tauri/src/app.rs
@@ -1103,7 +1103,7 @@ impl<R: Runtime> App<R> {
   ///
   /// ## Platform-specific
   ///
-  /// - **iOS / Android**: Unsupported.
+  /// - **iOS**: Unsupported. The application will fallback to [`run`](Self::run).
   ///
   /// # Panics
   ///
@@ -1125,7 +1125,6 @@ impl<R: Runtime> App<R> {
   ///
   /// std::process::exit(exit_code);
   /// ```
-  #[cfg(desktop)]
   pub fn run_return<F: FnMut(&AppHandle<R>, RunEvent) + 'static>(mut self, mut callback: F) -> i32 {
     let manager = self.manager.clone();
     let app_handle = self.handle().clone();
diff --git a/crates/tauri/src/test/mock_runtime.rs b/crates/tauri/src/test/mock_runtime.rs
@@ -1188,7 +1188,6 @@ impl<T: UserEvent> Runtime<T> for MockRuntime {
   ))]
   fn run_iteration<F: FnMut(RunEvent<T>)>(&mut self, callback: F) {}
 
-  #[cfg(desktop)]
   fn run_return<F: FnMut(RunEvent<T>) + 'static>(self, callback: F) -> i32 {
     self.run(callback);
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"tauri-runtime": minor:feat
 +---
++
 +`Runtime::run_return` now must also be implemented on mobile targets.
Original file line number	Diff line number	Diff line change
`@@ -2836,14 +2836,20 @@ impl<T: UserEvent> Runtime<T> for Wry<T> {`
`2836`	`2836`	`self.event_loop.run(event_handler)`
`2837`	`2837`	`}`
`2838`	`2838`
`2839`		`- #[cfg(desktop)]`
	`2839`	`+ #[cfg(not(target_os = "ios"))]`
`2840`	`2840`	`fn run_return<F: FnMut(RunEvent<T>) + 'static>(mut self, callback: F) -> i32 {`
`2841`	`2841`	`use tao::platform::run_return::EventLoopExtRunReturn;`
`2842`	`2842`
`2843`	`2843`	`let event_handler = make_event_handler(&self, callback);`
`2844`	`2844`
`2845`	`2845`	`self.event_loop.run_return(event_handler)`
`2846`	`2846`	`}`
	`2847`	`+`
	`2848`	`+ #[cfg(target_os = "ios")]`
	`2849`	`+ fn run_return<F: FnMut(RunEvent<T>) + 'static>(mut self, callback: F) -> i32 {`
	`2850`	`+ self.run(callback);`
	`2851`	`+ 0`
	`2852`	`+ }`
`2847`	`2853`	`}`
`2848`	`2854`
`2849`	`2855`	`fn make_event_handler<T, F>(`