nicegui 2.2.0__tar.gz → 2.3.0__tar.gz

{nicegui-2.2.0 → nicegui-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nicegui
-Version: 2.2.0
+Version: 2.3.0
 Summary: Create web-based user interfaces with Python. The nice way.
 Home-page: https://github.com/zauberzeug/nicegui
 License: MIT

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/air.py

@@ -137,11 +137,16 @@ class Air:
 
         @self.relay.on('client_disconnect')
         def _handle_disconnect(data: Dict[str, Any]) -> None:
+            self.log.info('disconnected.')
             client_id = data['client_id']
             if client_id not in Client.instances:
                 return
             Client.instances[client_id].handle_disconnect()
 
+        @self.relay.on('connect')
+        async def _handle_connect() -> None:
+            self.log.info('connected.')
+
         @self.relay.on('event')
         def _handle_event(data: Dict[str, Any]) -> None:
             client_id = data['client_id']
@@ -168,10 +173,6 @@ class Air:
             print('Sorry, you have reached the time limit of this NiceGUI On Air preview.', flush=True)
             await self.connect()
 
-        @self.relay.on('reconnect')
-        async def _handle_reconnect(_: Dict[str, Any]) -> None:
-            await self.connect()
-
     async def connect(self) -> None:
         """Connect to the NiceGUI On Air server."""
         if self.connecting:
@@ -181,30 +182,23 @@ class Air:
             return
         self.log.debug('Going to connect...')
         self.connecting = True
-        backoff_time = 1
         try:
-            while True:
-                try:
-                    if self.relay.connected:
-                        await asyncio.wait_for(self.disconnect(), timeout=5)
-                    self.log.debug('Connecting...')
-                    await self.relay.connect(
-                        f'{RELAY_HOST}?device_token={self.token}',
-                        socketio_path='/on_air/socket.io',
-                        transports=['websocket', 'polling'],  # favor websocket over polling
-                    )
-                    self.log.debug('Connected.')
-                    break
-                except socketio.exceptions.ConnectionError:
-                    self.log.debug('Connection error.', stack_info=True)
-                except ValueError:  # NOTE this sometimes happens when the internal socketio client is not yet ready
-                    self.log.debug('ValueError while connecting.', stack_info=True)
-                except Exception:
-                    log.exception('Could not connect to NiceGUI On Air server.')
-
-                self.log.debug(f'Retrying in {backoff_time} seconds...')
-                await asyncio.sleep(backoff_time)
-                backoff_time = min(backoff_time * 2, 32)
+            if self.relay.connected:
+                await asyncio.wait_for(self.disconnect(), timeout=5)
+            self.log.debug('Connecting...')
+            await self.relay.connect(
+                f'{RELAY_HOST}?device_token={self.token}',
+                socketio_path='/on_air/socket.io',
+                transports=['websocket', 'polling'],  # favor websocket over polling
+            )
+            self.log.debug('Connected.')
+            return
+        except socketio.exceptions.ConnectionError:
+            self.log.debug('Connection error.', stack_info=True)
+        except ValueError:  # NOTE this sometimes happens when the internal socketio client is not yet ready
+            self.log.debug('ValueError while connecting.', stack_info=True)
+        except Exception:
+            log.exception('Could not connect to NiceGUI On Air server.')
         finally:
             self.connecting = False
 

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/element.py

@@ -4,20 +4,7 @@ import inspect
 import re
 from copy import copy
 from pathlib import Path
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-    ClassVar,
-    Dict,
-    Iterator,
-    List,
-    Optional,
-    Sequence,
-    Union,
-    cast,
-    overload,
-)
+from typing import TYPE_CHECKING, Any, ClassVar, Dict, Iterator, List, Optional, Sequence, Union, cast, overload
 
 from typing_extensions import Self
 
@@ -334,7 +321,7 @@ class Element(Visibility):
     @overload
     def on(self,
            type: str,  # pylint: disable=redefined-builtin
-           handler: Optional[Callable[..., Any]] = None,
+           handler: Optional[events.Handler[events.GenericEventArguments]] = None,
            args: Union[None, Sequence[str], Sequence[Optional[Sequence[str]]]] = None,
            *,
            throttle: float = 0.0,
@@ -345,7 +332,7 @@ class Element(Visibility):
 
     def on(self,
            type: str,  # pylint: disable=redefined-builtin
-           handler: Optional[Callable[..., Any]] = None,
+           handler: Optional[events.Handler[events.GenericEventArguments]] = None,
            args: Union[None, Sequence[str], Sequence[Optional[Sequence[str]]]] = None,
            *,
            throttle: float = 0.0,

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/button.py

@@ -1,9 +1,9 @@
 import asyncio
-from typing import Any, Callable, Optional
+from typing import Optional
 
 from typing_extensions import Self
 
-from ..events import ClickEventArguments, handle_event
+from ..events import ClickEventArguments, Handler, handle_event
 from .mixins.color_elements import BackgroundColorElement
 from .mixins.disableable_element import DisableableElement
 from .mixins.icon_element import IconElement
@@ -14,7 +14,7 @@ class Button(IconElement, TextElement, DisableableElement, BackgroundColorElemen
 
     def __init__(self,
                  text: str = '', *,
-                 on_click: Optional[Callable[..., Any]] = None,
+                 on_click: Optional[Handler[ClickEventArguments]] = None,
                  color: Optional[str] = 'primary',
                  icon: Optional[str] = None,
                  ) -> None:
@@ -37,7 +37,7 @@ class Button(IconElement, TextElement, DisableableElement, BackgroundColorElemen
         if on_click:
             self.on_click(on_click)
 
-    def on_click(self, callback: Callable[..., Any]) -> Self:
+    def on_click(self, callback: Handler[ClickEventArguments]) -> Self:
         """Add a callback to be invoked when the button is clicked."""
         self.on('click', lambda _: handle_event(callback, ClickEventArguments(sender=self, client=self.client)), [])
         return self

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/button_dropdown.py

@@ -1,6 +1,6 @@
-from typing import Any, Callable, Optional
+from typing import Optional
 
-from ..events import ClickEventArguments, handle_event
+from ..events import ClickEventArguments, Handler, ValueChangeEventArguments, handle_event
 from .mixins.color_elements import BackgroundColorElement
 from .mixins.disableable_element import DisableableElement
 from .mixins.icon_element import IconElement
@@ -13,8 +13,8 @@ class DropdownButton(IconElement, TextElement, DisableableElement, BackgroundCol
     def __init__(self,
                  text: str = '', *,
                  value: bool = False,
-                 on_value_change: Optional[Callable[..., Any]] = None,
-                 on_click: Optional[Callable[..., Any]] = None,
+                 on_value_change: Optional[Handler[ValueChangeEventArguments]] = None,
+                 on_click: Optional[Handler[ClickEventArguments]] = None,
                  color: Optional[str] = 'primary',
                  icon: Optional[str] = None,
                  auto_close: Optional[bool] = False,

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/carousel.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
-from typing import Any, Callable, Optional, Union, cast
+from typing import Any, Optional, Union, cast
 
 from ..context import context
+from ..events import Handler, ValueChangeEventArguments
 from .mixins.disableable_element import DisableableElement
 from .mixins.value_element import ValueElement
 
@@ -11,7 +12,7 @@ class Carousel(ValueElement):
 
     def __init__(self, *,
                  value: Union[str, CarouselSlide, None] = None,
-                 on_value_change: Optional[Callable[..., Any]] = None,
+                 on_value_change: Optional[Handler[ValueChangeEventArguments]] = None,
                  animated: bool = False,
                  arrows: bool = False,
                  navigation: bool = False,
@@ -37,7 +38,7 @@ class Carousel(ValueElement):
 
     def _handle_value_change(self, value: Any) -> None:
         super()._handle_value_change(value)
-        names = [slide.props['name'] for slide in self]
+        names = [slide.props['name'] for slide in self.default_slot]
         for i, slide in enumerate(self):
             done = i < names.index(value) if value in names else False
             slide.props(f':done={done}')

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/checkbox.py

@@ -1,5 +1,6 @@
-from typing import Any, Callable, Optional
+from typing import Optional
 
+from ..events import Handler, ValueChangeEventArguments
 from .mixins.disableable_element import DisableableElement
 from .mixins.text_element import TextElement
 from .mixins.value_element import ValueElement
@@ -7,7 +8,7 @@ from .mixins.value_element import ValueElement
 
 class Checkbox(TextElement, ValueElement, DisableableElement):
 
-    def __init__(self, text: str = '', *, value: bool = False, on_change: Optional[Callable[..., Any]] = None) -> None:
+    def __init__(self, text: str = '', *, value: bool = False, on_change: Optional[Handler[ValueChangeEventArguments]] = None) -> None:
         """Checkbox
 
         This element is based on Quasar's `QCheckbox <https://quasar.dev/vue-components/checkbox>`_ component.

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/chip.py

@@ -1,8 +1,8 @@
-from typing import Any, Callable, Optional
+from typing import Optional
 
 from typing_extensions import Self
 
-from ..events import ClickEventArguments, handle_event
+from ..events import ClickEventArguments, Handler, ValueChangeEventArguments, handle_event
 from .mixins.color_elements import BackgroundColorElement, TextColorElement
 from .mixins.disableable_element import DisableableElement
 from .mixins.icon_element import IconElement
@@ -20,12 +20,12 @@ class Chip(IconElement, ValueElement, TextElement, BackgroundColorElement, TextC
                  icon: Optional[str] = None,
                  color: Optional[str] = 'primary',
                  text_color: Optional[str] = None,
-                 on_click: Optional[Callable[..., Any]] = None,
+                 on_click: Optional[Handler[ClickEventArguments]] = None,
                  selectable: bool = False,
                  selected: bool = False,
-                 on_selection_change: Optional[Callable[..., Any]] = None,
+                 on_selection_change: Optional[Handler[ValueChangeEventArguments]] = None,
                  removable: bool = False,
-                 on_value_change: Optional[Callable[..., Any]] = None,
+                 on_value_change: Optional[Handler[ValueChangeEventArguments]] = None,
                  ) -> None:
         """Chip
 
@@ -52,7 +52,7 @@ class Chip(IconElement, ValueElement, TextElement, BackgroundColorElement, TextC
         if on_click:
             self.on_click(on_click)
 
-    def on_click(self, callback: Callable[..., Any]) -> Self:
+    def on_click(self, callback: Handler[ClickEventArguments]) -> Self:
         """Add a callback to be invoked when the chip is clicked."""
         self._props['clickable'] = True
         self.update()

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/choice_element.py

@@ -1,5 +1,6 @@
-from typing import Any, Callable, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 
+from ..events import Handler, ValueChangeEventArguments
 from .mixins.value_element import ValueElement
 
 
@@ -9,7 +10,7 @@ class ChoiceElement(ValueElement):
                  tag: Optional[str] = None,
                  options: Union[List, Dict],
                  value: Any,
-                 on_change: Optional[Callable[..., Any]] = None,
+                 on_change: Optional[Handler[ValueChangeEventArguments]] = None,
                  ) -> None:
         self.options = options
         self._values: List[str] = []

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/codemirror.py

@@ -1,9 +1,9 @@
 from pathlib import Path
-from typing import Any, Callable, List, Literal, Optional, get_args
+from typing import Callable, List, Literal, Optional, get_args
 
 from nicegui.elements.mixins.disableable_element import DisableableElement
 from nicegui.elements.mixins.value_element import ValueElement
-from nicegui.events import GenericEventArguments
+from nicegui.events import GenericEventArguments, Handler, ValueChangeEventArguments
 
 SUPPORTED_LANGUAGES = Literal[
     'Angular Template',
@@ -253,7 +253,7 @@ class CodeMirror(ValueElement, DisableableElement, component='codemirror.js'):
         self,
         value: str = '',
         *,
-        on_change: Optional[Callable[..., Any]] = None,
+        on_change: Optional[Handler[ValueChangeEventArguments]] = None,
         language: Optional[SUPPORTED_LANGUAGES] = None,
         theme: SUPPORTED_THEMES = 'basicLight',
         indent: str = ' ' * 4,

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/color_input.py

@@ -1,5 +1,6 @@
-from typing import Any, Callable, Optional
+from typing import Any, Optional
 
+from ..events import Handler, ValueChangeEventArguments
 from .button import Button as button
 from .color_picker import ColorPicker as color_picker
 from .mixins.disableable_element import DisableableElement
@@ -13,7 +14,7 @@ class ColorInput(ValueElement, DisableableElement):
                  label: Optional[str] = None, *,
                  placeholder: Optional[str] = None,
                  value: str = '',
-                 on_change: Optional[Callable[..., Any]] = None,
+                 on_change: Optional[Handler[ValueChangeEventArguments]] = None,
                  preview: bool = False,
                  ) -> None:
         """Color Input

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/color_picker.py

@@ -1,16 +1,16 @@
-from typing import Any, Callable, Optional
+from typing import Optional
 
 from typing_extensions import Self
 
 from ..element import Element
-from ..events import ColorPickEventArguments, GenericEventArguments, handle_event
+from ..events import ColorPickEventArguments, GenericEventArguments, Handler, handle_event
 from .menu import Menu
 
 
 class ColorPicker(Menu):
 
     def __init__(self, *,
-                 on_pick: Optional[Callable[..., Any]] = None,
+                 on_pick: Optional[Handler[ColorPickEventArguments]] = None,
                  value: bool = False,
                  ) -> None:
         """Color Picker
@@ -36,7 +36,7 @@ class ColorPicker(Menu):
         """
         self.q_color.props(f'model-value="{color}"')
 
-    def on_pick(self, callback: Callable[..., Any]) -> Self:
+    def on_pick(self, callback: Handler[ColorPickEventArguments]) -> Self:
         """Add a callback to be invoked when a color is picked."""
         self._pick_handlers.append(callback)
         return self

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/dark_mode.py

@@ -1,12 +1,13 @@
-from typing import Any, Callable, Optional
+from typing import Optional
 
+from ..events import Handler, ValueChangeEventArguments
 from .mixins.value_element import ValueElement
 
 
 class DarkMode(ValueElement, component='dark_mode.js'):
     VALUE_PROP = 'value'
 
-    def __init__(self, value: Optional[bool] = False, *, on_change: Optional[Callable[..., Any]] = None) -> None:
+    def __init__(self, value: Optional[bool] = False, *, on_change: Optional[Handler[ValueChangeEventArguments]] = None) -> None:
         """Dark mode
 
         You can use this element to enable, disable or toggle dark mode on the page.

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/date.py

@@ -1,5 +1,6 @@
-from typing import Any, Callable, Dict, List, Optional, Union
+from typing import Dict, List, Optional, Union
 
+from ..events import Handler, ValueChangeEventArguments
 from .mixins.disableable_element import DisableableElement
 from .mixins.value_element import ValueElement
 
@@ -12,7 +13,7 @@ class Date(ValueElement, DisableableElement):
                  ] = None,
                  *,
                  mask: str = 'YYYY-MM-DD',
-                 on_change: Optional[Callable[..., Any]] = None) -> None:
+                 on_change: Optional[Handler[ValueChangeEventArguments]] = None) -> None:
         """Date Input
 
         This element is based on Quasar's `QDate <https://quasar.dev/vue-components/date>`_ component.

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/echart.py

@@ -1,11 +1,11 @@
-from typing import Any, Callable, Dict, Optional
+from typing import Callable, Dict, Optional
 
 from typing_extensions import Self
 
 from .. import optional_features
 from ..awaitable_response import AwaitableResponse
 from ..element import Element
-from ..events import EChartPointClickEventArguments, GenericEventArguments, handle_event
+from ..events import EChartPointClickEventArguments, GenericEventArguments, Handler, handle_event
 
 try:
     from pyecharts.charts.base import default, json
@@ -19,7 +19,7 @@ except ImportError:
 
 class EChart(Element, component='echart.js', dependencies=['lib/echarts/echarts.min.js', 'lib/echarts-gl/echarts-gl.min.js']):
 
-    def __init__(self, options: Dict, on_point_click: Optional[Callable] = None, *, enable_3d: bool = False) -> None:
+    def __init__(self, options: Dict, on_point_click: Optional[Handler[EChartPointClickEventArguments]] = None, *, enable_3d: bool = False) -> None:
         """Apache EChart
 
         An element to create a chart using `ECharts <https://echarts.apache.org/>`_.
@@ -38,7 +38,7 @@ class EChart(Element, component='echart.js', dependencies=['lib/echarts/echarts.
         if on_point_click:
             self.on_point_click(on_point_click)
 
-    def on_point_click(self, callback: Callable[..., Any]) -> Self:
+    def on_point_click(self, callback: Handler[EChartPointClickEventArguments]) -> Self:
         """Add a callback to be invoked when a point is clicked."""
         def handle_point_click(e: GenericEventArguments) -> None:
             handle_event(callback, EChartPointClickEventArguments(

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/editor.py

@@ -1,5 +1,6 @@
-from typing import Any, Callable, Optional
+from typing import Any, Optional
 
+from ..events import Handler, ValueChangeEventArguments
 from .mixins.disableable_element import DisableableElement
 from .mixins.value_element import ValueElement
 
@@ -12,7 +13,7 @@ class Editor(ValueElement, DisableableElement, component='editor.js'):
                  *,
                  placeholder: Optional[str] = None,
                  value: str = '',
-                 on_change: Optional[Callable[..., Any]] = None,
+                 on_change: Optional[Handler[ValueChangeEventArguments]] = None,
                  ) -> None:
         """Editor
 

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/expansion.py

@@ -1,5 +1,6 @@
-from typing import Any, Callable, Optional
+from typing import Optional
 
+from ..events import Handler, ValueChangeEventArguments
 from .mixins.disableable_element import DisableableElement
 from .mixins.icon_element import IconElement
 from .mixins.text_element import TextElement
@@ -14,7 +15,7 @@ class Expansion(IconElement, TextElement, ValueElement, DisableableElement):
                  icon: Optional[str] = None,
                  group: Optional[str] = None,
                  value: bool = False,
-                 on_value_change: Optional[Callable[..., Any]] = None
+                 on_value_change: Optional[Handler[ValueChangeEventArguments]] = None
                  ) -> None:
         """Expansion Element
 

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/input.py

@@ -1,5 +1,6 @@
 from typing import Any, Callable, Dict, List, Optional, Union
 
+from ..events import Handler, ValueChangeEventArguments
 from .icon import Icon
 from .mixins.disableable_element import DisableableElement
 from .mixins.validation_element import ValidationElement
@@ -15,7 +16,7 @@ class Input(ValidationElement, DisableableElement, component='input.js'):
                  value: str = '',
                  password: bool = False,
                  password_toggle_button: bool = False,
-                 on_change: Optional[Callable[..., Any]] = None,
+                 on_change: Optional[Handler[ValueChangeEventArguments]] = None,
                  autocomplete: Optional[List[str]] = None,
                  validation: Optional[Union[Callable[..., Optional[str]], Dict[str, Callable[..., bool]]]] = None,
                  ) -> None:

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/interactive_image.py

@@ -2,12 +2,12 @@ from __future__ import annotations
 
 import time
 from pathlib import Path
-from typing import Any, Callable, List, Optional, Tuple, Union, cast
+from typing import List, Optional, Tuple, Union, cast
 
 from typing_extensions import Self
 
 from .. import optional_features
-from ..events import GenericEventArguments, MouseEventArguments, handle_event
+from ..events import GenericEventArguments, Handler, MouseEventArguments, handle_event
 from .image import pil_to_base64
 from .mixins.content_element import ContentElement
 from .mixins.source_element import SourceElement
@@ -27,7 +27,7 @@ class InteractiveImage(SourceElement, ContentElement, component='interactive_ima
                  source: Union[str, Path, 'PIL_Image'] = '', *,  # noqa: UP037
                  content: str = '',
                  size: Optional[Tuple[float, float]] = None,
-                 on_mouse: Optional[Callable[..., Any]] = None,
+                 on_mouse: Optional[Handler[MouseEventArguments]] = None,
                  events: List[str] = ['click'],  # noqa: B006
                  cross: Union[bool, str] = False,
                  ) -> None:
@@ -67,7 +67,7 @@ class InteractiveImage(SourceElement, ContentElement, component='interactive_ima
     def set_source(self, source: Union[str, Path, 'PIL_Image']) -> None:  # noqa: UP037
         return super().set_source(source)
 
-    def on_mouse(self, on_mouse: Callable[..., Any]) -> Self:
+    def on_mouse(self, on_mouse: Handler[MouseEventArguments]) -> Self:
         """Add a callback to be invoked when a mouse event occurs."""
         def handle_mouse(e: GenericEventArguments) -> None:
             args = cast(dict, e.args)

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/item.py

@@ -1,15 +1,15 @@
-from typing import Any, Callable, Optional
+from typing import Optional
 
 from typing_extensions import Self
 
-from ..events import ClickEventArguments, handle_event
+from ..events import ClickEventArguments, Handler, handle_event
 from .mixins.disableable_element import DisableableElement
 from .mixins.text_element import TextElement
 
 
 class Item(DisableableElement):
 
-    def __init__(self, text: str = '', *, on_click: Optional[Callable[..., Any]] = None) -> None:
+    def __init__(self, text: str = '', *, on_click: Optional[Handler[ClickEventArguments]] = None) -> None:
         """List Item
 
         Creates a clickable list item based on Quasar's
@@ -30,7 +30,7 @@ class Item(DisableableElement):
             with self:
                 ItemSection(text=text)
 
-    def on_click(self, callback: Callable[..., Any]) -> Self:
+    def on_click(self, callback: Handler[ClickEventArguments]) -> Self:
         """Add a callback to be invoked when the List Item is clicked."""
         self._props['clickable'] = True  # idempotent
         self.on('click', lambda _: handle_event(callback, ClickEventArguments(sender=self, client=self.client)))

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/joystick.py

@@ -1,17 +1,17 @@
-from typing import Any, Callable, Optional
+from typing import Any, Optional
 
 from typing_extensions import Self
 
 from ..element import Element
-from ..events import GenericEventArguments, JoystickEventArguments, handle_event
+from ..events import GenericEventArguments, Handler, JoystickEventArguments, handle_event
 
 
 class Joystick(Element, component='joystick.vue', dependencies=['lib/nipplejs/nipplejs.js']):
 
     def __init__(self, *,
-                 on_start: Optional[Callable[..., Any]] = None,
-                 on_move: Optional[Callable[..., Any]] = None,
-                 on_end: Optional[Callable[..., Any]] = None,
+                 on_start: Optional[Handler[JoystickEventArguments]] = None,
+                 on_move: Optional[Handler[JoystickEventArguments]] = None,
+                 on_end: Optional[Handler[JoystickEventArguments]] = None,
                  throttle: float = 0.05,
                  ** options: Any) -> None:
         """Joystick
@@ -61,17 +61,17 @@ class Joystick(Element, component='joystick.vue', dependencies=['lib/nipplejs/ni
         self.on('move', handle_move, ['data'], throttle=throttle)
         self.on('end', handle_end, [])
 
-    def on_start(self, callback: Callable[..., Any]) -> Self:
+    def on_start(self, callback: Handler[JoystickEventArguments]) -> Self:
         """Add a callback to be invoked when the user touches the joystick."""
         self._start_handlers.append(callback)
         return self
 
-    def on_move(self, callback: Callable[..., Any]) -> Self:
+    def on_move(self, callback: Handler[JoystickEventArguments]) -> Self:
         """Add a callback to be invoked when the user moves the joystick."""
         self._move_handlers.append(callback)
         return self
 
-    def on_end(self, callback: Callable[..., Any]) -> Self:
+    def on_end(self, callback: Handler[JoystickEventArguments]) -> Self:
         """Add a callback to be invoked when the user releases the joystick."""
         self._end_handlers.append(callback)
         return self

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/json_editor.py

@@ -1,18 +1,24 @@
-from typing import Any, Callable, Dict, Optional
+from typing import Dict, Optional
 
 from typing_extensions import Self
 
 from ..awaitable_response import AwaitableResponse
 from ..element import Element
-from ..events import GenericEventArguments, JsonEditorChangeEventArguments, JsonEditorSelectEventArguments, handle_event
+from ..events import (
+    GenericEventArguments,
+    Handler,
+    JsonEditorChangeEventArguments,
+    JsonEditorSelectEventArguments,
+    handle_event,
+)
 
 
 class JsonEditor(Element, component='json_editor.js', dependencies=['lib/vanilla-jsoneditor/standalone.js']):
 
     def __init__(self,
                  properties: Dict, *,
-                 on_select: Optional[Callable] = None,
-                 on_change: Optional[Callable] = None,
+                 on_select: Optional[Handler[JsonEditorSelectEventArguments]] = None,
+                 on_change: Optional[Handler[JsonEditorChangeEventArguments]] = None,
                  ) -> None:
         """JSONEditor
 
@@ -33,14 +39,14 @@ class JsonEditor(Element, component='json_editor.js', dependencies=['lib/vanilla
         if on_change:
             self.on_change(on_change)
 
-    def on_change(self, callback: Callable[..., Any]) -> Self:
+    def on_change(self, callback: Handler[JsonEditorChangeEventArguments]) -> Self:
         """Add a callback to be invoked when the content changes."""
         def handle_on_change(e: GenericEventArguments) -> None:
             handle_event(callback, JsonEditorChangeEventArguments(sender=self, client=self.client, **e.args))
         self.on('change', handle_on_change, ['content', 'errors'])
         return self
 
-    def on_select(self, callback: Callable[..., Any]) -> Self:
+    def on_select(self, callback: Handler[JsonEditorSelectEventArguments]) -> Self:
         """Add a callback to be invoked when some of the content has been selected."""
         def handle_on_select(e: GenericEventArguments) -> None:
             handle_event(callback, JsonEditorSelectEventArguments(sender=self, client=self.client, **e.args))

{nicegui-2.2.0 → nicegui-2.3.0}/nicegui/elements/keyboard.py

@@ -1,4 +1,4 @@
-from typing import Any, Callable, List, Literal, Optional
+from typing import List, Literal, Optional
 
 from typing_extensions import Self
 
@@ -6,6 +6,7 @@ from ..binding import BindableProperty
 from ..element import Element
 from ..events import (
     GenericEventArguments,
+    Handler,
     KeyboardAction,
     KeyboardKey,
     KeyboardModifiers,
@@ -18,7 +19,7 @@ class Keyboard(Element, component='keyboard.js'):
     active = BindableProperty()
 
     def __init__(self,
-                 on_key: Optional[Callable[..., Any]] = None, *,
+                 on_key: Optional[Handler[KeyEventArguments]] = None, *,
                  active: bool = True,
                  repeating: bool = True,
                  ignore: List[Literal['input', 'select', 'button', 'textarea']] =
@@ -97,7 +98,7 @@ class Keyboard(Element, component='keyboard.js'):
         for handler in self._key_handlers:
             handle_event(handler, arguments)
 
-    def on_key(self, handler: Callable[..., Any]) -> Self:
+    def on_key(self, handler: Handler[KeyEventArguments]) -> Self:
         """Add a callback to be invoked when keyboard events occur."""
         self._key_handlers.append(handler)
         return self