Remove ContextProviderType, replace with ContextProvider

Author: Archmonger

src/reactpy/core/_life_cycle_hook.py

@@ -10,7 +10,7 @@
 from anyio import Semaphore
 
 from reactpy.core._thread_local import ThreadLocal
-from reactpy.types import Component, Context, ContextProviderType
+from reactpy.types import Component, Context, ContextProvider
 from reactpy.utils import Singleton
 
 T = TypeVar("T")
@@ -152,7 +152,7 @@ def __init__(
         self,
         schedule_render: Callable[[], None],
     ) -> None:
-        self._context_providers: dict[Context[Any], ContextProviderType[Any]] = {}
+        self._context_providers: dict[Context[Any], ContextProvider[Any]] = {}
         self._schedule_render_callback = schedule_render
         self._scheduled_render = False
         self._rendered_atleast_once = False
@@ -201,17 +201,15 @@ def add_effect(self, effect_func: EffectFunc) -> None:
         """
         self._effect_funcs.append(effect_func)
 
-    def set_context_provider(self, provider: ContextProviderType[Any]) -> None:
+    def set_context_provider(self, provider: ContextProvider[Any]) -> None:
         """Set a context provider for this hook
 
         The context provider will be used to provide state to any child components
         of this hook's component which request a context provider of the same type.
         """
         self._context_providers[provider.type] = provider
 
-    def get_context_provider(
-        self, context: Context[T]
-    ) -> ContextProviderType[T] | None:
+    def get_context_provider(self, context: Context[T]) -> ContextProvider[T] | None:
         """Get a context provider for this hook of the given type
 
         The context provider will have been set by a parent component. If no provider

src/reactpy/core/hooks.py

@@ -21,10 +21,10 @@
 from reactpy.types import (
     Connection,
     Context,
+    ContextProvider,
     Key,
     Location,
     State,
-    VdomDict,
 )
 from reactpy.utils import Ref
 
@@ -301,8 +301,8 @@ def context(
         *children: Any,
         value: _Type = default_value,
         key: Key | None = None,
-    ) -> _ContextProvider[_Type]:
-        return _ContextProvider(
+    ) -> ContextProvider[_Type]:
+        return ContextProvider(
             *children,
             value=value,
             key=key,
@@ -358,27 +358,6 @@ def use_location() -> Location:
     return use_connection().location
 
 
-class _ContextProvider(Generic[_Type]):
-    def __init__(
-        self,
-        *children: Any,
-        value: _Type,
-        key: Key | None,
-        type: Context[_Type],
-    ) -> None:
-        self.children = children
-        self.key = key
-        self.type = type
-        self.value = value
-
-    def render(self) -> VdomDict:
-        HOOK_STACK.current_hook().set_context_provider(self)
-        return VdomDict(tagName="", children=self.children)
-
-    def __repr__(self) -> str:
-        return f"ContextProvider({self.type})"
-
-
 _ActionType = TypeVar("_ActionType")
 
 

src/reactpy/core/layout.py

@@ -39,6 +39,7 @@
 from reactpy.types import (
     Component,
     Context,
+    ContextProvider,
     Event,
     EventHandlerDict,
     Key,
@@ -69,7 +70,7 @@ class Layout:
     if not hasattr(abc.ABC, "__weakref__"):  # nocov
         __slots__ += ("__weakref__",)
 
-    def __init__(self, root: Component | Context[Any]) -> None:
+    def __init__(self, root: Component | Context[Any] | ContextProvider[Any]) -> None:
         super().__init__()
         if not isinstance(root, Component):
             msg = f"Expected a ComponentType, not {type(root)!r}."

src/reactpy/types.py

@@ -1010,17 +1010,30 @@ def __call__(
         *children: Any,
         value: _Type = ...,
         key: Key | None = ...,
-    ) -> ContextProviderType[_Type]: ...
+    ) -> ContextProvider[_Type]: ...
 
 
-class ContextProviderType(Component, Protocol[_Type]):
-    """A component which provides a context value to its children"""
+class ContextProvider(Generic[_Type]):
+    def __init__(
+        self,
+        *children: Any,
+        value: _Type,
+        key: Key | None,
+        type: Context[_Type],
+    ) -> None:
+        self.children = children
+        self.key = key
+        self.type = type
+        self.value = value
 
-    type: Context[_Type]
-    """The context type"""
+    def render(self) -> VdomDict:
+        from reactpy.core.hooks import HOOK_STACK
 
-    @property
-    def value(self) -> _Type: ...  # Current context value
+        HOOK_STACK.current_hook().set_context_provider(self)
+        return VdomDict(tagName="", children=self.children)
+
+    def __repr__(self) -> str:
+        return f"ContextProvider({self.type})"
 
 
 @dataclass