fix: only store the Event closures

ivanceras · Mar 31, 2024 · 06b335a · 06b335a
1 parent 2b2d365
commit 06b335a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/crates/core/src/dom/task.rs b/crates/core/src/dom/task.rs
@@ -5,7 +5,6 @@ use futures::channel::mpsc::UnboundedReceiver;
 use futures::StreamExt;
 use std::future::Future;
 use std::pin::Pin;
-use wasm_bindgen::closure::Closure;
 
 /// encapsulate anything a component can do
 pub enum Task<MSG> {
@@ -113,7 +112,6 @@ pub struct RecurringTask<MSG> {
     pub(crate) receiver: UnboundedReceiver<MSG>,
     /// store the associated closures so it is not dropped before being event executed
     pub(crate) event_closures: Vec<EventClosure>,
-    pub(crate) closures: Vec<Closure<dyn FnMut()>>,
 }
 
 impl<MSG> RecurringTask<MSG>
@@ -134,7 +132,6 @@ where
         let RecurringTask {
             mut receiver,
             event_closures,
-            closures,
         } = self;
         spawn_local(async move {
             while let Some(msg) = receiver.next().await {
@@ -144,7 +141,6 @@ where
         RecurringTask {
             receiver: rx,
             event_closures,
-            closures,
         }
     }
 }
diff --git a/crates/core/src/dom/window.rs b/crates/core/src/dom/window.rs
@@ -34,7 +34,6 @@ impl Window {
         Task::Recurring(RecurringTask {
             receiver: rx,
             event_closures: vec![resize_callback],
-            closures: vec![],
         })
     }
 
@@ -60,7 +59,6 @@ impl Window {
         Task::Recurring(RecurringTask {
             receiver: rx,
             event_closures: vec![mousemove_cb],
-            closures: vec![],
         })
     }
 
@@ -86,7 +84,6 @@ impl Window {
         Task::Recurring(RecurringTask {
             receiver: rx,
             event_closures: vec![mousemove_cb],
-            closures: vec![],
         })
     }
 
@@ -97,7 +94,10 @@ impl Window {
         MSG: 'static,
     {
         let (mut tx, rx) = mpsc::unbounded();
-        let closure_cb: Closure<dyn FnMut()> = Closure::new(move || {
+        //The web_sys::Event here is undefined, it is just used here to make storing the closure
+        //uniform
+        let closure_cb: Closure<dyn FnMut(web_sys::Event)> = Closure::new(move |_event| {
+            log::info!("event: {:?}", _event);
             let msg = cb();
             tx.start_send(msg).unwrap();
         });
@@ -109,8 +109,7 @@ impl Window {
             .expect("Unable to start interval");
         Task::Recurring(RecurringTask {
             receiver: rx,
-            event_closures: vec![],
-            closures: vec![closure_cb],
+            event_closures: vec![closure_cb],
         })
     }
 
@@ -149,7 +148,6 @@ impl Window {
         Task::Recurring(RecurringTask {
             receiver: rx,
             event_closures: vec![closure_cb],
-            closures: vec![],
         })
     }
 }
diff --git a/examples/interactive-macro-syntax/src/app.rs b/examples/interactive-macro-syntax/src/app.rs
@@ -37,7 +37,7 @@ impl Application for App {
     type MSG = Msg;
 
     fn init(&mut self) -> Cmd<Self> {
-        Cmd::from(Window::every_interval(10_000, || Msg::Clock))
+        Cmd::from(Window::every_interval(1_000, || Msg::Clock))
     }
 
     fn update(&mut self, msg: Msg) -> Cmd<Self> {