fix(core): return an error when accessing unmanaged state in command (t…

…auri-apps#11958) closes tauri-apps#11949
ebfork · Dec 12, 2024 · ca7f025 · ca7f025
1 parent 17bcec8
commit ca7f025
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 23 deletions.
diff --git a/.changes/unmanaged-state-command.md b/.changes/unmanaged-state-command.md
@@ -0,0 +1,5 @@
+---
+"tauri": "patch:bug"
+---
+
+Fix panic when invoking a command with an unmanaged state, an error will be returned instead.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/tauri/src/state.rs b/crates/tauri/src/state.rs
@@ -60,12 +60,12 @@ impl<T: Send + Sync + std::fmt::Debug> std::fmt::Debug for State<'_, T> {
 impl<'r, 'de: 'r, T: Send + Sync + 'static, R: Runtime> CommandArg<'de, R> for State<'r, T> {
   /// Grabs the [`State`] from the [`CommandItem`]. This will never fail.
   fn from_command(command: CommandItem<'de, R>) -> Result<Self, InvokeError> {
-    Ok(command.message.state_ref().try_get().unwrap_or_else(|| {
-      panic!(
+    command.message.state_ref().try_get().ok_or_else(|| {
+      InvokeError::from_anyhow(anyhow::anyhow!(
         "state not managed for field `{}` on command `{}`. You must call `.manage()` before using this command",
         command.key, command.name
-      )
-    }))
+      ))
+    })
   }
 }