Refactor and fix lint

Author: Archmonger

src/js/packages/@reactpy/client/src/vdom.tsx

@@ -1,4 +1,5 @@
 import eventToObject from "event-to-object";
+import { Fragment } from "preact";
 import type {
   ReactPyVdom,
   ReactPyVdomImportSource,

tests/test_reactjs/test_modules.py

@@ -1,10 +1,14 @@
+from pathlib import Path
+
 import pytest
 
 import reactpy
 from reactpy import html
 from reactpy.reactjs import component_from_string, import_reactjs
 from reactpy.testing import BackendFixture, DisplayFixture
 
+JS_FIXTURES_DIR = Path(__file__).parent / "js_fixtures"
+
 
 @pytest.fixture(scope="module")
 async def display(browser):
@@ -89,3 +93,24 @@ def App():
     elements = await display.page.query_selector_all(".component-c")
     assert len(elements) == 2
     await display.page.wait_for_selector("#deep-server")
+
+
+async def test_nest_custom_component_under_web_component(display: DisplayFixture):
+    """
+    Fix https://github.com/reactive-python/reactpy/discussions/1323
+
+    Custom components (i.e those wrapped in the component decorator) were not able to
+    be nested under web components.
+    """
+    Container = reactpy.reactjs.component_from_file(
+        JS_FIXTURES_DIR / "nest-custom-under-web.js", "Container", name="nest-custom-under-web"
+    )
+
+    @reactpy.component
+    def CustomComponent():
+        return reactpy.html.div(reactpy.html.h1({"id": "my-header"}, "Header 1"))
+
+    await display.show(lambda: Container(CustomComponent()))
+
+    element = await display.page.wait_for_selector("#my-header", state="attached")
+    assert await element.inner_text() == "Header 1"

tests/test_web/__init__.py

@@ -0,0 +1,4 @@
+"""
+THESE ARE TESTS FOR THE LEGACY API. SEE tests/test_reactjs/* FOR THE NEW API TESTS.
+THE CONTENTS OF THIS MODULE WILL BE MIGRATED OR DELETED ONCE THE LEGACY API IS REMOVED.
+"""

tests/test_web/js_fixtures/nest-custom-under-web.js

@@ -1,5 +1,7 @@
-# THESE ARE TESTS FOR THE LEGACY API. SEE tests/test_reactjs/* FOR THE NEW API TESTS.
-# THIS MODULE WILL BE MIGRATED OR DELETED ONCE THE LEGACY API IS REMOVED.
+"""
+THESE ARE TESTS FOR THE LEGACY API. SEE tests/test_reactjs/* FOR THE NEW API TESTS.
+THE CONTENTS OF THIS MODULE WILL BE MIGRATED OR DELETED ONCE THE LEGACY API IS REMOVED.
+"""
 from pathlib import Path
 
 import pytest
@@ -563,32 +565,3 @@ async def test_module_without_bind(display: DisplayFixture):
         "#my-generic-component", state="attached"
     )
     assert await element.inner_text() == "Hello World"
-
-async def test_nest_custom_component_under_web_component(display: DisplayFixture):
-    """
-    Fix https://github.com/reactive-python/reactpy/discussions/1323
-
-    Custom components (i.e those wrapped in the component decorator) were not able to
-    be nested under web components.
-    
-    """
-    module = reactpy.reactjs.file_to_module(
-        "nest-custom-under-web", JS_FIXTURES_DIR / "nest-custom-under-web.js"
-    )
-    Container = reactpy.reactjs.module_to_vdom(module, "Container")
-    
-    @reactpy.component
-    def CustomComponent():
-        return reactpy.html.div(
-            reactpy.html.h1({"id": "my-header"}, "Header 1")
-        )
-    await display.show(
-        lambda: Container(
-            CustomComponent()
-        )
-    )
-
-    element = await display.page.wait_for_selector(
-        "#my-header", state="attached"
-    )
-    assert await element.inner_text() == "Header 1"