skip rendering none

Author: rmorshea

Diff for: src/py/reactpy/reactpy/core/layout.py

@@ -39,6 +39,7 @@
     EventHandlerDict,
     LayoutEventMessage,
     LayoutUpdateMessage,
+    VdomChild,
     VdomDict,
     VdomJson,
 )
@@ -189,9 +190,7 @@ async def _render_component(
             # wrap the model in a fragment (i.e. tagName="") to ensure components have
             # a separate node in the model state tree. This could be removed if this
             # components are given a node in the tree some other way
-            wrapper_model: VdomDict = {"tagName": ""}
-            if raw_model is not None:
-                wrapper_model["children"] = [raw_model]
+            wrapper_model: VdomDict = {"tagName": "", "children": [raw_model]}
             await self._render_model(exit_stack, old_state, new_state, wrapper_model)
         except Exception as error:
             logger.exception(f"Failed to render {component}")
@@ -332,7 +331,7 @@ async def _render_model_children(
         child_type_key_tuples = list(_process_child_type_and_key(raw_children))
 
         new_keys = {item[2] for item in child_type_key_tuples}
-        if len(new_keys) != len(raw_children):
+        if len(new_keys) != len(child_type_key_tuples):
             key_counter = Counter(item[2] for item in child_type_key_tuples)
             duplicate_keys = [key for key, count in key_counter.items() if count > 1]
             msg = f"Duplicate keys {duplicate_keys} at {new_state.patch_path or '/'!r}"
@@ -423,7 +422,7 @@ async def _render_model_children_without_old_state(
         child_type_key_tuples = list(_process_child_type_and_key(raw_children))
 
         new_keys = {item[2] for item in child_type_key_tuples}
-        if len(new_keys) != len(raw_children):
+        if len(new_keys) != len(child_type_key_tuples):
             key_counter = Counter(item[2] for item in child_type_key_tuples)
             duplicate_keys = [key for key, count in key_counter.items() if count > 1]
             msg = f"Duplicate keys {duplicate_keys} at {new_state.patch_path or '/'!r}"
@@ -721,10 +720,12 @@ async def get(self) -> _Type:
 
 
 def _process_child_type_and_key(
-    children: list[Any],
+    children: list[VdomChild],
 ) -> Iterator[tuple[Any, _ElementType, Any]]:
     for index, child in enumerate(children):
-        if isinstance(child, dict):
+        if child is None:
+            continue
+        elif isinstance(child, dict):
             child_type = _DICT_TYPE
             key = child.get("key")
         elif isinstance(child, ComponentType):

Diff for: src/py/reactpy/reactpy/core/types.py

@@ -91,7 +91,7 @@ async def __aexit__(
 VdomAttributes = Mapping[str, Any]
 """Describes the attributes of a :class:`VdomDict`"""
 
-VdomChild: TypeAlias = "ComponentType | VdomDict | str"
+VdomChild: TypeAlias = "ComponentType | VdomDict | str | None | Any"
 """A single child element of a :class:`VdomDict`"""
 
 VdomChildren: TypeAlias = "Sequence[VdomChild] | VdomChild"
@@ -100,14 +100,7 @@ async def __aexit__(
 
 class _VdomDictOptional(TypedDict, total=False):
     key: Key | None
-    children: Sequence[
-        # recursive types are not allowed yet:
-        # https://github.com/python/mypy/issues/731
-        ComponentType
-        | dict[str, Any]
-        | str
-        | Any
-    ]
+    children: Sequence[ComponentType | VdomChild]
     attributes: VdomAttributes
     eventHandlers: EventHandlerDict
     importSource: ImportSourceDict

Diff for: src/py/reactpy/tests/test_core/test_layout.py

@@ -102,15 +102,6 @@ def SimpleComponent():
         )
 
 
-async def test_component_can_return_none():
-    @reactpy.component
-    def SomeComponent():
-        return None
-
-    async with reactpy.Layout(SomeComponent()) as layout:
-        assert (await layout.render())["model"] == {"tagName": ""}
-
-
 async def test_nested_component_layout():
     parent_set_state = reactpy.Ref(None)
     child_set_state = reactpy.Ref(None)
@@ -1310,3 +1301,22 @@ def child_2():
 
         assert child_1_render_count.current == 1
         assert child_2_render_count.current == 1
+
+
+async def test_none_does_not_render():
+    @component
+    def Root():
+        return html.div(None, Child())
+
+    @component
+    def Child():
+        return None
+
+    async with layout_runner(Layout(Root())) as runner:
+        tree = await runner.render()
+        assert tree == {
+            "tagName": "",
+            "children": [
+                {"tagName": "div", "children": [{"tagName": "", "children": []}]}
+            ],
+        }