refactor: EmitArgs should keep EventName invariants

tauri-apps · Jan 23, 2025 · bdb733a · bdb733a
1 parent 389c129
commit bdb733a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/crates/tauri/src/event/listener.rs b/crates/tauri/src/event/listener.rs
@@ -287,7 +287,7 @@ impl Listeners {
   {
     let js_listeners = self.inner.js_event_listeners.lock().unwrap();
     webviews.try_for_each(|webview| {
-      let event = &emit_args.event;
+      let event = emit_args.event.as_str();
       if let Some(handlers) = js_listeners.get(webview.label()).and_then(|s| s.get(event)) {
         let ids = handlers
           .iter()

diff --git a/crates/tauri/src/event/mod.rs b/crates/tauri/src/event/mod.rs
@@ -179,7 +179,7 @@ impl FromStr for EventTarget {
 #[derive(Clone)]
 pub struct EmitArgs {
   /// Serialized event name.
-  event: String,
+  event: EventName,
   /// Serialized payload.
   payload: String,
 }
@@ -189,7 +189,7 @@ impl EmitArgs {
     #[cfg(feature = "tracing")]
     let _span = tracing::debug_span!("window::emit::serialize").entered();
     Ok(EmitArgs {
-      event: event.to_string(),
+      event: event.into_owned(),
       payload: serde_json::to_string(payload)?,
     })
   }