EvenHandler should not serialize itself

Author: rmorshea

src/idom/core/events.py

@@ -159,9 +159,9 @@ class EventHandler:
         "__weakref__",
         "_coro_handlers",
         "_func_handlers",
-        "_target_id",
-        "_prevent_default",
-        "_stop_propogation",
+        "target_id",
+        "prevent_default",
+        "stop_propogation",
     )
 
     def __init__(
@@ -170,16 +170,11 @@ def __init__(
         prevent_default: bool = False,
         target_id: Optional[str] = None,
     ) -> None:
+        self.target_id = target_id or str(id(self))
+        self.stop_propogation = stop_propagation
+        self.prevent_default = prevent_default
         self._coro_handlers: List[Callable[..., Coroutine[Any, Any, Any]]] = []
         self._func_handlers: List[Callable[..., Any]] = []
-        self._target_id = target_id or str(id(self))
-        self._stop_propogation = stop_propagation
-        self._prevent_default = prevent_default
-
-    @property
-    def id(self) -> str:
-        """ID of the event handler."""
-        return self._target_id
 
     def add(self, function: Callable[..., Any]) -> "EventHandler":
         """Add a callback to the event handler.
@@ -207,14 +202,6 @@ def remove(self, function: Callable[..., Any]) -> None:
         else:
             self._func_handlers.remove(function)
 
-    def serialize(self) -> EventTarget:
-        """Serialize the event handler."""
-        return {
-            "target": self._target_id,
-            "preventDefault": self._prevent_default,
-            "stopPropagation": self._stop_propogation,
-        }
-
     async def __call__(self, data: List[Any]) -> Any:
         """Trigger all callbacks in the event handler."""
         if self._coro_handlers:

src/idom/core/layout.py

@@ -235,12 +235,19 @@ def _render_model_event_targets(
                         h = attrs.pop(k)
                         handlers[k] = h
 
-        event_handlers_by_id = {h.id: h for h in handlers.values()}
+        event_handlers_by_id = {h.target_id: h for h in handlers.values()}
         component_state.event_handler_ids.clear()
         component_state.event_handler_ids.update(event_handlers_by_id)
         self._event_handlers.update(event_handlers_by_id)
 
-        return {e: h.serialize() for e, h in handlers.items()}
+        return {
+            e: {
+                "target": h.target_id,
+                "preventDefault": h.prevent_default,
+                "stopPropagation": h.stop_propogation,
+            }
+            for e, h in handlers.items()
+        }
 
     def _get_component_state(self, component: AbstractComponent) -> ComponentState:
         return self._component_states[id(component)]

tests/test_core/test_events.py

@@ -39,22 +39,21 @@ async def handler_2():
     assert calls == [1, 2]
 
 
-def test_event_handler_serialization():
-    assert EventHandler(target_id="uuid").serialize() == {
-        "target": "uuid",
-        "stopPropagation": False,
-        "preventDefault": False,
-    }
-    assert EventHandler(target_id="uuid", prevent_default=True).serialize() == {
-        "target": "uuid",
-        "stopPropagation": False,
-        "preventDefault": True,
-    }
-    assert EventHandler(target_id="uuid", stop_propagation=True).serialize() == {
-        "target": "uuid",
-        "stopPropagation": True,
-        "preventDefault": False,
-    }
+def test_event_handler_props():
+    handler_0 = EventHandler(target_id="uuid")
+    assert handler_0.target_id == "uuid"
+    assert handler_0.stop_propagation is False
+    assert handler_0.prevent_default is False
+
+    handler_1 = EventHandler(target_id="uuid", prevent_default=True)
+    assert handler_1.target_id == "uuid"
+    assert handler_1.stop_propagation is False
+    assert handler_1.prevent_default is True
+
+    handler_2 = EventHandler(target_id="uuid", stop_propagation=True)
+    assert handler_2.target_id == "uuid"
+    assert handler_2.stop_propagation is True
+    assert handler_2.prevent_default is False
 
 
 async def test_multiple_callbacks_per_event_handler():