ui: Make `Callout` constructors more flexible (#29895)

Marshall Bowers created 7 months ago

This PR updates the `Callout` constructors to be more flexible by
accepting `impl Into<SharedString>`s.

Release Notes:

- N/A

Change summary

crates/agent/src/message_editor.rs            |  6 +-
crates/agent/src/ui/preview/usage_callouts.rs |  6 +-
crates/ui/src/components/callout.rs           | 33 ++++++++++----------
3 files changed, 23 insertions(+), 22 deletions(-)

Detailed changes

crates/agent/src/message_editor.rs

@@ -1093,10 +1093,10 @@ impl MessageEditor {
         Some(
             div()
                 .child(ui::Callout::multi_line(
-                    title.into(),
-                    message.into(),
+                    title,
+                    message,
                     icon,
-                    "Start New Thread".into(),
+                    "Start New Thread",
                     Box::new(cx.listener(|this, _, window, cx| {
                         let from_thread_id = Some(this.thread.read(cx).id().clone());
                         window.dispatch_action(Box::new(NewThread { from_thread_id }), cx);

crates/agent/src/ui/preview/usage_callouts.rs

@@ -93,10 +93,10 @@ impl RenderOnce for UsageCallout {
         };
 
         Callout::multi_line(
-            title.into(),
-            message.into(),
+            title,
+            message,
             icon,
-            button_text.into(),
+            button_text,
             Box::new(move |_, _, cx| {
                 cx.open_url(url);
             }),

crates/ui/src/components/callout.rs

@@ -1,6 +1,7 @@
-use crate::prelude::*;
 use gpui::ClickEvent;
 
+use crate::prelude::*;
+
 #[derive(IntoElement, RegisterComponent)]
 pub struct Callout {
     title: SharedString,
@@ -13,33 +14,33 @@ pub struct Callout {
 
 impl Callout {
     pub fn single_line(
-        title: SharedString,
+        title: impl Into<SharedString>,
         icon: Icon,
-        cta_label: SharedString,
+        cta_label: impl Into<SharedString>,
         cta_action: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>,
     ) -> Self {
         Self {
-            title,
+            title: title.into(),
             message: None,
             icon,
-            cta_label,
+            cta_label: cta_label.into(),
             cta_action,
             line_height: None,
         }
     }
 
     pub fn multi_line(
-        title: SharedString,
-        message: SharedString,
+        title: impl Into<SharedString>,
+        message: impl Into<SharedString>,
         icon: Icon,
-        cta_label: SharedString,
+        cta_label: impl Into<SharedString>,
         cta_action: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>,
     ) -> Self {
         Self {
-            title,
-            message: Some(message),
+            title: title.into(),
+            message: Some(message.into()),
             icon,
-            cta_label,
+            cta_label: cta_label.into(),
             cta_action,
             line_height: None,
         }
@@ -127,11 +128,11 @@ impl Component for Callout {
             single_example(
                 "Single Line",
                 Callout::single_line(
-                    "Your settings contain deprecated values, please update them.".into(),
+                    "Your settings contain deprecated values, please update them.",
                     Icon::new(IconName::Warning)
                         .color(Color::Warning)
                         .size(IconSize::Small),
-                    "Backup & Update".into(),
+                    "Backup & Update",
                     Box::new(|_, _, _| {}),
                 )
                 .into_any_element(),
@@ -140,12 +141,12 @@ impl Component for Callout {
             single_example(
                 "Multi Line",
                 Callout::multi_line(
-                    "Thread reached the token limit".into(),
-                    "Start a new thread from a summary to continue the conversation.".into(),
+                    "Thread reached the token limit",
+                    "Start a new thread from a summary to continue the conversation.",
                     Icon::new(IconName::X)
                         .color(Color::Error)
                         .size(IconSize::Small),
-                    "Start New Thread".into(),
+                    "Start New Thread",
                     Box::new(|_, _, _| {}),
                 )
                 .into_any_element(),