Merge branch 'main' of github.com:zauberzeug/nicegui

api_docs_and_examples.py

@@ -653,6 +653,7 @@ def page(word: str, count: int):
 This contains the websocket of the client.
     '''
     with example(yield_page_ready):
+        import asyncio
         from typing import Generator
 
         from nicegui.events import PageEvent

nicegui/events.py

@@ -1,21 +1,22 @@
 import traceback
 from dataclasses import dataclass
 from inspect import signature
-from typing import Any, Callable, List, Optional
+from typing import TYPE_CHECKING, Any, Callable, List, Optional
 
 from starlette.websockets import WebSocket
 
 from . import globals
-from .elements.element import Element
 from .helpers import is_coroutine
 from .lifecycle import on_startup
-from .page import PageEvent
 from .task_logger import create_task
 
+if TYPE_CHECKING:
+    from .elements.element import Element
+
 
 @dataclass
 class EventArguments:
-    sender: Element
+    sender: 'Element'
     socket: Optional[WebSocket]
 
 
@@ -226,6 +227,11 @@ class KeyEventArguments(EventArguments):
     modifiers: KeyboardModifiers
 
 
+@dataclass
+class PageEvent:
+    socket: WebSocket
+
+
 def handle_event(handler: Optional[Callable], arguments: EventArguments) -> Optional[bool]:
     try:
         if handler is None:

nicegui/page.py

@@ -6,7 +6,6 @@
 import traceback
 import types
 import uuid
-from dataclasses import dataclass
 from functools import wraps
 from typing import Callable, Dict, Generator, List, Optional
 
@@ -19,16 +18,12 @@
 from starlette.websockets import WebSocket
 
 from . import globals
+from .events import PageEvent
 from .helpers import is_coroutine
 from .page_builder import PageBuilder
 from .routes import add_route, convert_arguments
 
 
-@dataclass
-class PageEvent:
-    socket: WebSocket
-
-
 class Page(jp.QuasarPage):
 
     def __init__(self,

tests/test_pages.py

@@ -4,7 +4,6 @@
 from uuid import uuid4
 
 import justpy.htmlcomponents
-import pytest
 from nicegui import task_logger, ui
 from nicegui.events import PageEvent
 from starlette.requests import Request