reflex 0.7.14a5__py3-none-any.whl → 0.8.0a1__py3-none-any.whl

reflex/compiler/utils.py

@@ -11,22 +11,15 @@ from pathlib import Path
 from typing import Any
 from urllib.parse import urlparse
 
-from pydantic.v1.fields import ModelField
-
 from reflex import constants
-from reflex.components.base import (
-    Body,
-    Description,
-    DocumentHead,
-    Head,
-    Html,
-    Image,
-    Main,
-    Meta,
-    NextScript,
-    Title,
-)
+from reflex.components.base import Description, Image, Scripts
+from reflex.components.base.document import Links, ScrollRestoration
+from reflex.components.base.document import Meta as ReactMeta
 from reflex.components.component import Component, ComponentStyle, CustomComponent
+from reflex.components.el.elements.metadata import Head, Meta, Title
+from reflex.components.el.elements.other import Html
+from reflex.components.el.elements.sectioning import Body
+from reflex.constants.state import FIELD_MARKER
 from reflex.istate.storage import Cookie, LocalStorage, SessionStorage
 from reflex.state import BaseState, _resolve_delta
 from reflex.style import Style
@@ -34,7 +27,7 @@ from reflex.utils import console, format, imports, path_ops
 from reflex.utils.exec import is_in_app_harness
 from reflex.utils.imports import ImportVar, ParsedImportDict
 from reflex.utils.prerequisites import get_web_dir
-from reflex.vars.base import Var
+from reflex.vars.base import Field, Var
 
 # To re-export this function.
 merge_imports = imports.merge_imports
@@ -212,7 +205,7 @@ def compile_state(state: type[BaseState]) -> dict:
 
 
 def _compile_client_storage_field(
-    field: ModelField,
+    field: Field,
 ) -> tuple[
     type[Cookie] | type[LocalStorage] | type[SessionStorage] | None,
     dict[str, Any] | None,
@@ -260,7 +253,7 @@ def _compile_client_storage_recursive(
         if name in state.inherited_vars:
             # only include vars defined in this state
             continue
-        state_key = f"{state_name}.{name}"
+        state_key = f"{state_name}.{name}" + FIELD_MARKER
         field_type, options = _compile_client_storage_field(field)
         if field_type is Cookie:
             cookies[state_key] = options
@@ -320,6 +313,8 @@ def compile_custom_component(
         if lib != component.library
     }
 
+    imports.setdefault("@emotion/react", []).append(ImportVar("jsx"))
+
     # Concatenate the props.
     props = list(component.props)
 
@@ -352,12 +347,27 @@ def create_document_root(
     Returns:
         The document root.
     """
-    head_components = head_components or []
+    head_components = [
+        *(
+            head_components
+            or [
+                # Default meta tags if user does not provide.
+                Meta.create(char_set="utf-8"),
+                Meta.create(
+                    name="viewport", content="width=device-width, initial-scale=1"
+                ),
+            ]
+        ),
+        # Always include the framework meta and link tags.
+        ReactMeta.create(),
+        Links.create(),
+    ]
     return Html.create(
-        DocumentHead.create(*head_components),
+        Head.create(*head_components),
         Body.create(
-            Main.create(),
-            NextScript.create(),
+            Var("children"),
+            ScrollRestoration.create(),
+            Scripts.create(),
         ),
         lang=html_lang or "en",
         custom_attrs=html_custom_attrs or {},
@@ -391,6 +401,21 @@ def create_theme(style: ComponentStyle) -> dict:
     return {"styles": {"global": root_style}}
 
 
+def _format_route_part(part: str) -> str:
+    if part.startswith("[") and part.endswith("]"):
+        return f"${part}_"
+    return "[" + part + "]_"
+
+
+def _path_to_file_stem(path: str) -> str:
+    if path == "index":
+        return "_index"
+    path = path if path != "index" else "/"
+    return (
+        ".".join([_format_route_part(part) for part in path.split("/")]) + "._index"
+    ).lstrip(".")
+
+
 def get_page_path(path: str) -> str:
     """Get the path of the compiled JS file for the given page.
 
@@ -400,7 +425,12 @@ def get_page_path(path: str) -> str:
     Returns:
         The path of the compiled JS file.
     """
-    return str(get_web_dir() / constants.Dirs.PAGES / (path + constants.Ext.JS))
+    return str(
+        get_web_dir()
+        / constants.Dirs.PAGES
+        / constants.Dirs.ROUTES
+        / (_path_to_file_stem(path) + constants.Ext.JS)
+    )
 
 
 def get_theme_path() -> str:
@@ -492,12 +522,8 @@ def add_meta(
         children.append(Description.create(content=description))
     children.append(Image.create(content=image))
 
-    page.children.append(
-        Head.create(
-            *children,
-            *meta_tags,
-        )
-    )
+    page.children.extend(children)
+    page.children.extend(meta_tags)
 
     return page
 

reflex/components/__init__.py

@@ -15,7 +15,6 @@ _SUBMODULES: set[str] = {
     "radix",
     "react_player",
     "sonner",
-    "suneditor",
     "el",
     "base",
     "recharts",
@@ -26,7 +25,6 @@ _SUBMOD_ATTRS: dict[str, list[str]] = {
         "Component",
         "NoSSRComponent",
     ],
-    "next": ["NextLink", "next_link"],
 }
 __getattr__, __dir__, __all__ = lazy_loader.attach(
     __name__,

reflex/components/__init__.pyi

@@ -16,8 +16,5 @@ from . import radix as radix
 from . import react_player as react_player
 from . import recharts as recharts
 from . import sonner as sonner
-from . import suneditor as suneditor
 from .component import Component as Component
 from .component import NoSSRComponent as NoSSRComponent
-from .next import NextLink as NextLink
-from .next import next_link as next_link

reflex/components/base/__init__.py

@@ -8,7 +8,7 @@ _SUBMODULES: set[str] = {"app_wrap", "bare"}
 
 _SUBMOD_ATTRS: dict[str, list[str]] = {
     "body": ["Body"],
-    "document": ["DocumentHead", "Html", "Main", "NextScript"],
+    "document": ["Scripts", "Outlet", "ScrollRestoration", "Links", "Meta"],
     "fragment": [
         "Fragment",
         "fragment",
@@ -17,10 +17,6 @@ _SUBMOD_ATTRS: dict[str, list[str]] = {
         "ErrorBoundary",
         "error_boundary",
     ],
-    "head": [
-        "head",
-        "Head",
-    ],
     "link": ["RawLink", "ScriptTag"],
     "meta": ["Description", "Image", "Meta", "Title"],
     "script": ["Script", "script"],

reflex/components/base/__init__.pyi

@@ -6,16 +6,14 @@
 from . import app_wrap as app_wrap
 from . import bare as bare
 from .body import Body as Body
-from .document import DocumentHead as DocumentHead
-from .document import Html as Html
-from .document import Main as Main
-from .document import NextScript as NextScript
+from .document import Links as Links
+from .document import Outlet as Outlet
+from .document import Scripts as Scripts
+from .document import ScrollRestoration as ScrollRestoration
 from .error_boundary import ErrorBoundary as ErrorBoundary
 from .error_boundary import error_boundary as error_boundary
 from .fragment import Fragment as Fragment
 from .fragment import fragment as fragment
-from .head import Head as Head
-from .head import head as head
 from .link import RawLink as RawLink
 from .link import ScriptTag as ScriptTag
 from .meta import Description as Description

reflex/components/base/app_wrap.pyi

@@ -8,7 +8,7 @@ from typing import Any, overload
 
 from reflex.components.base.fragment import Fragment
 from reflex.components.core.breakpoints import Breakpoints
-from reflex.event import EventType
+from reflex.event import EventType, PointerEventInfo
 from reflex.vars.base import Var
 
 class AppWrap(Fragment):
@@ -29,9 +29,9 @@ class AppWrap(Fragment):
         autofocus: bool | None = None,
         custom_attrs: dict[str, Var | Any] | None = None,
         on_blur: EventType[()] | None = None,
-        on_click: EventType[()] | None = None,
-        on_context_menu: EventType[()] | None = None,
-        on_double_click: EventType[()] | None = None,
+        on_click: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_context_menu: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_double_click: EventType[()] | EventType[PointerEventInfo] | None = None,
         on_focus: EventType[()] | None = None,
         on_mount: EventType[()] | None = None,
         on_mouse_down: EventType[()] | None = None,
@@ -42,6 +42,7 @@ class AppWrap(Fragment):
         on_mouse_over: EventType[()] | None = None,
         on_mouse_up: EventType[()] | None = None,
         on_scroll: EventType[()] | None = None,
+        on_scroll_end: EventType[()] | None = None,
         on_unmount: EventType[()] | None = None,
         **props,
     ) -> AppWrap:

reflex/components/base/body.pyi

@@ -8,7 +8,7 @@ from typing import Any, Literal, overload
 
 from reflex.components.core.breakpoints import Breakpoints
 from reflex.components.el import elements
-from reflex.event import EventType
+from reflex.event import EventType, PointerEventInfo
 from reflex.vars.base import Var
 
 class Body(elements.Body):
@@ -207,9 +207,9 @@ class Body(elements.Body):
         autofocus: bool | None = None,
         custom_attrs: dict[str, Var | Any] | None = None,
         on_blur: EventType[()] | None = None,
-        on_click: EventType[()] | None = None,
-        on_context_menu: EventType[()] | None = None,
-        on_double_click: EventType[()] | None = None,
+        on_click: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_context_menu: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_double_click: EventType[()] | EventType[PointerEventInfo] | None = None,
         on_focus: EventType[()] | None = None,
         on_mount: EventType[()] | None = None,
         on_mouse_down: EventType[()] | None = None,
@@ -220,6 +220,7 @@ class Body(elements.Body):
         on_mouse_over: EventType[()] | None = None,
         on_mouse_up: EventType[()] | None = None,
         on_scroll: EventType[()] | None = None,
+        on_scroll_end: EventType[()] | None = None,
         on_unmount: EventType[()] | None = None,
         **props,
     ) -> Body:

reflex/components/base/document.py

@@ -3,33 +3,37 @@
 from reflex.components.component import Component
 
 
-class NextDocumentLib(Component):
+class ReactRouterLib(Component):
     """Root document components."""
 
-    library = "next/document"
+    library = "react-router"
 
 
-class Html(NextDocumentLib):
-    """The document html."""
+class Meta(ReactRouterLib):
+    """The document meta tags."""
 
-    tag = "Html"
+    tag = "Meta"
 
-    lang: str | None
 
+class Links(ReactRouterLib):
+    """The document link tags."""
 
-class DocumentHead(NextDocumentLib):
-    """The document head."""
+    tag = "Links"
 
-    tag = "Head"
 
+class ScrollRestoration(ReactRouterLib):
+    """The document scroll restoration."""
 
-class Main(NextDocumentLib):
-    """The document main section."""
+    tag = "ScrollRestoration"
 
-    tag = "Main"
 
+class Outlet(ReactRouterLib):
+    """The document outlet."""
 
-class NextScript(NextDocumentLib):
+    tag = "Outlet"
+
+
+class Scripts(ReactRouterLib):
     """The document main scripts."""
 
-    tag = "NextScript"
+    tag = "Scripts"

reflex/components/base/document.pyi

@@ -8,10 +8,10 @@ from typing import Any, overload
 
 from reflex.components.component import Component
 from reflex.components.core.breakpoints import Breakpoints
-from reflex.event import EventType
+from reflex.event import EventType, PointerEventInfo
 from reflex.vars.base import Var
 
-class NextDocumentLib(Component):
+class ReactRouterLib(Component):
     @overload
     @classmethod
     def create(  # type: ignore
@@ -29,9 +29,9 @@ class NextDocumentLib(Component):
         autofocus: bool | None = None,
         custom_attrs: dict[str, Var | Any] | None = None,
         on_blur: EventType[()] | None = None,
-        on_click: EventType[()] | None = None,
-        on_context_menu: EventType[()] | None = None,
-        on_double_click: EventType[()] | None = None,
+        on_click: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_context_menu: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_double_click: EventType[()] | EventType[PointerEventInfo] | None = None,
         on_focus: EventType[()] | None = None,
         on_mount: EventType[()] | None = None,
         on_mouse_down: EventType[()] | None = None,
@@ -42,9 +42,10 @@ class NextDocumentLib(Component):
         on_mouse_over: EventType[()] | None = None,
         on_mouse_up: EventType[()] | None = None,
         on_scroll: EventType[()] | None = None,
+        on_scroll_end: EventType[()] | None = None,
         on_unmount: EventType[()] | None = None,
         **props,
-    ) -> NextDocumentLib:
+    ) -> ReactRouterLib:
         """Create the component.
 
         Args:
@@ -62,13 +63,12 @@ class NextDocumentLib(Component):
             The component.
         """
 
-class Html(NextDocumentLib):
+class Meta(ReactRouterLib):
     @overload
     @classmethod
     def create(  # type: ignore
         cls,
         *children,
-        lang: str | None = None,
         style: Sequence[Mapping[str, Any]]
         | Mapping[str, Any]
         | Var[Mapping[str, Any]]
@@ -81,9 +81,9 @@ class Html(NextDocumentLib):
         autofocus: bool | None = None,
         custom_attrs: dict[str, Var | Any] | None = None,
         on_blur: EventType[()] | None = None,
-        on_click: EventType[()] | None = None,
-        on_context_menu: EventType[()] | None = None,
-        on_double_click: EventType[()] | None = None,
+        on_click: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_context_menu: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_double_click: EventType[()] | EventType[PointerEventInfo] | None = None,
         on_focus: EventType[()] | None = None,
         on_mount: EventType[()] | None = None,
         on_mouse_down: EventType[()] | None = None,
@@ -94,9 +94,10 @@ class Html(NextDocumentLib):
         on_mouse_over: EventType[()] | None = None,
         on_mouse_up: EventType[()] | None = None,
         on_scroll: EventType[()] | None = None,
+        on_scroll_end: EventType[()] | None = None,
         on_unmount: EventType[()] | None = None,
         **props,
-    ) -> Html:
+    ) -> Meta:
         """Create the component.
 
         Args:
@@ -114,7 +115,7 @@ class Html(NextDocumentLib):
             The component.
         """
 
-class DocumentHead(NextDocumentLib):
+class Links(ReactRouterLib):
     @overload
     @classmethod
     def create(  # type: ignore
@@ -132,9 +133,9 @@ class DocumentHead(NextDocumentLib):
         autofocus: bool | None = None,
         custom_attrs: dict[str, Var | Any] | None = None,
         on_blur: EventType[()] | None = None,
-        on_click: EventType[()] | None = None,
-        on_context_menu: EventType[()] | None = None,
-        on_double_click: EventType[()] | None = None,
+        on_click: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_context_menu: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_double_click: EventType[()] | EventType[PointerEventInfo] | None = None,
         on_focus: EventType[()] | None = None,
         on_mount: EventType[()] | None = None,
         on_mouse_down: EventType[()] | None = None,
@@ -145,9 +146,10 @@ class DocumentHead(NextDocumentLib):
         on_mouse_over: EventType[()] | None = None,
         on_mouse_up: EventType[()] | None = None,
         on_scroll: EventType[()] | None = None,
+        on_scroll_end: EventType[()] | None = None,
         on_unmount: EventType[()] | None = None,
         **props,
-    ) -> DocumentHead:
+    ) -> Links:
         """Create the component.
 
         Args:
@@ -165,7 +167,7 @@ class DocumentHead(NextDocumentLib):
             The component.
         """
 
-class Main(NextDocumentLib):
+class ScrollRestoration(ReactRouterLib):
     @overload
     @classmethod
     def create(  # type: ignore
@@ -183,9 +185,9 @@ class Main(NextDocumentLib):
         autofocus: bool | None = None,
         custom_attrs: dict[str, Var | Any] | None = None,
         on_blur: EventType[()] | None = None,
-        on_click: EventType[()] | None = None,
-        on_context_menu: EventType[()] | None = None,
-        on_double_click: EventType[()] | None = None,
+        on_click: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_context_menu: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_double_click: EventType[()] | EventType[PointerEventInfo] | None = None,
         on_focus: EventType[()] | None = None,
         on_mount: EventType[()] | None = None,
         on_mouse_down: EventType[()] | None = None,
@@ -196,9 +198,10 @@ class Main(NextDocumentLib):
         on_mouse_over: EventType[()] | None = None,
         on_mouse_up: EventType[()] | None = None,
         on_scroll: EventType[()] | None = None,
+        on_scroll_end: EventType[()] | None = None,
         on_unmount: EventType[()] | None = None,
         **props,
-    ) -> Main:
+    ) -> ScrollRestoration:
         """Create the component.
 
         Args:
@@ -216,7 +219,7 @@ class Main(NextDocumentLib):
             The component.
         """
 
-class NextScript(NextDocumentLib):
+class Outlet(ReactRouterLib):
     @overload
     @classmethod
     def create(  # type: ignore
@@ -234,9 +237,9 @@ class NextScript(NextDocumentLib):
         autofocus: bool | None = None,
         custom_attrs: dict[str, Var | Any] | None = None,
         on_blur: EventType[()] | None = None,
-        on_click: EventType[()] | None = None,
-        on_context_menu: EventType[()] | None = None,
-        on_double_click: EventType[()] | None = None,
+        on_click: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_context_menu: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_double_click: EventType[()] | EventType[PointerEventInfo] | None = None,
         on_focus: EventType[()] | None = None,
         on_mount: EventType[()] | None = None,
         on_mouse_down: EventType[()] | None = None,
@@ -247,9 +250,62 @@ class NextScript(NextDocumentLib):
         on_mouse_over: EventType[()] | None = None,
         on_mouse_up: EventType[()] | None = None,
         on_scroll: EventType[()] | None = None,
+        on_scroll_end: EventType[()] | None = None,
         on_unmount: EventType[()] | None = None,
         **props,
-    ) -> NextScript:
+    ) -> Outlet:
+        """Create the component.
+
+        Args:
+            *children: The children of the component.
+            style: The style of the component.
+            key: A unique key for the component.
+            id: The id for the component.
+            ref: The Var to pass as the ref to the component.
+            class_name: The class name for the component.
+            autofocus: Whether the component should take the focus once the page is loaded
+            custom_attrs: custom attribute
+            **props: The props of the component.
+
+        Returns:
+            The component.
+        """
+
+class Scripts(ReactRouterLib):
+    @overload
+    @classmethod
+    def create(  # type: ignore
+        cls,
+        *children,
+        style: Sequence[Mapping[str, Any]]
+        | Mapping[str, Any]
+        | Var[Mapping[str, Any]]
+        | Breakpoints
+        | None = None,
+        key: Any | None = None,
+        id: Any | None = None,
+        ref: Var | None = None,
+        class_name: Any | None = None,
+        autofocus: bool | None = None,
+        custom_attrs: dict[str, Var | Any] | None = None,
+        on_blur: EventType[()] | None = None,
+        on_click: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_context_menu: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_double_click: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_focus: EventType[()] | None = None,
+        on_mount: EventType[()] | None = None,
+        on_mouse_down: EventType[()] | None = None,
+        on_mouse_enter: EventType[()] | None = None,
+        on_mouse_leave: EventType[()] | None = None,
+        on_mouse_move: EventType[()] | None = None,
+        on_mouse_out: EventType[()] | None = None,
+        on_mouse_over: EventType[()] | None = None,
+        on_mouse_up: EventType[()] | None = None,
+        on_scroll: EventType[()] | None = None,
+        on_scroll_end: EventType[()] | None = None,
+        on_unmount: EventType[()] | None = None,
+        **props,
+    ) -> Scripts:
         """Create the component.
 
         Args:

reflex/components/base/error_boundary.pyi

@@ -8,7 +8,7 @@ from typing import Any, overload
 
 from reflex.components.component import Component
 from reflex.components.core.breakpoints import Breakpoints
-from reflex.event import EventType
+from reflex.event import EventType, PointerEventInfo
 from reflex.vars.base import Var
 from reflex.vars.object import ObjectVar
 
@@ -35,9 +35,9 @@ class ErrorBoundary(Component):
         autofocus: bool | None = None,
         custom_attrs: dict[str, Var | Any] | None = None,
         on_blur: EventType[()] | None = None,
-        on_click: EventType[()] | None = None,
-        on_context_menu: EventType[()] | None = None,
-        on_double_click: EventType[()] | None = None,
+        on_click: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_context_menu: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_double_click: EventType[()] | EventType[PointerEventInfo] | None = None,
         on_error: EventType[()] | EventType[str] | EventType[str, str] | None = None,
         on_focus: EventType[()] | None = None,
         on_mount: EventType[()] | None = None,
@@ -49,6 +49,7 @@ class ErrorBoundary(Component):
         on_mouse_over: EventType[()] | None = None,
         on_mouse_up: EventType[()] | None = None,
         on_scroll: EventType[()] | None = None,
+        on_scroll_end: EventType[()] | None = None,
         on_unmount: EventType[()] | None = None,
         **props,
     ) -> ErrorBoundary:

reflex/components/base/fragment.pyi

@@ -8,7 +8,7 @@ from typing import Any, overload
 
 from reflex.components.component import Component
 from reflex.components.core.breakpoints import Breakpoints
-from reflex.event import EventType
+from reflex.event import EventType, PointerEventInfo
 from reflex.vars.base import Var
 
 class Fragment(Component):
@@ -29,9 +29,9 @@ class Fragment(Component):
         autofocus: bool | None = None,
         custom_attrs: dict[str, Var | Any] | None = None,
         on_blur: EventType[()] | None = None,
-        on_click: EventType[()] | None = None,
-        on_context_menu: EventType[()] | None = None,
-        on_double_click: EventType[()] | None = None,
+        on_click: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_context_menu: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_double_click: EventType[()] | EventType[PointerEventInfo] | None = None,
         on_focus: EventType[()] | None = None,
         on_mount: EventType[()] | None = None,
         on_mouse_down: EventType[()] | None = None,
@@ -42,6 +42,7 @@ class Fragment(Component):
         on_mouse_over: EventType[()] | None = None,
         on_mouse_up: EventType[()] | None = None,
         on_scroll: EventType[()] | None = None,
+        on_scroll_end: EventType[()] | None = None,
         on_unmount: EventType[()] | None = None,
         **props,
     ) -> Fragment:

reflex/components/base/link.pyi

@@ -8,7 +8,7 @@ from typing import Any, Literal, overload
 
 from reflex.components.core.breakpoints import Breakpoints
 from reflex.components.el.elements.base import BaseHTML
-from reflex.event import EventType
+from reflex.event import EventType, PointerEventInfo
 from reflex.vars.base import Var
 
 class RawLink(BaseHTML):
@@ -209,9 +209,9 @@ class RawLink(BaseHTML):
         autofocus: bool | None = None,
         custom_attrs: dict[str, Var | Any] | None = None,
         on_blur: EventType[()] | None = None,
-        on_click: EventType[()] | None = None,
-        on_context_menu: EventType[()] | None = None,
-        on_double_click: EventType[()] | None = None,
+        on_click: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_context_menu: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_double_click: EventType[()] | EventType[PointerEventInfo] | None = None,
         on_focus: EventType[()] | None = None,
         on_mount: EventType[()] | None = None,
         on_mouse_down: EventType[()] | None = None,
@@ -222,6 +222,7 @@ class RawLink(BaseHTML):
         on_mouse_over: EventType[()] | None = None,
         on_mouse_up: EventType[()] | None = None,
         on_scroll: EventType[()] | None = None,
+        on_scroll_end: EventType[()] | None = None,
         on_unmount: EventType[()] | None = None,
         **props,
     ) -> RawLink:
@@ -463,9 +464,9 @@ class ScriptTag(BaseHTML):
         autofocus: bool | None = None,
         custom_attrs: dict[str, Var | Any] | None = None,
         on_blur: EventType[()] | None = None,
-        on_click: EventType[()] | None = None,
-        on_context_menu: EventType[()] | None = None,
-        on_double_click: EventType[()] | None = None,
+        on_click: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_context_menu: EventType[()] | EventType[PointerEventInfo] | None = None,
+        on_double_click: EventType[()] | EventType[PointerEventInfo] | None = None,
         on_focus: EventType[()] | None = None,
         on_mount: EventType[()] | None = None,
         on_mouse_down: EventType[()] | None = None,
@@ -476,6 +477,7 @@ class ScriptTag(BaseHTML):
         on_mouse_over: EventType[()] | None = None,
         on_mouse_up: EventType[()] | None = None,
         on_scroll: EventType[()] | None = None,
+        on_scroll_end: EventType[()] | None = None,
         on_unmount: EventType[()] | None = None,
         **props,
     ) -> ScriptTag: