InputNumber's formatter and parser using its generic type

Author: mmannes

demo_markdown/docs/input_number/mod.md

@@ -48,7 +48,8 @@ view! {
 let value = create_rw_signal(0.0);
 let value_2 = create_rw_signal(0.0);
 
-let formatter = Callback::<String, String>::new(move |v: String| {
+let formatter = Callback::<f64, String>::new(move |v: f64| {
+    let v = v.to_string();
     let dot_pos = v.chars().position(|c| c == '.').unwrap_or_else(|| v.chars().count());
     let mut int: String = v.chars().take(dot_pos).collect();
 
@@ -72,11 +73,11 @@ let formatter = Callback::<String, String>::new(move |v: String| {
     format!("{}{},{:0<2}", sign, int, dec)
 });
 
-let parser = Callback::<String, String>::new(move |v: String| {
+let parser = Callback::<String, f64>::new(move |v: String| {
     let comma_pos = v.chars().position(|c| c == ',').unwrap_or_else(|| v.chars().count());
     let int_part = v.chars().take(comma_pos).filter(|a| a.is_digit(10)).collect::<String>();
     let dec_part = v.chars().skip(comma_pos + 1).take(2).filter(|a| a.is_digit(10)).collect::<String>();
-    format!("{:0<1}.{:0<2}", int_part, dec_part)
+    format!("{:0<1}.{:0<2}", int_part, dec_part).parse::<f64>().unwrap_or_default()
 });
 
 view! {

thaw/src/input_number/mod.rs

@@ -14,8 +14,8 @@ pub fn InputNumber<T>(
     #[prop(optional, into)] invalid: MaybeSignal<bool>,
     #[prop(optional, into)] class: OptionalProp<MaybeSignal<String>>,
     #[prop(optional)] comp_ref: ComponentRef<InputNumberRef>,
-    #[prop(optional, into)] parser: OptionalProp<Callback<String, String>>,
-    #[prop(optional, into)] formatter: OptionalProp<Callback<String, String>>,
+    #[prop(optional, into)] parser: OptionalProp<Callback<String, T>>,
+    #[prop(optional, into)] formatter: OptionalProp<Callback<T, String>>,
     #[prop(attrs)] attrs: Vec<(&'static str, Attribute)>,
     #[prop(default = MaybeSignal::Static(T::min_value()), into)] min: MaybeSignal<T>,
     #[prop(default = MaybeSignal::Static(T::max_value()), into)] max: MaybeSignal<T>,
@@ -79,6 +79,13 @@ where
         invalid.get() || value < min.get() || value > max.get()
     });
 
+    let parser = parser.map(|parser| {
+        Callback::new(move |v| parser.call(v).to_string())
+    });
+    let formatter = formatter.map(|formatter| {
+        Callback::new(move |v: String| formatter.call(v.parse::<T>().unwrap_or_default()))
+    });
+
     view! {
         <Input
             attrs