From 4846d36777f6bf69dff329413a9dc01e620aef52 Mon Sep 17 00:00:00 2001
From: Jens Reimann <jreimann@redhat.com>
Date: Fri, 9 Sep 2022 09:56:32 +0200
Subject: [PATCH] Implement filter_reform for all Callback output types

As suggested in the PR, this implements filter_reform for all output
types of callbacks by mapping to `Option<OUT>`.
---
 packages/yew/src/callback.rs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/packages/yew/src/callback.rs b/packages/yew/src/callback.rs
index 971acb3d960..74982930717 100644
--- a/packages/yew/src/callback.rs
+++ b/packages/yew/src/callback.rs
@@ -80,21 +80,18 @@ impl<IN: 'static, OUT: 'static> Callback<IN, OUT> {
         };
         Callback::from(func)
     }
-}
 
-impl<IN: 'static> Callback<IN> {
     /// Creates a new callback from another callback and a function.
     /// When emitted will call the function and, only if it returns `Some(value)`, will emit
     /// `value` to the original callback.
-    pub fn filter_reform<F, T>(&self, func: F) -> Callback<T>
+    pub fn filter_reform<F, T>(&self, func: F) -> Callback<T, Option<OUT>>
     where
         F: Fn(T) -> Option<IN> + 'static,
     {
         let this = self.clone();
-        let func = move |input| {
-            if let Some(output) = func(input) {
-                this.emit(output);
-            }
+        let func = move |input| match func(input) {
+            Some(output) => Some(this.emit(output)),
+            None => None,
         };
         Callback::from(func)
     }
@@ -109,14 +106,16 @@ mod test {
     use super::*;
 
     /// emit the callback with the provided value
-    fn emit<T, I, R: 'static + Clone, F>(values: I, f: F) -> Vec<R>
+    fn emit<T, I, R: 'static + Clone, F, OUT>(values: I, f: F) -> Vec<R>
     where
         I: IntoIterator<Item = T>,
-        F: FnOnce(Callback<R>) -> Callback<T>,
+        F: FnOnce(Callback<R, ()>) -> Callback<T, OUT>,
     {
         let result = Rc::new(Mutex::new(Vec::new()));
         let cb_result = result.clone();
-        let cb = f(Callback::from(move |v| cb_result.lock().unwrap().push(v)));
+        let cb = f(Callback::<R, ()>::from(move |v| {
+            cb_result.lock().unwrap().push(v);
+        }));
         for value in values {
             cb.emit(value);
         }