EventHandlerType -> BaseEventHandler

Author: Archmonger

src/reactpy/core/events.py

@@ -7,7 +7,7 @@
 
 from anyio import create_task_group
 
-from reactpy.types import EventHandlerFunc, EventHandlerType
+from reactpy.types import BaseEventHandler, EventHandlerFunc
 
 
 @overload
@@ -73,7 +73,7 @@ def setup(function: Callable[..., Any]) -> EventHandler:
     return setup(function) if function is not None else setup
 
 
-class EventHandler:
+class EventHandler(BaseEventHandler):
     """Turn a function or coroutine into an event handler
 
     Parameters:
@@ -87,14 +87,6 @@ class EventHandler:
             A unique identifier for this event handler (auto-generated by default)
     """
 
-    __slots__ = (
-        "__weakref__",
-        "function",
-        "prevent_default",
-        "stop_propagation",
-        "target",
-    )
-
     def __init__(
         self,
         function: EventHandlerFunc,
@@ -194,8 +186,8 @@ async def wrapper(data: Sequence[Any]) -> None:
 
 
 def merge_event_handlers(
-    event_handlers: Sequence[EventHandlerType],
-) -> EventHandlerType:
+    event_handlers: Sequence[BaseEventHandler],
+) -> BaseEventHandler:
     """Merge multiple event handlers into one
 
     Raises a ValueError if any handlers have conflicting

src/reactpy/core/vdom.py

@@ -17,11 +17,11 @@
 from reactpy.core._f_back import f_module_name
 from reactpy.core.events import EventHandler, to_event_handler_function
 from reactpy.types import (
+    BaseEventHandler,
     Component,
     CustomVdomConstructor,
     EllipsisRepr,
     EventHandlerDict,
-    EventHandlerType,
     ImportSourceDict,
     InlineJavaScript,
     InlineJavaScriptDict,
@@ -231,13 +231,13 @@ def separate_attributes_handlers_and_inline_javascript(
     attributes: Mapping[str, Any],
 ) -> tuple[VdomAttributes, EventHandlerDict, InlineJavaScriptDict]:
     _attributes: VdomAttributes = {}
-    _event_handlers: dict[str, EventHandlerType] = {}
+    _event_handlers: dict[str, BaseEventHandler] = {}
     _inline_javascript: dict[str, InlineJavaScript] = {}
 
     for k, v in attributes.items():
         if callable(v):
             _event_handlers[k] = EventHandler(to_event_handler_function(v))
-        elif isinstance(v, EventHandler):
+        elif isinstance(v, BaseEventHandler):
             _event_handlers[k] = v
         elif EVENT_ATTRIBUTE_PATTERN.match(k) and isinstance(v, str):
             _inline_javascript[k] = InlineJavaScript(v)

src/reactpy/types.py

@@ -926,19 +926,26 @@ class EventHandlerFunc(Protocol):
     async def __call__(self, data: Sequence[Any]) -> None: ...
 
 
-@runtime_checkable
-class EventHandlerType(Protocol):
+class BaseEventHandler:
     """Defines a handler for some event"""
 
+    __slots__ = (
+        "__weakref__",
+        "function",
+        "prevent_default",
+        "stop_propagation",
+        "target",
+    )
+
+    function: EventHandlerFunc
+    """A coroutine which can respond to an event and its data"""
+
     prevent_default: bool
     """Whether to block the event from propagating further up the DOM"""
 
     stop_propagation: bool
     """Stops the default action associate with the event from taking place."""
 
-    function: EventHandlerFunc
-    """A coroutine which can respond to an event and its data"""
-
     target: str | None
     """Typically left as ``None`` except when a static target is useful.
 
@@ -951,10 +958,10 @@ class EventHandlerType(Protocol):
     """
 
 
-EventHandlerMapping = Mapping[str, EventHandlerType]
+EventHandlerMapping = Mapping[str, BaseEventHandler]
 """A generic mapping between event names to their handlers"""
 
-EventHandlerDict: TypeAlias = dict[str, EventHandlerType]
+EventHandlerDict: TypeAlias = dict[str, BaseEventHandler]
 """A dict mapping between event names to their handlers"""
 
 InlineJavaScriptMapping = Mapping[str, InlineJavaScript]