Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

add metainfo to keyevent #4287

Merged
merged 13 commits into from
Nov 6, 2024
Merged

add metainfo to keyevent #4287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
77fe577
allow for event handlers to ignore args
adhami3310 Oct 31, 2024
dc0c76c
use a constant
adhami3310 Oct 31, 2024
3d11150
dang it darglint
adhami3310 Oct 31, 2024
00fe50f
forgor
adhami3310 Oct 31, 2024
115a5c9
keep the tests but move them to valid place
adhami3310 Nov 1, 2024
ba9f330
add metainfo to keyevent
adhami3310 Nov 1, 2024
356e48b
Merge branch 'main' into add-metainfo-to-keyevent
adhami3310 Nov 6, 2024
29d9d7b
format code
adhami3310 Nov 6, 2024
335368c
fix pyi files
adhami3310 Nov 6, 2024
167d4de
generate all prefixes of event types
adhami3310 Nov 6, 2024
0dbbe33
change format rule
adhami3310 Nov 6, 2024
50fdfda
Merge branch 'main' into add-metainfo-to-keyevent
adhami3310 Nov 6, 2024
4db400a
Merge branch 'main' into add-metainfo-to-keyevent
adhami3310 Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ build-backend = "poetry.core.masonry.api"

[tool.ruff]
target-version = "py39"
lint.isort.split-on-trailing-comma = false
lint.select = ["B", "D", "E", "F", "I", "SIM", "W"]
lint.ignore = ["B008", "D203", "D205", "D213", "D401", "D406", "D407", "E501", "F403", "F405", "F541", "SIM115"]
lint.pydocstyle.convention = "google"
Expand Down
9 changes: 2 additions & 7 deletions reflex/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,7 @@
from reflex.app_mixins import AppMixin, LifespanMixin, MiddlewareMixin
from reflex.compiler import compiler
from reflex.compiler import utils as compiler_utils
from reflex.compiler.compiler import (
ExecutorSafeFunctions,
compile_theme,
)
from reflex.compiler.compiler import ExecutorSafeFunctions, compile_theme
from reflex.components.base.app_wrap import AppWrap
from reflex.components.base.error_boundary import ErrorBoundary
from reflex.components.base.fragment import Fragment
Expand Down Expand Up @@ -79,9 +76,7 @@
window_alert,
)
from reflex.model import Model, get_db_status
from reflex.page import (
DECORATED_PAGES,
)
from reflex.page import DECORATED_PAGES
from reflex.route import (
get_route_args,
replace_brackets_with_keywords,
Expand Down
8 changes: 7 additions & 1 deletion reflex/components/base/error_boundary.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,13 @@ class ErrorBoundary(Component):
on_click: Optional[EventType[[], BASE_STATE]] = None,
on_context_menu: Optional[EventType[[], BASE_STATE]] = None,
on_double_click: Optional[EventType[[], BASE_STATE]] = None,
on_error: Optional[EventType[[str, str], BASE_STATE]] = None,
on_error: Optional[
Union[
EventType[[], BASE_STATE],
EventType[[str], BASE_STATE],
EventType[[str, str], BASE_STATE],
]
] = None,
on_focus: Optional[EventType[[], BASE_STATE]] = None,
on_mount: Optional[EventType[[], BASE_STATE]] = None,
on_mouse_down: Optional[EventType[[], BASE_STATE]] = None,
Expand Down
12 changes: 7 additions & 5 deletions reflex/components/core/clipboard.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
from typing import Any, Dict, List, Optional, Union, overload

from reflex.components.base.fragment import Fragment
from reflex.event import (
BASE_STATE,
EventType,
)
from reflex.event import BASE_STATE, EventType
from reflex.style import Style
from reflex.utils.imports import ImportVar
from reflex.vars.base import Var
Expand Down Expand Up @@ -43,7 +40,12 @@ class Clipboard(Fragment):
on_mouse_out: Optional[EventType[[], BASE_STATE]] = None,
on_mouse_over: Optional[EventType[[], BASE_STATE]] = None,
on_mouse_up: Optional[EventType[[], BASE_STATE]] = None,
on_paste: Optional[EventType[[list[tuple[str, str]]], BASE_STATE]] = None,
on_paste: Optional[
Union[
EventType[[], BASE_STATE],
EventType[[list[tuple[str, str]]], BASE_STATE],
]
] = None,
on_scroll: Optional[EventType[[], BASE_STATE]] = None,
on_unmount: Optional[EventType[[], BASE_STATE]] = None,
**props,
Expand Down
25 changes: 11 additions & 14 deletions reflex/components/core/upload.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,9 @@
from pathlib import Path
from typing import Any, ClassVar, Dict, List, Optional, Union, overload

from reflex.components.component import (
Component,
ComponentNamespace,
MemoizationLeaf,
)
from reflex.components.component import Component, ComponentNamespace, MemoizationLeaf
from reflex.constants import Dirs
from reflex.event import (
BASE_STATE,
CallableEventSpec,
EventSpec,
EventType,
)
from reflex.event import BASE_STATE, CallableEventSpec, EventSpec, EventType
from reflex.style import Style
from reflex.utils.imports import ImportVar
from reflex.vars import VarData
Expand Down Expand Up @@ -120,7 +111,9 @@ class Upload(MemoizationLeaf):
on_click: Optional[EventType[[], BASE_STATE]] = None,
on_context_menu: Optional[EventType[[], BASE_STATE]] = None,
on_double_click: Optional[EventType[[], BASE_STATE]] = None,
on_drop: Optional[EventType[[Any], BASE_STATE]] = None,
on_drop: Optional[
Union[EventType[[], BASE_STATE], EventType[[Any], BASE_STATE]]
] = None,
on_focus: Optional[EventType[[], BASE_STATE]] = None,
on_mount: Optional[EventType[[], BASE_STATE]] = None,
on_mouse_down: Optional[EventType[[], BASE_STATE]] = None,
Expand Down Expand Up @@ -186,7 +179,9 @@ class StyledUpload(Upload):
on_click: Optional[EventType[[], BASE_STATE]] = None,
on_context_menu: Optional[EventType[[], BASE_STATE]] = None,
on_double_click: Optional[EventType[[], BASE_STATE]] = None,
on_drop: Optional[EventType[[Any], BASE_STATE]] = None,
on_drop: Optional[
Union[EventType[[], BASE_STATE], EventType[[Any], BASE_STATE]]
] = None,
on_focus: Optional[EventType[[], BASE_STATE]] = None,
on_mount: Optional[EventType[[], BASE_STATE]] = None,
on_mouse_down: Optional[EventType[[], BASE_STATE]] = None,
Expand Down Expand Up @@ -252,7 +247,9 @@ class UploadNamespace(ComponentNamespace):
on_click: Optional[EventType[[], BASE_STATE]] = None,
on_context_menu: Optional[EventType[[], BASE_STATE]] = None,
on_double_click: Optional[EventType[[], BASE_STATE]] = None,
on_drop: Optional[EventType[[Any], BASE_STATE]] = None,
on_drop: Optional[
Union[EventType[[], BASE_STATE], EventType[[Any], BASE_STATE]]
] = None,
on_focus: Optional[EventType[[], BASE_STATE]] = None,
on_mount: Optional[EventType[[], BASE_STATE]] = None,
on_mouse_down: Optional[EventType[[], BASE_STATE]] = None,
Expand Down
74 changes: 60 additions & 14 deletions reflex/components/datadisplay/dataeditor.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,34 +184,80 @@ class DataEditor(NoSSRComponent):
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
on_blur: Optional[EventType[[], BASE_STATE]] = None,
on_cell_activated: Optional[EventType[[tuple[int, int]], BASE_STATE]] = None,
on_cell_clicked: Optional[EventType[[tuple[int, int]], BASE_STATE]] = None,
on_cell_context_menu: Optional[EventType[[tuple[int, int]], BASE_STATE]] = None,
on_cell_activated: Optional[
Union[EventType[[], BASE_STATE], EventType[[tuple[int, int]], BASE_STATE]]
] = None,
on_cell_clicked: Optional[
Union[EventType[[], BASE_STATE], EventType[[tuple[int, int]], BASE_STATE]]
] = None,
on_cell_context_menu: Optional[
Union[EventType[[], BASE_STATE], EventType[[tuple[int, int]], BASE_STATE]]
] = None,
on_cell_edited: Optional[
EventType[[tuple[int, int], GridCell], BASE_STATE]
Union[
EventType[[], BASE_STATE],
EventType[[tuple[int, int]], BASE_STATE],
EventType[[tuple[int, int], GridCell], BASE_STATE],
]
] = None,
on_click: Optional[EventType[[], BASE_STATE]] = None,
on_column_resize: Optional[EventType[[GridColumn, int], BASE_STATE]] = None,
on_column_resize: Optional[
Union[
EventType[[], BASE_STATE],
EventType[[GridColumn], BASE_STATE],
EventType[[GridColumn, int], BASE_STATE],
]
] = None,
on_context_menu: Optional[EventType[[], BASE_STATE]] = None,
on_delete: Optional[EventType[[GridSelection], BASE_STATE]] = None,
on_delete: Optional[
Union[EventType[[], BASE_STATE], EventType[[GridSelection], BASE_STATE]]
] = None,
on_double_click: Optional[EventType[[], BASE_STATE]] = None,
on_finished_editing: Optional[
EventType[[Union[GridCell, None], tuple[int, int]], BASE_STATE]
Union[
EventType[[], BASE_STATE],
EventType[[Union[GridCell, None]], BASE_STATE],
EventType[[Union[GridCell, None], tuple[int, int]], BASE_STATE],
]
] = None,
on_focus: Optional[EventType[[], BASE_STATE]] = None,
on_group_header_clicked: Optional[
EventType[[tuple[int, int], GridCell], BASE_STATE]
Union[
EventType[[], BASE_STATE],
EventType[[tuple[int, int]], BASE_STATE],
EventType[[tuple[int, int], GridCell], BASE_STATE],
]
] = None,
on_group_header_context_menu: Optional[
EventType[[int, GroupHeaderClickedEventArgs], BASE_STATE]
Union[
EventType[[], BASE_STATE],
EventType[[int], BASE_STATE],
EventType[[int, GroupHeaderClickedEventArgs], BASE_STATE],
]
] = None,
on_group_header_renamed: Optional[
Union[
EventType[[], BASE_STATE],
EventType[[str], BASE_STATE],
EventType[[str, str], BASE_STATE],
]
] = None,
on_header_clicked: Optional[
Union[EventType[[], BASE_STATE], EventType[[tuple[int, int]], BASE_STATE]]
] = None,
on_group_header_renamed: Optional[EventType[[str, str], BASE_STATE]] = None,
on_header_clicked: Optional[EventType[[tuple[int, int]], BASE_STATE]] = None,
on_header_context_menu: Optional[
EventType[[tuple[int, int]], BASE_STATE]
Union[EventType[[], BASE_STATE], EventType[[tuple[int, int]], BASE_STATE]]
] = None,
on_header_menu_click: Optional[
Union[
EventType[[], BASE_STATE],
EventType[[int], BASE_STATE],
EventType[[int, Rectangle], BASE_STATE],
]
] = None,
on_item_hovered: Optional[
Union[EventType[[], BASE_STATE], EventType[[tuple[int, int]], BASE_STATE]]
] = None,
on_header_menu_click: Optional[EventType[[int, Rectangle], BASE_STATE]] = None,
on_item_hovered: Optional[EventType[[tuple[int, int]], BASE_STATE]] = None,
on_mount: Optional[EventType[[], BASE_STATE]] = None,
on_mouse_down: Optional[EventType[[], BASE_STATE]] = None,
on_mouse_enter: Optional[EventType[[], BASE_STATE]] = None,
Expand Down
70 changes: 56 additions & 14 deletions reflex/components/el/elements/forms.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ from typing import Any, Dict, Optional, Tuple, Union, overload
from jinja2 import Environment

from reflex.components.el.element import Element
from reflex.event import BASE_STATE, EventType
from reflex.event import BASE_STATE, EventType, KeyInputInfo
from reflex.style import Style
from reflex.utils.imports import ImportDict
from reflex.vars.base import Var
Expand Down Expand Up @@ -340,8 +340,12 @@ class Form(BaseHTML):
on_scroll: Optional[EventType[[], BASE_STATE]] = None,
on_submit: Optional[
Union[
EventType[[Dict[str, Any]], BASE_STATE],
EventType[[Dict[str, str]], BASE_STATE],
Union[
EventType[[], BASE_STATE], EventType[[Dict[str, Any]], BASE_STATE]
],
Union[
EventType[[], BASE_STATE], EventType[[Dict[str, str]], BASE_STATE]
],
]
] = None,
on_unmount: Optional[EventType[[], BASE_STATE]] = None,
Expand Down Expand Up @@ -470,14 +474,32 @@ class Input(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
on_blur: Optional[EventType[[str], BASE_STATE]] = None,
on_change: Optional[EventType[[str], BASE_STATE]] = None,
on_blur: Optional[
Union[EventType[[], BASE_STATE], EventType[[str], BASE_STATE]]
] = None,
on_change: Optional[
Union[EventType[[], BASE_STATE], EventType[[str], BASE_STATE]]
] = None,
on_click: Optional[EventType[[], BASE_STATE]] = None,
on_context_menu: Optional[EventType[[], BASE_STATE]] = None,
on_double_click: Optional[EventType[[], BASE_STATE]] = None,
on_focus: Optional[EventType[[str], BASE_STATE]] = None,
on_key_down: Optional[EventType[[str], BASE_STATE]] = None,
on_key_up: Optional[EventType[[str], BASE_STATE]] = None,
on_focus: Optional[
Union[EventType[[], BASE_STATE], EventType[[str], BASE_STATE]]
] = None,
on_key_down: Optional[
Union[
EventType[[], BASE_STATE],
EventType[[str], BASE_STATE],
EventType[[str, KeyInputInfo], BASE_STATE],
]
] = None,
on_key_up: Optional[
Union[
EventType[[], BASE_STATE],
EventType[[str], BASE_STATE],
EventType[[str, KeyInputInfo], BASE_STATE],
]
] = None,
on_mount: Optional[EventType[[], BASE_STATE]] = None,
on_mouse_down: Optional[EventType[[], BASE_STATE]] = None,
on_mouse_enter: Optional[EventType[[], BASE_STATE]] = None,
Expand Down Expand Up @@ -1252,7 +1274,9 @@ class Select(BaseHTML):
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
on_blur: Optional[EventType[[], BASE_STATE]] = None,
on_change: Optional[EventType[[str], BASE_STATE]] = None,
on_change: Optional[
Union[EventType[[], BASE_STATE], EventType[[str], BASE_STATE]]
] = None,
on_click: Optional[EventType[[], BASE_STATE]] = None,
on_context_menu: Optional[EventType[[], BASE_STATE]] = None,
on_double_click: Optional[EventType[[], BASE_STATE]] = None,
Expand Down Expand Up @@ -1369,14 +1393,32 @@ class Textarea(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
on_blur: Optional[EventType[[str], BASE_STATE]] = None,
on_change: Optional[EventType[[str], BASE_STATE]] = None,
on_blur: Optional[
Union[EventType[[], BASE_STATE], EventType[[str], BASE_STATE]]
] = None,
on_change: Optional[
Union[EventType[[], BASE_STATE], EventType[[str], BASE_STATE]]
] = None,
on_click: Optional[EventType[[], BASE_STATE]] = None,
on_context_menu: Optional[EventType[[], BASE_STATE]] = None,
on_double_click: Optional[EventType[[], BASE_STATE]] = None,
on_focus: Optional[EventType[[str], BASE_STATE]] = None,
on_key_down: Optional[EventType[[str], BASE_STATE]] = None,
on_key_up: Optional[EventType[[str], BASE_STATE]] = None,
on_focus: Optional[
Union[EventType[[], BASE_STATE], EventType[[str], BASE_STATE]]
] = None,
on_key_down: Optional[
Union[
EventType[[], BASE_STATE],
EventType[[str], BASE_STATE],
EventType[[str, KeyInputInfo], BASE_STATE],
]
] = None,
on_key_up: Optional[
Union[
EventType[[], BASE_STATE],
EventType[[str], BASE_STATE],
EventType[[str, KeyInputInfo], BASE_STATE],
]
] = None,
on_mount: Optional[EventType[[], BASE_STATE]] = None,
on_mouse_down: Optional[EventType[[], BASE_STATE]] = None,
on_mouse_enter: Optional[EventType[[], BASE_STATE]] = None,
Expand Down
4 changes: 3 additions & 1 deletion reflex/components/moment/moment.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ class Moment(NoSSRComponent):
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
on_blur: Optional[EventType[[], BASE_STATE]] = None,
on_change: Optional[EventType[[str], BASE_STATE]] = None,
on_change: Optional[
Union[EventType[[], BASE_STATE], EventType[[str], BASE_STATE]]
] = None,
on_click: Optional[EventType[[], BASE_STATE]] = None,
on_context_menu: Optional[EventType[[], BASE_STATE]] = None,
on_double_click: Optional[EventType[[], BASE_STATE]] = None,
Expand Down
4 changes: 3 additions & 1 deletion reflex/components/radix/primitives/accordion.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,9 @@ class AccordionRoot(AccordionComponent):
on_mouse_up: Optional[EventType[[], BASE_STATE]] = None,
on_scroll: Optional[EventType[[], BASE_STATE]] = None,
on_unmount: Optional[EventType[[], BASE_STATE]] = None,
on_value_change: Optional[EventType[[str | List[str]], BASE_STATE]] = None,
on_value_change: Optional[
Union[EventType[[], BASE_STATE], EventType[[str | List[str]], BASE_STATE]]
] = None,
**props,
) -> "AccordionRoot":
"""Create the component.
Expand Down
16 changes: 12 additions & 4 deletions reflex/components/radix/primitives/drawer.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ class DrawerRoot(DrawerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
on_animation_end: Optional[EventType[[bool], BASE_STATE]] = None,
on_animation_end: Optional[
Union[EventType[[], BASE_STATE], EventType[[bool], BASE_STATE]]
] = None,
on_blur: Optional[EventType[[], BASE_STATE]] = None,
on_click: Optional[EventType[[], BASE_STATE]] = None,
on_context_menu: Optional[EventType[[], BASE_STATE]] = None,
Expand All @@ -105,7 +107,9 @@ class DrawerRoot(DrawerComponent):
on_mouse_out: Optional[EventType[[], BASE_STATE]] = None,
on_mouse_over: Optional[EventType[[], BASE_STATE]] = None,
on_mouse_up: Optional[EventType[[], BASE_STATE]] = None,
on_open_change: Optional[EventType[[bool], BASE_STATE]] = None,
on_open_change: Optional[
Union[EventType[[], BASE_STATE], EventType[[bool], BASE_STATE]]
] = None,
on_scroll: Optional[EventType[[], BASE_STATE]] = None,
on_unmount: Optional[EventType[[], BASE_STATE]] = None,
**props,
Expand Down Expand Up @@ -573,7 +577,9 @@ class Drawer(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
on_animation_end: Optional[EventType[[bool], BASE_STATE]] = None,
on_animation_end: Optional[
Union[EventType[[], BASE_STATE], EventType[[bool], BASE_STATE]]
] = None,
on_blur: Optional[EventType[[], BASE_STATE]] = None,
on_click: Optional[EventType[[], BASE_STATE]] = None,
on_context_menu: Optional[EventType[[], BASE_STATE]] = None,
Expand All @@ -587,7 +593,9 @@ class Drawer(ComponentNamespace):
on_mouse_out: Optional[EventType[[], BASE_STATE]] = None,
on_mouse_over: Optional[EventType[[], BASE_STATE]] = None,
on_mouse_up: Optional[EventType[[], BASE_STATE]] = None,
on_open_change: Optional[EventType[[bool], BASE_STATE]] = None,
on_open_change: Optional[
Union[EventType[[], BASE_STATE], EventType[[bool], BASE_STATE]]
] = None,
on_scroll: Optional[EventType[[], BASE_STATE]] = None,
on_unmount: Optional[EventType[[], BASE_STATE]] = None,
**props,
Expand Down
Loading
Loading