wip: events

Author: mrchantey

crates/sweet_core/src/html/html_node.rs

@@ -225,16 +225,16 @@ pub struct HtmlConstants {
 	/// the global event handler for all events
 	pub event_handler: &'static str,
 	/// the global vec that stores prehydrated events
-	pub prehydrate_events: &'static str,
+	pub event_store: &'static str,
 }
 
 impl Default for HtmlConstants {
 	fn default() -> Self {
 		Self {
 			id_key: "data-sweet-id",
 			cx_map_key: "data-sweet-cx-map",
-			event_handler: "_sweet_event",
-			prehydrate_events: "_sweet_prehydrate_events",
+			event_handler: "_sweet_event_handler",
+			event_store: "_sweet_event_store",
 		}
 	}
 }

crates/sweet_core/src/html/rsx_to_resumable_html.rs

@@ -80,7 +80,7 @@ impl RsxToResumableHtml {
 globalThis.{prehydrate_events} = []
 globalThis.{event_handler} = (id,event) => globalThis.{prehydrate_events}.push([id, event])
 "#,
-			prehydrate_events = self.html_constants.prehydrate_events,
+			prehydrate_events = self.html_constants.event_store,
 			event_handler = self.html_constants.event_handler,
 		);
 		let el = HtmlElementNode::inline_script(script, Default::default());
@@ -114,6 +114,8 @@ mod test {
 		expect(RsxToResumableHtml::render(
 			&rsx! { <main onclick=on_click></main> },
 		))
-		.to_start_with("<main onclick=\"_sweet_event(0, event)\"></main>");
+		.to_start_with(
+			"<main onclick=\"_sweet_event_handler(0, event)\"></main>",
+		);
 	}
 }

crates/sweet_core/src/hydration/dom_event_registry.rs

@@ -1,8 +1,10 @@
 use crate::prelude::*;
 use std::cell::RefCell;
 use std::collections::HashMap;
+use wasm_bindgen::prelude::Closure;
 use wasm_bindgen::JsCast;
 use wasm_bindgen::JsValue;
+use web_sys::window;
 use web_sys::Event;
 
 pub struct EventRegistry;
@@ -42,18 +44,24 @@ impl EventRegistry {
 	) {
 		Self::register(key, cx, value);
 	}
+
+	pub fn initialize() -> ParseResult<()> {
+		let constants = CurrentHydrator::with(|h| h.html_constants().clone());
+		playback_prehydrate_events(&constants)?;
+		hook_up_event_listeners(&constants)?;
+		Ok(())
+	}
 }
 
-pub fn playback_prehydrate_events() -> ParseResult<()> {
+fn playback_prehydrate_events(constants: &HtmlConstants) -> ParseResult<()> {
 	sweet_loader_extern::GLOBAL.with(|global| {
-		let constants = CurrentHydrator::with(|h| h.html_constants().clone());
 		// let event_handler =
 		// 	js_sys::Reflect::get(&global, &constants.event_handler.into())
 		// 		.map_err(|_| {
 		// 			ParseError::Hydration("could not find event handler".into())
 		// 		})?;
 		let prehydrate_events =
-			js_sys::Reflect::get(&global, &constants.prehydrate_events.into())
+			js_sys::Reflect::get(&global, &constants.event_store.into())
 				.map_err(|_| {
 					ParseError::Hydration("could not find event handler".into())
 				})?;
@@ -68,31 +76,47 @@ pub fn playback_prehydrate_events() -> ParseResult<()> {
 				EventRegistry::trigger(&event_type, id, event.unchecked_into());
 			}
 		}
-		// 	} else {
-		// 		return Err(ParseError::Hydration("bad event".into()));
-		// 	}
-		// }
+		js_sys::Reflect::delete_property(
+			&global.unchecked_ref(),
+			&constants.event_store.into(),
+		)
+		.unwrap();
+		js_sys::Reflect::delete_property(
+			&global.unchecked_ref(),
+			&constants.event_handler.into(),
+		)
+		.unwrap();
+
 		Ok(())
 	})
 }
 
-// let event = event_arr.get(1);
-// Self::trigger
-// 	js_sys::Reflect::delete_property(
-// 		&sweet.unchecked_ref(),
-// 		&"uncanny".into(),
-// 	)
-// 	.unwrap_or_default();
-// }
-// let closure =
-// 	Closure::wrap(Box::new(move |id: usize, evt: web_sys::Event| {
-// 		func(id, evt);
-// 	}) as Box<dyn FnMut(usize, web_sys::Event)>);
-
-// js_sys::Reflect::set(&sweet, &"event".into(), &closure.as_ref())
-// 	.unwrap_or_default();
+fn hook_up_event_listeners(constants: &HtmlConstants) -> ParseResult<()> {
+	REGISTERED_EVENTS.with(|current| -> ParseResult<()> {
+		let mut current = current.borrow_mut();
+		let document = window().unwrap().document().unwrap();
+		for ((el_id, key), func) in current.drain() {
+			let el = document
+				.query_selector(&format!("[{}='{}']", constants.id_key, el_id))
+				.ok()
+				.flatten()
+				.ok_or_else(|| {
+					ParseError::Hydration("could not find element".into())
+				})?;
+			el.remove_attribute(&key).unwrap();
 
-// closure.forget();
+			let closure = Closure::wrap(Box::new(move |e: JsValue| {
+				func(e);
+			}) as Box<dyn Fn(JsValue)>);
+			el.add_event_listener_with_callback(
+				&key,
+				closure.as_ref().unchecked_ref(),
+			)
+			.unwrap();
+		}
+		Ok(())
+	})
+}
 
 pub mod sweet_loader_extern {
 	use wasm_bindgen::prelude::*;

crates/sweet_core/src/hydration/dom_hydrator.rs

@@ -1,4 +1,3 @@
-use super::dom_event_registry::playback_prehydrate_events;
 use super::rsx_context_map::RsxContextMap;
 use crate::prelude::*;
 use wasm_bindgen::JsCast;
@@ -113,7 +112,7 @@ impl DomHydrator {
 
 
 impl Hydrator for DomHydrator {
-	fn initialize(&mut self) { playback_prehydrate_events().unwrap(); }
+	fn initialize(&mut self) { EventRegistry::initialize().unwrap(); }
 	fn html_constants(&self) -> &HtmlConstants { &self.constants }
 
 	/// returns body inner html