LayoutType -> BaseLayout

Author: Archmonger

src/reactpy/core/layout.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import abc
 from asyncio import (
     FIRST_COMPLETED,
     CancelledError,
@@ -37,6 +36,7 @@
 from reactpy.core._life_cycle_hook import LifeCycleHook
 from reactpy.core.vdom import validate_vdom_json
 from reactpy.types import (
+    BaseLayout,
     Component,
     Context,
     ContextProvider,
@@ -54,22 +54,7 @@
 logger = getLogger(__name__)
 
 
-class Layout:
-    """Responsible for "rendering" components. That is, turning them into VDOM."""
-
-    __slots__: tuple[str, ...] = (
-        "_event_handlers",
-        "_model_states_by_life_cycle_state_id",
-        "_render_tasks",
-        "_render_tasks_ready",
-        "_rendering_queue",
-        "_root_life_cycle_state_id",
-        "root",
-    )
-
-    if not hasattr(abc.ABC, "__weakref__"):  # nocov
-        __slots__ += ("__weakref__",)
-
+class Layout(BaseLayout):
     def __init__(self, root: Component | Context[Any] | ContextProvider[Any]) -> None:
         super().__init__()
         if not isinstance(root, Component):

src/reactpy/core/serve.py

@@ -9,7 +9,7 @@
 
 from reactpy.config import REACTPY_DEBUG
 from reactpy.core._life_cycle_hook import HOOK_STACK
-from reactpy.types import LayoutEventMessage, LayoutType, LayoutUpdateMessage
+from reactpy.types import BaseLayout, LayoutEventMessage, LayoutUpdateMessage
 
 logger = getLogger(__name__)
 
@@ -25,7 +25,7 @@
 
 
 async def serve_layout(
-    layout: LayoutType[
+    layout: BaseLayout[
         LayoutUpdateMessage | dict[str, Any], LayoutEventMessage | dict[str, Any]
     ],
     send: SendCoroutine,
@@ -39,7 +39,7 @@ async def serve_layout(
 
 
 async def _single_outgoing_loop(
-    layout: LayoutType[
+    layout: BaseLayout[
         LayoutUpdateMessage | dict[str, Any], LayoutEventMessage | dict[str, Any]
     ],
     send: SendCoroutine,
@@ -65,7 +65,7 @@ async def _single_outgoing_loop(
 
 async def _single_incoming_loop(
     task_group: TaskGroup,
-    layout: LayoutType[
+    layout: BaseLayout[
         LayoutUpdateMessage | dict[str, Any], LayoutEventMessage | dict[str, Any]
     ],
     recv: RecvCoroutine,

src/reactpy/types.py

@@ -13,7 +13,6 @@
     TypeAlias,
     TypeVar,
     overload,
-    runtime_checkable,
 )
 
 from typing_extensions import NamedTuple, NotRequired, TypedDict, Unpack
@@ -76,23 +75,35 @@ def __repr__(self) -> str:
 _Event_contra = TypeVar("_Event_contra", contravariant=True)
 
 
-@runtime_checkable
-class LayoutType(Protocol[_Render_co, _Event_contra]):
-    """Renders and delivers, updates to views and events to handlers, respectively"""
+class BaseLayout(Protocol[_Render_co, _Event_contra]):
+    """Renders and delivers views, and submits events to handlers."""
+
+    __slots__: tuple[str, ...] = (
+        "__weakref__",
+        "_event_handlers",
+        "_model_states_by_life_cycle_state_id",
+        "_render_tasks",
+        "_render_tasks_ready",
+        "_rendering_queue",
+        "_root_life_cycle_state_id",
+        "root",
+    )
 
     async def render(
         self,
-    ) -> _Render_co: ...  # Render an update to a view
+    ) -> _Render_co:
+        """Render an update to a view"""
+        ...
 
-    async def deliver(
-        self, event: _Event_contra
-    ) -> None: ...  # Relay an event to its respective handler
+    async def deliver(self, event: _Event_contra) -> None:
+        """Relay an event to its respective handler"""
+        ...
 
     async def __aenter__(
         self,
-    ) -> LayoutType[
-        _Render_co, _Event_contra
-    ]: ...  # Prepare the layout for its first render
+    ) -> BaseLayout[_Render_co, _Event_contra]:
+        """Prepare the layout for its first render"""
+        ...
 
     async def __aexit__(
         self,
@@ -101,6 +112,7 @@ async def __aexit__(
         traceback: TracebackType,
     ) -> bool | None:
         """Clean up the view after its final render"""
+        ...
 
 
 class CssStyleTypeDict(TypedDict, total=False):