From ea15b184c008f06f3205884e85dd4fb2269158e8 Mon Sep 17 00:00:00 2001
From: Khaleel Al-Adhami <khaleel.aladhami@gmail.com>
Date: Mon, 26 Aug 2024 13:28:18 -0700
Subject: [PATCH] fully migrate vars into new system (#3743)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fully migrate vars into new system
* i hate rufffff (no i don't)
* fix silly pright issues (except colormode and state)
* remove all instances of Var.create
* create immutable callable var and get rid of more base vars
* implement hash for all functions
* get reflex-web to compile
* get it to compile reflex-web successfully
* fix tests
* fix pyi
* use override from typing_extension
* put plotly inside of a catch
* dicts are unusable sadly
* fix silly mistake
* overload equals to special case immutable var
* improve test_cond
* solve more CI issues, down to 94 failures
* down to 20 errors
* down to 13 errors
* pass all testcases
* fix pyright issues
* reorder things
* use get origin more
* use fixed_type logic
* various optimizations
* go back to passing test cases
* use less boilerplate
* remove unnecessary print message
* remove weird comment
* add test for html issue
* add type ignore
* fix another silly issue
* override get all var data for var operations call
* make integration tests pass
* fix immutable call var
* better logic for finding parent class
* use even better logic for finding state wrt computedvar
* only choose the ones that are defined in the same module
* small dict to large dict
* [REF-3591] Remove chakra-related files from immutable vars PR (#3821)
* Add comments to html metadata component (#3731)
* fix: add verification for path /404 (#3723)
Co-authored-by: coolstorm <manas.gupta@fampay.in>
* Use the new state name when setting `is_hydrated` to false (#3738)
* Use `._is_mutable()` to account for parent state proxy (#3739)
When a parent state proxy is set, also allow child StateProxy._self_mutable to
override the parent's `_is_mutable()`.
* bump to 0.5.9 (#3746)
* add message when installing requirements.txt is needed for chosen template during init (#3750)
* #3752 bugfix add domain for XAxis (#3764)
* fix appharness app_source typing (#3777)
* fix import clash between connectionToaster and hooks.useState (#3749)
* use different registry when in china, fixes #3700 (#3702)
* do not reload compilation if using local app in AppHarness (#3790)
* do not reload if using local app
* Update reflex/testing.py
Co-authored-by: Masen Furer <m_github@0x26.net>
---------
Co-authored-by: Masen Furer <m_github@0x26.net>
* Bump memory on relevant actions (#3781)
Co-authored-by: Alek Petuskey <alekpetuskey@Aleks-MacBook-Pro.local>
* [REF-3334] Validate Toast Props (#3793)
* [REF-3536][REF-3537][REF-3541] Move chakra components into its repo(reflex-chakra) (#3798)
* fix get_uuid_string_var (#3795)
* minor State cleanup (#3768)
* Fix code wrap in markdown (#3755)
---------
Co-authored-by: Alek Petuskey <alek@pynecone.io>
Co-authored-by: Manas Gupta <53006261+Manas1820@users.noreply.github.com>
Co-authored-by: coolstorm <manas.gupta@fampay.in>
Co-authored-by: Thomas Brandého <thomas.brandeho@gmail.com>
Co-authored-by: Shubhankar Dimri <dimrishubhi@gmail.com>
Co-authored-by: benedikt-bartscher <31854409+benedikt-bartscher@users.noreply.github.com>
Co-authored-by: Khaleel Al-Adhami <khaleel.aladhami@gmail.com>
Co-authored-by: Alek Petuskey <alekpetuskey@Aleks-MacBook-Pro.local>
Co-authored-by: Elijah Ahianyo <elijahahianyo@gmail.com>
* pyproject.toml: bump to 0.6.0a1
* pyproject.toml: depend on reflex-chakra>=0.6.0a
New Var system support in reflex-chakra 0.6.0a1
* poetry.lock: relock dependencies
* integration: bump listening timeout to 1200 seconds
* integration: bump listening timeout to 1800 seconds
* Use cached_var_no_lock to avoid ImmutableVar deadlocks (#3835)
* Use cached_var_no_lock to avoid ImmutableVar deadlocks
ImmutableVar subclasses will always return the same value for a _var_name or
_get_all_var_data so there is no need to use a per-class lock to protect a
cached attribute on an instance, and doing so actually is observed to cause
deadlocks when a particular _cached_var_name creates new LiteralVar instances
and attempts to serialize them.
* remove unused module global
---------
Co-authored-by: Masen Furer <m_github@0x26.net>
Co-authored-by: Alek Petuskey <alek@pynecone.io>
Co-authored-by: Manas Gupta <53006261+Manas1820@users.noreply.github.com>
Co-authored-by: coolstorm <manas.gupta@fampay.in>
Co-authored-by: Thomas Brandého <thomas.brandeho@gmail.com>
Co-authored-by: Shubhankar Dimri <dimrishubhi@gmail.com>
Co-authored-by: benedikt-bartscher <31854409+benedikt-bartscher@users.noreply.github.com>
Co-authored-by: Alek Petuskey <alekpetuskey@Aleks-MacBook-Pro.local>
Co-authored-by: Elijah Ahianyo <elijahahianyo@gmail.com>
---
integration/test_form_submit.py | 2 +
integration/test_tailwind.py | 2 +-
integration/test_var_operations.py | 23 +-
poetry.lock | 18 +-
pyproject.toml | 4 +-
reflex/__init__.py | 3 +-
reflex/__init__.pyi | 2 +-
reflex/app.py | 8 +-
reflex/base.py | 5 +-
reflex/compiler/compiler.py | 3 +-
reflex/components/base/app_wrap.py | 6 +-
reflex/components/base/app_wrap.pyi | 42 +-
reflex/components/base/bare.py | 9 +-
reflex/components/base/body.pyi | 42 +-
reflex/components/base/document.pyi | 202 +-
reflex/components/base/error_boundary.py | 16 +-
reflex/components/base/error_boundary.pyi | 46 +-
reflex/components/base/fragment.pyi | 42 +-
reflex/components/base/head.pyi | 82 +-
reflex/components/base/link.pyi | 82 +-
reflex/components/base/meta.pyi | 162 +-
reflex/components/base/script.py | 3 +-
reflex/components/base/script.pyi | 54 +-
reflex/components/component.py | 122 +-
reflex/components/core/banner.py | 119 +-
reflex/components/core/banner.pyi | 274 +--
.../components/core/client_side_routing.pyi | 82 +-
reflex/components/core/clipboard.pyi | 46 +-
reflex/components/core/cond.py | 57 +-
reflex/components/core/debounce.pyi | 46 +-
reflex/components/core/foreach.py | 3 +-
reflex/components/core/html.pyi | 42 +-
reflex/components/core/match.py | 72 +-
reflex/components/core/upload.py | 40 +-
reflex/components/core/upload.pyi | 183 +-
reflex/components/datadisplay/code.py | 79 +-
reflex/components/datadisplay/code.pyi | 44 +-
reflex/components/datadisplay/dataeditor.py | 5 +-
reflex/components/datadisplay/dataeditor.pyi | 76 +-
reflex/components/el/element.pyi | 42 +-
reflex/components/el/elements/base.pyi | 42 +-
reflex/components/el/elements/forms.py | 30 +-
reflex/components/el/elements/forms.pyi | 593 ++----
reflex/components/el/elements/inline.pyi | 1122 ++++-------
reflex/components/el/elements/media.pyi | 842 +++-----
reflex/components/el/elements/metadata.pyi | 242 +--
reflex/components/el/elements/other.pyi | 282 +--
reflex/components/el/elements/scripts.pyi | 122 +-
reflex/components/el/elements/sectioning.pyi | 602 +++---
reflex/components/el/elements/tables.pyi | 402 ++--
reflex/components/el/elements/typography.pyi | 602 +++---
reflex/components/gridjs/datatable.py | 20 +-
reflex/components/gridjs/datatable.pyi | 82 +-
reflex/components/lucide/icon.pyi | 82 +-
reflex/components/markdown/markdown.py | 46 +-
reflex/components/markdown/markdown.pyi | 67 +-
reflex/components/moment/moment.pyi | 46 +-
reflex/components/next/base.pyi | 42 +-
reflex/components/next/image.py | 4 -
reflex/components/next/image.pyi | 50 +-
reflex/components/next/link.pyi | 42 +-
reflex/components/next/video.pyi | 42 +-
reflex/components/plotly/plotly.pyi | 82 +-
.../components/radix/primitives/accordion.py | 11 +-
.../components/radix/primitives/accordion.pyi | 284 +--
reflex/components/radix/primitives/base.pyi | 82 +-
reflex/components/radix/primitives/drawer.pyi | 416 ++--
reflex/components/radix/primitives/form.pyi | 420 ++--
.../components/radix/primitives/progress.pyi | 202 +-
reflex/components/radix/primitives/slider.pyi | 206 +-
reflex/components/radix/themes/base.py | 12 +-
reflex/components/radix/themes/base.pyi | 282 +--
reflex/components/radix/themes/color_mode.py | 10 +-
reflex/components/radix/themes/color_mode.pyi | 134 +-
.../radix/themes/components/alert_dialog.pyi | 290 +--
.../radix/themes/components/aspect_ratio.pyi | 42 +-
.../radix/themes/components/avatar.pyi | 42 +-
.../radix/themes/components/badge.pyi | 42 +-
.../radix/themes/components/button.pyi | 42 +-
.../radix/themes/components/callout.pyi | 202 +-
.../radix/themes/components/card.pyi | 42 +-
.../radix/themes/components/checkbox.py | 5 +-
.../radix/themes/components/checkbox.pyi | 134 +-
.../themes/components/checkbox_cards.pyi | 82 +-
.../themes/components/checkbox_group.pyi | 82 +-
.../radix/themes/components/context_menu.pyi | 342 ++--
.../radix/themes/components/data_list.pyi | 162 +-
.../radix/themes/components/dialog.pyi | 296 ++-
.../radix/themes/components/dropdown_menu.pyi | 348 ++--
.../radix/themes/components/hover_card.pyi | 166 +-
.../radix/themes/components/icon_button.pyi | 42 +-
.../radix/themes/components/inset.pyi | 42 +-
.../radix/themes/components/popover.pyi | 176 +-
.../radix/themes/components/progress.pyi | 42 +-
.../radix/themes/components/radio.pyi | 42 +-
.../radix/themes/components/radio_cards.pyi | 84 +-
.../radix/themes/components/radio_group.py | 48 +-
.../radix/themes/components/radio_group.pyi | 166 +-
.../radix/themes/components/scroll_area.pyi | 42 +-
.../themes/components/segmented_control.pyi | 86 +-
.../radix/themes/components/select.pyi | 386 ++--
.../radix/themes/components/separator.py | 5 +-
.../radix/themes/components/separator.pyi | 42 +-
.../radix/themes/components/skeleton.pyi | 42 +-
.../radix/themes/components/slider.pyi | 48 +-
.../radix/themes/components/spinner.pyi | 42 +-
.../radix/themes/components/switch.pyi | 46 +-
.../radix/themes/components/table.pyi | 282 +--
.../radix/themes/components/tabs.pyi | 210 +-
.../radix/themes/components/text_area.pyi | 52 +-
.../radix/themes/components/text_field.py | 3 +-
.../radix/themes/components/text_field.pyi | 142 +-
.../radix/themes/components/tooltip.pyi | 48 +-
.../components/radix/themes/layout/base.pyi | 42 +-
reflex/components/radix/themes/layout/box.pyi | 42 +-
.../components/radix/themes/layout/center.pyi | 42 +-
.../radix/themes/layout/container.py | 5 +-
.../radix/themes/layout/container.pyi | 42 +-
.../components/radix/themes/layout/flex.pyi | 42 +-
.../components/radix/themes/layout/grid.pyi | 42 +-
.../components/radix/themes/layout/list.pyi | 202 +-
.../components/radix/themes/layout/section.py | 5 +-
.../radix/themes/layout/section.pyi | 42 +-
.../components/radix/themes/layout/spacer.pyi | 42 +-
.../components/radix/themes/layout/stack.pyi | 122 +-
.../radix/themes/typography/blockquote.pyi | 42 +-
.../radix/themes/typography/code.pyi | 42 +-
.../radix/themes/typography/heading.pyi | 42 +-
.../radix/themes/typography/link.pyi | 42 +-
.../radix/themes/typography/text.pyi | 282 +--
reflex/components/react_player/audio.pyi | 90 +-
.../components/react_player/react_player.pyi | 90 +-
reflex/components/react_player/video.pyi | 90 +-
reflex/components/recharts/cartesian.py | 40 +-
reflex/components/recharts/cartesian.pyi | 734 +++----
reflex/components/recharts/charts.py | 5 +-
reflex/components/recharts/charts.pyi | 432 ++--
reflex/components/recharts/general.py | 15 +-
reflex/components/recharts/general.pyi | 202 +-
reflex/components/recharts/polar.py | 21 +-
reflex/components/recharts/polar.pyi | 168 +-
reflex/components/recharts/recharts.pyi | 82 +-
reflex/components/sonner/toast.py | 15 +-
reflex/components/sonner/toast.pyi | 42 +-
reflex/components/suneditor/editor.pyi | 72 +-
reflex/components/tags/iter_tag.py | 21 +-
reflex/components/tags/tag.py | 13 +-
reflex/event.py | 77 +-
reflex/experimental/__init__.py | 2 -
reflex/experimental/client_state.py | 40 +-
reflex/experimental/layout.pyi | 204 +-
reflex/experimental/vars/base.py | 583 ------
reflex/experimental/vars/function.py | 290 ---
reflex/experimental/vars/number.py | 1458 --------------
.../{experimental/vars => ivars}/__init__.py | 0
reflex/ivars/base.py | 1794 +++++++++++++++++
reflex/ivars/function.py | 223 ++
reflex/ivars/number.py | 1203 +++++++++++
reflex/{experimental/vars => ivars}/object.py | 634 +++---
.../{experimental/vars => ivars}/sequence.py | 1428 ++++++-------
reflex/state.py | 69 +-
reflex/style.py | 68 +-
reflex/utils/format.py | 66 +-
reflex/utils/pyi_generator.py | 2 +-
reflex/utils/types.py | 10 +-
reflex/vars.py | 63 +-
reflex/vars.pyi | 5 +-
scripts/integration.sh | 2 +-
tests/components/base/test_bare.py | 15 +-
tests/components/base/test_script.py | 10 +-
tests/components/core/test_banner.py | 7 +-
tests/components/core/test_colors.py | 52 +-
tests/components/core/test_cond.py | 25 +-
tests/components/core/test_debounce.py | 14 +-
tests/components/core/test_foreach.py | 2 +-
tests/components/core/test_html.py | 23 +-
tests/components/core/test_match.py | 62 +-
tests/components/datadisplay/test_code.py | 2 +-
tests/components/forms/test_uploads.py | 36 +-
tests/components/media/test_image.py | 13 +-
tests/components/test_component.py | 132 +-
tests/components/test_component_state.py | 4 +-
tests/components/test_tag.py | 11 +-
tests/test_app.py | 8 +-
tests/test_event.py | 66 +-
tests/test_state.py | 48 +-
tests/test_style.py | 86 +-
tests/test_var.py | 56 +-
tests/utils/test_format.py | 27 +-
189 files changed, 11537 insertions(+), 14807 deletions(-)
delete mode 100644 reflex/experimental/vars/base.py
delete mode 100644 reflex/experimental/vars/function.py
delete mode 100644 reflex/experimental/vars/number.py
rename reflex/{experimental/vars => ivars}/__init__.py (100%)
create mode 100644 reflex/ivars/base.py
create mode 100644 reflex/ivars/function.py
create mode 100644 reflex/ivars/number.py
rename reflex/{experimental/vars => ivars}/object.py (55%)
rename reflex/{experimental/vars => ivars}/sequence.py (50%)
diff --git a/integration/test_form_submit.py b/integration/test_form_submit.py
index 7858cce7708..acc6bca964c 100644
--- a/integration/test_form_submit.py
+++ b/integration/test_form_submit.py
@@ -272,6 +272,8 @@ async def get_form_data():
form_data = format.collect_form_dict_names(form_data)
+ print(form_data)
+
assert form_data["name_input"] == "foo"
assert form_data["pin_input"] == pin_values
assert form_data["number_input"] == "-3"
diff --git a/integration/test_tailwind.py b/integration/test_tailwind.py
index 491eba53866..a3d90e64523 100644
--- a/integration/test_tailwind.py
+++ b/integration/test_tailwind.py
@@ -109,7 +109,7 @@ def test_tailwind_app(tailwind_app: AppHarness, tailwind_disabled: bool):
assert len(paragraphs) == 3
for p in paragraphs:
assert tailwind_app.poll_for_content(p, exp_not_equal="") == PARAGRAPH_TEXT
- assert p.value_of_css_property("font-family") == "monospace"
+ assert p.value_of_css_property("font-family") == '"monospace"'
if tailwind_disabled:
# expect default color, not "text-red-500" from tailwind utility class
assert p.value_of_css_property("color") not in TEXT_RED_500_COLOR
diff --git a/integration/test_var_operations.py b/integration/test_var_operations.py
index e88449b69ab..7a8f5473a68 100644
--- a/integration/test_var_operations.py
+++ b/integration/test_var_operations.py
@@ -17,6 +17,8 @@ def VarOperations():
import reflex_chakra as rc
import reflex as rx
+ from reflex.ivars.base import LiteralVar
+ from reflex.ivars.sequence import ArrayVar
class VarOperationState(rx.State):
int_var1: int = 10
@@ -31,8 +33,8 @@ class VarOperationState(rx.State):
str_var2: str = "second"
str_var3: str = "ThIrD"
str_var4: str = "a long string"
- dict1: Dict = {1: 2}
- dict2: Dict = {3: 4}
+ dict1: Dict[int, int] = {1: 2}
+ dict2: Dict[int, int] = {3: 4}
html_str: str = "<div>hello</div>"
app = rx.App(state=rx.State)
@@ -549,29 +551,29 @@ def index():
"second",
query=[VarOperationState.str_var2],
),
- rx.text(rx.Var.range(2, 5).join(","), id="list_join_range1"),
- rx.text(rx.Var.range(2, 10, 2).join(","), id="list_join_range2"),
- rx.text(rx.Var.range(5, 0, -1).join(","), id="list_join_range3"),
- rx.text(rx.Var.range(0, 3).join(","), id="list_join_range4"),
+ rx.text(ArrayVar.range(2, 5).join(","), id="list_join_range1"),
+ rx.text(ArrayVar.range(2, 10, 2).join(","), id="list_join_range2"),
+ rx.text(ArrayVar.range(5, 0, -1).join(","), id="list_join_range3"),
+ rx.text(ArrayVar.range(0, 3).join(","), id="list_join_range4"),
rx.box(
rx.foreach(
- rx.Var.range(0, 2),
+ ArrayVar.range(0, 2),
lambda x: rx.text(VarOperationState.list1[x], as_="p"),
),
id="foreach_list_arg",
),
rx.box(
rx.foreach(
- rx.Var.range(0, 2),
+ ArrayVar.range(0, 2),
lambda x, ix: rx.text(VarOperationState.list1[ix], as_="p"),
),
id="foreach_list_ix",
),
rx.box(
rx.foreach(
- rx.Var.create_safe(list(range(0, 3))).to(List[int]),
+ LiteralVar.create(list(range(0, 3))).to(ArrayVar, List[int]),
lambda x: rx.foreach(
- rx.Var.range(x),
+ ArrayVar.range(x),
lambda y: rx.text(VarOperationState.list1[y], as_="p"),
),
),
@@ -785,6 +787,7 @@ def test_var_operations(driver, var_operations: AppHarness):
]
for tag, expected in tests:
+ print(tag)
assert driver.find_element(By.ID, tag).text == expected
# Highlight component with var query (does not plumb ID)
diff --git a/poetry.lock b/poetry.lock
index bfcdc929b42..c67e72d6a6c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -779,13 +779,13 @@ license = ["ukkonen"]
[[package]]
name = "idna"
-version = "3.7"
+version = "3.8"
description = "Internationalized Domain Names in Applications (IDNA)"
optional = false
-python-versions = ">=3.5"
+python-versions = ">=3.6"
files = [
- {file = "idna-3.7-py3-none-any.whl", hash = "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"},
- {file = "idna-3.7.tar.gz", hash = "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc"},
+ {file = "idna-3.8-py3-none-any.whl", hash = "sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac"},
+ {file = "idna-3.8.tar.gz", hash = "sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603"},
]
[[package]]
@@ -2153,17 +2153,17 @@ ocsp = ["cryptography (>=36.0.1)", "pyopenssl (==20.0.1)", "requests (>=2.26.0)"
[[package]]
name = "reflex-chakra"
-version = "0.1.1a1"
+version = "0.6.0a1"
description = "reflex using chakra components"
optional = false
python-versions = "<4.0,>=3.8"
files = [
- {file = "reflex_chakra-0.1.1a1-py3-none-any.whl", hash = "sha256:e27a3ffb171802a5309a4a7215e7f894810a4a8f0753e2779b5a7010ef36173c"},
- {file = "reflex_chakra-0.1.1a1.tar.gz", hash = "sha256:f224d42255fde675a65a622cdb19bff0e073edafe94b15019bfd8b21a461801c"},
+ {file = "reflex_chakra-0.6.0a1-py3-none-any.whl", hash = "sha256:68c22e00591530c38acedb20ee9c192109a3591f3e58fb3a51c9e939b13c66ad"},
+ {file = "reflex_chakra-0.6.0a1.tar.gz", hash = "sha256:9061790bb59134cf2200461de45f582987cef29032f82864165a3c5badb86cf5"},
]
[package.dependencies]
-reflex = ">=0.5.9"
+reflex = ">=0.6.0a"
[[package]]
name = "reflex-hosting-cli"
@@ -3135,4 +3135,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools",
[metadata]
lock-version = "2.0"
python-versions = "^3.8"
-content-hash = "72701f0d9fa4a2b3501b0a412888c8e063c14108795cbe64b554a98440c4d2b2"
+content-hash = "4b609c46858e2a6766b9c9b759833a1366dbe7bb64b3332f339a9c9f713a870f"
diff --git a/pyproject.toml b/pyproject.toml
index bbe5a20f2cb..92a096f7bda 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "reflex"
-version = "0.5.9"
+version = "0.6.0a1"
description = "Web apps in pure Python."
license = "Apache-2.0"
authors = [
@@ -61,7 +61,7 @@ httpx = ">=0.25.1,<1.0"
twine = ">=4.0.0,<6.0"
tomlkit = ">=0.12.4,<1.0"
lazy_loader = ">=0.4"
-reflex-chakra = ">=0.1.1a1,<0.6"
+reflex-chakra = ">=0.6.0a"
[tool.poetry.group.dev.dependencies]
pytest = ">=7.1.2,<8.0"
diff --git a/reflex/__init__.py b/reflex/__init__.py
index a4f6dad3330..abfec245cc5 100644
--- a/reflex/__init__.py
+++ b/reflex/__init__.py
@@ -324,7 +324,7 @@
"style": ["Style", "toggle_color_mode"],
"utils.imports": ["ImportVar"],
"utils.serializers": ["serializer"],
- "vars": ["cached_var", "Var"],
+ "vars": ["Var"],
}
_SUBMODULES: set[str] = {
@@ -338,6 +338,7 @@
"testing",
"utils",
"vars",
+ "ivars",
"config",
"compiler",
}
diff --git a/reflex/__init__.pyi b/reflex/__init__.pyi
index 2c89545db3f..c7aefd41273 100644
--- a/reflex/__init__.pyi
+++ b/reflex/__init__.pyi
@@ -12,6 +12,7 @@ from . import compiler as compiler
from . import components as components
from . import config as config
from . import event as event
+from . import ivars as ivars
from . import model as model
from . import style as style
from . import testing as testing
@@ -189,7 +190,6 @@ from .style import toggle_color_mode as toggle_color_mode
from .utils.imports import ImportVar as ImportVar
from .utils.serializers import serializer as serializer
from .vars import Var as Var
-from .vars import cached_var as cached_var
del compat
RADIX_THEMES_MAPPING: dict
diff --git a/reflex/app.py b/reflex/app.py
index 69a5ff97824..5be0ef04013 100644
--- a/reflex/app.py
+++ b/reflex/app.py
@@ -442,7 +442,7 @@ def _generate_component(component: Component | ComponentCallable) -> Component:
raise
except TypeError as e:
message = str(e)
- if "BaseVar" in message or "ComputedVar" in message:
+ if "Var" in message:
raise VarOperationTypeError(
"You may be trying to use an invalid Python function on a state var. "
"When referencing a var inside your render code, only limited var operations are supported. "
@@ -527,9 +527,10 @@ def add_page(
self._enable_state()
else:
for var in component._get_vars(include_children=True):
- if not var._var_data:
+ var_data = var._get_all_var_data()
+ if not var_data:
continue
- if not var._var_data.state:
+ if not var_data.state:
continue
self._enable_state()
break
@@ -1113,6 +1114,7 @@ def _process_background(
Task if the event was backgroundable, otherwise None
"""
substate, handler = state._get_event_handler(event)
+
if not handler.is_background:
return None
diff --git a/reflex/base.py b/reflex/base.py
index 2eca6360032..5a2a6d2a983 100644
--- a/reflex/base.py
+++ b/reflex/base.py
@@ -110,14 +110,15 @@ def add_field(cls, var: Any, default_value: Any):
var: The variable to add a pydantic field for.
default_value: The default value of the field
"""
+ var_name = var._var_name.split(".")[-1]
new_field = ModelField.infer(
- name=var._var_name,
+ name=var_name,
value=default_value,
annotation=var._var_type,
class_validators=None,
config=cls.__config__, # type: ignore
)
- cls.__fields__.update({var._var_name: new_field})
+ cls.__fields__.update({var_name: new_field})
def get_value(self, key: str) -> Any:
"""Get the value of a field.
diff --git a/reflex/compiler/compiler.py b/reflex/compiler/compiler.py
index 4345e244ff4..525f75cfb06 100644
--- a/reflex/compiler/compiler.py
+++ b/reflex/compiler/compiler.py
@@ -17,6 +17,7 @@
StatefulComponent,
)
from reflex.config import get_config
+from reflex.ivars.base import ImmutableVar
from reflex.state import BaseState
from reflex.style import SYSTEM_COLOR_MODE
from reflex.utils.exec import is_prod_mode
@@ -80,7 +81,7 @@ def _compile_contexts(state: Optional[Type[BaseState]], theme: Component | None)
The compiled context file.
"""
appearance = getattr(theme, "appearance", None)
- if appearance is None or Var.create_safe(appearance)._var_name == "inherit":
+ if appearance is None or str(ImmutableVar.create_safe(appearance)) == "inherit":
appearance = SYSTEM_COLOR_MODE
last_compiled_time = str(datetime.now())
diff --git a/reflex/components/base/app_wrap.py b/reflex/components/base/app_wrap.py
index 76bf2d99be7..7d6a085b4ce 100644
--- a/reflex/components/base/app_wrap.py
+++ b/reflex/components/base/app_wrap.py
@@ -2,7 +2,7 @@
from reflex.components.base.fragment import Fragment
from reflex.components.component import Component
-from reflex.vars import Var
+from reflex.ivars.base import ImmutableVar
class AppWrap(Fragment):
@@ -15,6 +15,4 @@ def create(cls) -> Component:
Returns:
A new AppWrap component containing {children}.
"""
- return super().create(
- Var.create("{children}", _var_is_local=False, _var_is_string=False)
- )
+ return super().create(ImmutableVar.create("children"))
diff --git a/reflex/components/base/app_wrap.pyi b/reflex/components/base/app_wrap.pyi
index f57f46b026c..576f8cd69a5 100644
--- a/reflex/components/base/app_wrap.pyi
+++ b/reflex/components/base/app_wrap.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.base.fragment import Fragment
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class AppWrap(Fragment):
@overload
@@ -22,50 +22,40 @@ class AppWrap(Fragment):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AppWrap":
diff --git a/reflex/components/base/bare.py b/reflex/components/base/bare.py
index 0de7307dbce..dca9a928705 100644
--- a/reflex/components/base/bare.py
+++ b/reflex/components/base/bare.py
@@ -7,13 +7,14 @@
from reflex.components.component import Component
from reflex.components.tags import Tag
from reflex.components.tags.tagless import Tagless
+from reflex.ivars.base import ImmutableVar
from reflex.vars import Var
class Bare(Component):
"""A component with no tag."""
- contents: Var[str]
+ contents: Var[Any]
@classmethod
def create(cls, contents: Any) -> Component:
@@ -25,13 +26,17 @@ def create(cls, contents: Any) -> Component:
Returns:
The component.
"""
- if isinstance(contents, Var) and contents._var_data:
+ if isinstance(contents, ImmutableVar):
+ return cls(contents=contents)
+ if isinstance(contents, Var) and contents._get_all_var_data():
contents = contents.to(str)
else:
contents = str(contents) if contents is not None else ""
return cls(contents=contents) # type: ignore
def _render(self) -> Tag:
+ if isinstance(self.contents, ImmutableVar):
+ return Tagless(contents=f"{{{str(self.contents)}}}")
return Tagless(contents=str(self.contents))
def _get_vars(self, include_children: bool = False) -> Iterator[Var]:
diff --git a/reflex/components/base/body.pyi b/reflex/components/base/body.pyi
index 443712ac9ef..57ff1b7b7ab 100644
--- a/reflex/components/base/body.pyi
+++ b/reflex/components/base/body.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class Body(Component):
@overload
@@ -22,50 +22,40 @@ class Body(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Body":
diff --git a/reflex/components/base/document.pyi b/reflex/components/base/document.pyi
index 428decc8ea4..77065d84504 100644
--- a/reflex/components/base/document.pyi
+++ b/reflex/components/base/document.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class NextDocumentLib(Component):
@overload
@@ -22,50 +22,40 @@ class NextDocumentLib(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "NextDocumentLib":
@@ -99,50 +89,40 @@ class Html(NextDocumentLib):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Html":
@@ -175,50 +155,40 @@ class DocumentHead(NextDocumentLib):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DocumentHead":
@@ -251,50 +221,40 @@ class Main(NextDocumentLib):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Main":
@@ -327,50 +287,40 @@ class NextScript(NextDocumentLib):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "NextScript":
diff --git a/reflex/components/base/error_boundary.py b/reflex/components/base/error_boundary.py
index e90f0ed63be..058976498a8 100644
--- a/reflex/components/base/error_boundary.py
+++ b/reflex/components/base/error_boundary.py
@@ -9,6 +9,8 @@
from reflex.components.el import div, p
from reflex.constants import Hooks, Imports
from reflex.event import EventChain, EventHandler
+from reflex.ivars.base import ImmutableVar
+from reflex.ivars.function import FunctionVar
from reflex.utils.imports import ImportVar
from reflex.vars import Var
@@ -20,14 +22,14 @@ class ErrorBoundary(Component):
tag = "ErrorBoundary"
# Fired when the boundary catches an error.
- on_error: EventHandler[lambda error, info: [error, info]] = Var.create_safe( # type: ignore
- "logFrontendError", _var_is_string=False, _var_is_local=False
- ).to(EventChain)
+ on_error: EventHandler[lambda error, info: [error, info]] = ImmutableVar( # type: ignore
+ "logFrontendError"
+ ).to(FunctionVar, EventChain)
# Rendered instead of the children when an error is caught.
- Fallback_component: Var[Component] = Var.create_safe(
- "Fallback", _var_is_string=False, _var_is_local=False
- ).to(Component)
+ Fallback_component: Var[Component] = ImmutableVar.create_safe("Fallback")._replace(
+ _var_type=Component
+ )
def add_imports(self) -> dict[str, list[ImportVar]]:
"""Add imports for the component.
@@ -56,7 +58,7 @@ def add_custom_code(self) -> List[str]:
fallback_container = div(
p("Ooops...Unknown Reflex error has occured:"),
p(
- Var.create("error.message", _var_is_local=False, _var_is_string=False),
+ ImmutableVar.create("error.message"),
color="red",
),
p("Please contact the support."),
diff --git a/reflex/components/base/error_boundary.pyi b/reflex/components/base/error_boundary.pyi
index 5bc260b3cde..4777b09e992 100644
--- a/reflex/components/base/error_boundary.pyi
+++ b/reflex/components/base/error_boundary.pyi
@@ -9,7 +9,7 @@ from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
from reflex.utils.imports import ImportVar
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class ErrorBoundary(Component):
def add_imports(self) -> dict[str, list[ImportVar]]: ...
@@ -27,53 +27,41 @@ class ErrorBoundary(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_error: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_error: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ErrorBoundary":
diff --git a/reflex/components/base/fragment.pyi b/reflex/components/base/fragment.pyi
index 8c6f4c89196..fae72cc9c62 100644
--- a/reflex/components/base/fragment.pyi
+++ b/reflex/components/base/fragment.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class Fragment(Component):
@overload
@@ -22,50 +22,40 @@ class Fragment(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Fragment":
diff --git a/reflex/components/base/head.pyi b/reflex/components/base/head.pyi
index b5477259d0d..04145713781 100644
--- a/reflex/components/base/head.pyi
+++ b/reflex/components/base/head.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.component import Component, MemoizationLeaf
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class NextHeadLib(Component):
@overload
@@ -22,50 +22,40 @@ class NextHeadLib(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "NextHeadLib":
@@ -98,50 +88,40 @@ class Head(NextHeadLib, MemoizationLeaf):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Head":
diff --git a/reflex/components/base/link.pyi b/reflex/components/base/link.pyi
index ecee03ef2bd..80388a32724 100644
--- a/reflex/components/base/link.pyi
+++ b/reflex/components/base/link.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class RawLink(Component):
@overload
@@ -24,50 +24,40 @@ class RawLink(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "RawLink":
@@ -109,50 +99,40 @@ class ScriptTag(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ScriptTag":
diff --git a/reflex/components/base/meta.pyi b/reflex/components/base/meta.pyi
index 10e357a2eac..372d202f9dc 100644
--- a/reflex/components/base/meta.pyi
+++ b/reflex/components/base/meta.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class Title(Component):
def render(self) -> dict: ...
@@ -23,50 +23,40 @@ class Title(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Title":
@@ -104,50 +94,40 @@ class Meta(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Meta":
@@ -190,50 +170,40 @@ class Description(Meta):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Description":
@@ -276,50 +246,40 @@ class Image(Meta):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Image":
diff --git a/reflex/components/base/script.py b/reflex/components/base/script.py
index bef2f036b39..7b0596966c3 100644
--- a/reflex/components/base/script.py
+++ b/reflex/components/base/script.py
@@ -9,6 +9,7 @@
from reflex.components.component import Component
from reflex.event import EventHandler
+from reflex.ivars.base import LiteralVar
from reflex.vars import Var
@@ -31,7 +32,7 @@ class Script(Component):
# When the script will execute: afterInteractive (defer-like behavior) | beforeInteractive | lazyOnload (async-like behavior)
strategy: Var[Literal["afterInteractive", "beforeInteractive", "lazyOnload"]] = (
- Var.create_safe("afterInteractive", _var_is_string=True)
+ LiteralVar.create("afterInteractive")
)
# Triggered when the script is loading
diff --git a/reflex/components/base/script.pyi b/reflex/components/base/script.pyi
index 5165f5fd488..311485b660a 100644
--- a/reflex/components/base/script.pyi
+++ b/reflex/components/base/script.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class Script(Component):
@overload
@@ -29,59 +29,43 @@ class Script(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_error: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_load: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_error: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_load: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_ready: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_ready: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Script":
diff --git a/reflex/components/component.py b/reflex/components/component.py
index bb3e9053f27..0a9da1adca7 100644
--- a/reflex/components/component.py
+++ b/reflex/components/component.py
@@ -43,11 +43,12 @@
call_event_handler,
get_handler_args,
)
+from reflex.ivars.base import ImmutableVar, LiteralVar
from reflex.style import Style, format_as_emotion
from reflex.utils import console, format, imports, types
from reflex.utils.imports import ImportDict, ImportVar, ParsedImportDict, parse_imports
from reflex.utils.serializers import serializer
-from reflex.vars import BaseVar, Var, VarData
+from reflex.vars import BaseVar, ImmutableVarData, Var, VarData
class BaseComponent(Base, ABC):
@@ -320,9 +321,8 @@ def __init_subclass__(cls, **kwargs):
# Set default values for any props.
if types._issubclass(field.type_, Var):
field.required = False
- field.default = Var.create(
- field.default, _var_is_string=isinstance(field.default, str)
- )
+ if field.default is not None:
+ field.default = LiteralVar.create(field.default)
elif types._issubclass(field.type_, EventHandler):
field.required = False
@@ -351,10 +351,7 @@ def __init__(self, *args, **kwargs):
"id": kwargs.get("id"),
"children": children,
**{
- prop: Var.create(
- kwargs[prop],
- _var_is_string=False if isinstance(kwargs[prop], str) else None,
- )
+ prop: LiteralVar.create(kwargs[prop])
for prop in self.get_initial_props()
if prop in kwargs
},
@@ -401,10 +398,10 @@ def __init__(self, *args, **kwargs):
passed_types = None
try:
# Try to create a var from the value.
- kwargs[key] = Var.create(
- value,
- _var_is_string=False if isinstance(value, str) else None,
- )
+ if isinstance(value, Var):
+ kwargs[key] = value
+ else:
+ kwargs[key] = LiteralVar.create(value)
# Check that the var type is not None.
if kwargs[key] is None:
@@ -448,7 +445,6 @@ def __init__(self, *args, **kwargs):
raise TypeError(
f"Invalid var passed for prop {type(self).__name__}.{key}, expected type {expected_type}, got value {value_name} of type {passed_types or passed_type}."
)
-
# Check if the key is an event trigger.
if key in component_specific_triggers:
# Temporarily disable full control for event triggers.
@@ -513,7 +509,9 @@ def _create_event_chain(
# If it's an event chain var, return it.
if isinstance(value, Var):
if value._var_type is not EventChain:
- raise ValueError(f"Invalid event chain: {value}")
+ raise ValueError(
+ f"Invalid event chain: {repr(value)} of type {type(value)}"
+ )
return value
elif isinstance(value, EventChain):
# Trust that the caller knows what they're doing passing an EventChain directly
@@ -692,9 +690,7 @@ def _render(self, props: dict[str, Any] | None = None) -> Tag:
# Add ref to element if `id` is not None.
ref = self.get_ref()
if ref is not None:
- props["ref"] = Var.create(
- ref, _var_is_local=False, _var_is_string=False
- )
+ props["ref"] = ImmutableVar.create(ref)
else:
props = props.copy()
@@ -809,7 +805,7 @@ def validate_children(children):
else (
Fragment.create(*child)
if isinstance(child, tuple)
- else Bare.create(contents=Var.create(child, _var_is_string=True))
+ else Bare.create(contents=LiteralVar.create(child))
)
)
for child in children
@@ -936,7 +932,12 @@ def _get_style(self) -> dict:
"""
if isinstance(self.style, Var):
return {"css": self.style}
- return {"css": Var.create(format_as_emotion(self.style))}
+ emotion_style = format_as_emotion(self.style)
+ return (
+ {"css": LiteralVar.create(emotion_style)}
+ if emotion_style is not None
+ else {}
+ )
def render(self) -> Dict:
"""Render the component.
@@ -1091,10 +1092,10 @@ def _get_vars(self, include_children: bool = False) -> list[Var]:
# Style keeps track of its own VarData instance, so embed in a temp Var that is yielded.
if isinstance(self.style, dict) and self.style or isinstance(self.style, Var):
vars.append(
- BaseVar(
+ ImmutableVar(
_var_name="style",
_var_type=str,
- _var_data=self.style._var_data,
+ _var_data=ImmutableVarData.merge(self.style._var_data),
)
)
@@ -1113,10 +1114,8 @@ def _get_vars(self, include_children: bool = False) -> list[Var]:
vars.append(comp_prop)
elif isinstance(comp_prop, str):
# Collapse VarData encoded in f-strings.
- var = Var.create_safe(
- comp_prop, _var_is_string=isinstance(comp_prop, str)
- )
- if var._var_data is not None:
+ var = LiteralVar.create(comp_prop)
+ if var._get_all_var_data() is not None:
vars.append(var)
# Get Vars associated with children.
@@ -1124,7 +1123,8 @@ def _get_vars(self, include_children: bool = False) -> list[Var]:
for child in self.children:
if not isinstance(child, Component):
continue
- vars.extend(child._get_vars(include_children=include_children))
+ child_vars = child._get_vars(include_children=include_children)
+ vars.extend(child_vars)
return vars
@@ -1329,13 +1329,13 @@ def _get_hooks_imports(self) -> ParsedImportDict:
other_imports = []
user_hooks = self._get_hooks()
- if (
- user_hooks is not None
- and isinstance(user_hooks, Var)
- and user_hooks._var_data is not None
- and user_hooks._var_data.imports
- ):
- other_imports.append(user_hooks._var_data.imports)
+ user_hooks_data = (
+ VarData.merge(user_hooks._get_all_var_data())
+ if user_hooks is not None and isinstance(user_hooks, Var)
+ else None
+ )
+ if user_hooks_data is not None:
+ other_imports.append(user_hooks_data.imports)
other_imports.extend(
hook_imports for hook_imports in self._get_added_hooks().values()
)
@@ -1358,8 +1358,9 @@ def _get_imports(self) -> ParsedImportDict:
event_imports = Imports.EVENTS if self.event_triggers else {}
# Collect imports from Vars used directly by this component.
+ var_datas = [var._get_all_var_data() for var in self._get_vars()]
var_imports = [
- var._var_data.imports for var in self._get_vars() if var._var_data
+ var_data.imports for var_data in var_datas if var_data is not None
]
added_import_dicts: list[ParsedImportDict] = []
@@ -1427,7 +1428,7 @@ def _get_ref_hook(self) -> str | None:
"""
ref = self.get_ref()
if ref is not None:
- return f"const {ref} = useRef(null); {str(Var.create_safe(ref, _var_is_string=False).as_ref())} = {ref};"
+ return f"const {ref} = useRef(null); {str(ImmutableVar.create_safe(ref).as_ref())} = {ref};"
def _get_vars_hooks(self) -> dict[str, None]:
"""Get the hooks required by vars referenced in this component.
@@ -1437,8 +1438,13 @@ def _get_vars_hooks(self) -> dict[str, None]:
"""
vars_hooks = {}
for var in self._get_vars():
- if var._var_data:
- vars_hooks.update(var._var_data.hooks)
+ var_data = var._get_all_var_data()
+ if var_data is not None:
+ vars_hooks.update(
+ var_data.hooks
+ if isinstance(var_data.hooks, dict)
+ else {k: None for k in var_data.hooks}
+ )
return vars_hooks
def _get_events_hooks(self) -> dict[str, None]:
@@ -1487,11 +1493,12 @@ def _get_added_hooks(self) -> dict[str, ImportDict]:
def extract_var_hooks(hook: Var):
_imports = {}
- if hook._var_data is not None:
- for sub_hook in hook._var_data.hooks:
+ var_data = VarData.merge(hook._get_all_var_data())
+ if var_data is not None:
+ for sub_hook in var_data.hooks:
code[sub_hook] = {}
- if hook._var_data.imports:
- _imports = hook._var_data.imports
+ if var_data.imports:
+ _imports = var_data.imports
if str(hook) in code:
code[str(hook)] = imports.merge_imports(code[str(hook)], _imports)
else:
@@ -1505,6 +1512,7 @@ def extract_var_hooks(hook: Var):
extract_var_hooks(hook)
else:
code[hook] = {}
+
return code
def _get_hooks(self) -> str | None:
@@ -1561,7 +1569,7 @@ def get_ref(self) -> str | None:
The ref name.
"""
# do not create a ref if the id is dynamic or unspecified
- if self.id is None or isinstance(self.id, BaseVar):
+ if self.id is None or isinstance(self.id, (BaseVar, ImmutableVar)):
return None
return format.format_ref(self.id)
@@ -1707,7 +1715,7 @@ def __init__(self, *args, **kwargs):
# Handle subclasses of Base.
if isinstance(value, Base):
- base_value = Var.create(value)
+ base_value = LiteralVar.create(value)
# Track hooks and imports associated with Component instances.
if base_value is not None and isinstance(value, Component):
@@ -1721,7 +1729,7 @@ def __init__(self, *args, **kwargs):
else:
value = base_value
else:
- value = Var.create(value, _var_is_string=isinstance(value, str))
+ value = LiteralVar.create(value)
# Set the prop.
self.props[format.to_camel_case(key)] = value
@@ -1800,19 +1808,19 @@ def _render(self) -> Tag:
"""
return super()._render(props=self.props)
- def get_prop_vars(self) -> List[BaseVar]:
+ def get_prop_vars(self) -> List[ImmutableVar]:
"""Get the prop vars.
Returns:
The prop vars.
"""
return [
- BaseVar(
+ ImmutableVar(
_var_name=name,
_var_type=(
prop._var_type if types._isinstance(prop, Var) else type(prop)
),
- )
+ ).guess_type()
for name, prop in self.props.items()
]
@@ -1825,9 +1833,11 @@ def _get_vars(self, include_children: bool = False) -> list[Var]:
Returns:
Each var referenced by the component (props, styles, event handlers).
"""
- return super()._get_vars(include_children=include_children) + [
- prop for prop in self.props.values() if isinstance(prop, Var)
- ]
+ return (
+ super()._get_vars(include_children=include_children)
+ + [prop for prop in self.props.values() if isinstance(prop, Var)]
+ + self.get_component(self)._get_vars(include_children=include_children)
+ )
@lru_cache(maxsize=None) # noqa
def get_component(self) -> Component:
@@ -1981,7 +1991,7 @@ def create(cls, component: Component) -> StatefulComponent | None:
if not should_memoize:
# Determine if any Vars have associated data.
for prop_var in component._get_vars():
- if prop_var._var_data:
+ if prop_var._get_all_var_data():
should_memoize = True
break
@@ -1996,7 +2006,7 @@ def create(cls, component: Component) -> StatefulComponent | None:
should_memoize = True
break
child = cls._child_var(child)
- if isinstance(child, Var) and child._var_data:
+ if isinstance(child, Var) and child._get_all_var_data():
should_memoize = True
break
@@ -2187,12 +2197,12 @@ def _get_memoized_event_triggers(
# Calculate Var dependencies accessed by the handler for useCallback dep array.
var_deps = ["addEvents", "Event"]
for arg in event_args:
- if arg._var_data is None:
+ if arg._get_all_var_data() is None:
continue
- for hook in arg._var_data.hooks:
+ for hook in arg._get_all_var_data().hooks:
var_deps.extend(cls._get_hook_deps(hook))
memo_var_data = VarData.merge(
- *[var._var_data for var in event_args],
+ *[var._get_all_var_data() for var in event_args],
VarData(
imports={"react": [ImportVar(tag="useCallback")]},
),
@@ -2200,7 +2210,7 @@ def _get_memoized_event_triggers(
# Store the memoized function name and hook code for this event trigger.
trigger_memo[event_trigger] = (
- Var.create_safe(memo_name, _var_is_string=False)._replace(
+ ImmutableVar.create_safe(memo_name)._replace(
_var_type=EventChain, merge_var_data=memo_var_data
),
f"const {memo_name} = useCallback({rendered_chain}, [{', '.join(var_deps)}])",
diff --git a/reflex/components/core/banner.py b/reflex/components/core/banner.py
index c6b46696c67..4c4f587eef5 100644
--- a/reflex/components/core/banner.py
+++ b/reflex/components/core/banner.py
@@ -4,7 +4,6 @@
from typing import Optional
-from reflex.components.base.bare import Bare
from reflex.components.component import Component
from reflex.components.core.cond import cond
from reflex.components.el.elements.typography import Div
@@ -19,71 +18,64 @@
from reflex.components.sonner.toast import Toaster, ToastProps
from reflex.constants import Dirs, Hooks, Imports
from reflex.constants.compiler import CompileVars
-from reflex.utils.imports import ImportDict, ImportVar
-from reflex.utils.serializers import serialize
-from reflex.vars import Var, VarData
+from reflex.ivars.base import ImmutableVar, LiteralVar
+from reflex.ivars.function import FunctionStringVar
+from reflex.ivars.number import BooleanVar
+from reflex.ivars.sequence import LiteralArrayVar
+from reflex.utils.imports import ImportVar
+from reflex.vars import ImmutableVarData, Var, VarData
connect_error_var_data: VarData = VarData( # type: ignore
imports=Imports.EVENTS,
hooks={Hooks.EVENTS: None},
)
-connect_errors: Var = Var.create_safe(
+connect_errors: Var = ImmutableVar.create_safe(
value=CompileVars.CONNECT_ERROR,
- _var_is_local=True,
- _var_is_string=False,
_var_data=connect_error_var_data,
)
-connection_error: Var = Var.create_safe(
- value="(connectErrors.length > 0) ? connectErrors[connectErrors.length - 1].message : ''",
- _var_is_local=False,
- _var_is_string=False,
+connection_error: Var = ImmutableVar.create_safe(
+ value="((connectErrors.length > 0) ? connectErrors[connectErrors.length - 1].message : '')",
_var_data=connect_error_var_data,
)
-connection_errors_count: Var = Var.create_safe(
+connection_errors_count: Var = ImmutableVar.create_safe(
value="connectErrors.length",
- _var_is_string=False,
- _var_is_local=False,
_var_data=connect_error_var_data,
)
-has_connection_errors: Var = Var.create_safe(
- value="connectErrors.length > 0",
- _var_is_string=False,
+has_connection_errors: Var = ImmutableVar.create_safe(
+ value="(connectErrors.length > 0)",
_var_data=connect_error_var_data,
-).to(bool)
+).to(BooleanVar)
-has_too_many_connection_errors: Var = Var.create_safe(
- value="connectErrors.length >= 2",
- _var_is_string=False,
+has_too_many_connection_errors: Var = ImmutableVar.create_safe(
+ value="(connectErrors.length >= 2)",
_var_data=connect_error_var_data,
-).to(bool)
+).to(BooleanVar)
-class WebsocketTargetURL(Bare):
+class WebsocketTargetURL(ImmutableVar):
"""A component that renders the websocket target URL."""
- def add_imports(self) -> ImportDict:
- """Add imports for the websocket target URL component.
-
- Returns:
- The import dict.
- """
- return {
- f"/{Dirs.STATE_PATH}": [ImportVar(tag="getBackendURL")],
- "/env.json": [ImportVar(tag="env", is_default=True)],
- }
-
@classmethod
- def create(cls) -> Component:
+ def create(cls) -> ImmutableVar:
"""Create a websocket target URL component.
Returns:
The websocket target URL component.
"""
- return super().create(contents="{getBackendURL(env.EVENT).href}")
+ return ImmutableVar(
+ _var_name="getBackendURL(env.EVENT).href",
+ _var_data=ImmutableVarData(
+ imports={
+ "/env.json": [ImportVar(tag="env", is_default=True)],
+ f"/{Dirs.STATE_PATH}": [ImportVar(tag="getBackendURL")],
+ },
+ ),
+ _var_type=WebsocketTargetURL,
+ )
def default_connection_error() -> list[str | Var | Component]:
@@ -112,24 +104,34 @@ def add_hooks(self) -> list[str | Var]:
toast_id = "websocket-error"
target_url = WebsocketTargetURL.create()
props = ToastProps( # type: ignore
- description=Var.create(
- f"`Check if server is reachable at ${target_url}`",
- _var_is_string=False,
- _var_is_local=False,
+ description=LiteralVar.create(
+ f"Check if server is reachable at {target_url}",
),
close_button=True,
duration=120000,
id=toast_id,
)
- hook = Var.create_safe(
- f"""
-const toast_props = {serialize(props)};
-const [userDismissed, setUserDismissed] = useState(false);
-useEffect(() => {{
- if ({has_too_many_connection_errors}) {{
+
+ individual_hooks = [
+ f"const toast_props = {str(LiteralVar.create(props))};",
+ f"const [userDismissed, setUserDismissed] = useState(false);",
+ FunctionStringVar(
+ "useEffect",
+ _var_data=VarData(
+ imports={
+ "react": ["useEffect", "useState"],
+ **dict(target_url._get_all_var_data().imports), # type: ignore
+ }
+ ),
+ ).call(
+ # TODO: This breaks the assumption that Vars are JS expressions
+ ImmutableVar.create_safe(
+ f"""
+() => {{
+ if ({str(has_too_many_connection_errors)}) {{
if (!userDismissed) {{
toast.error(
- `Cannot connect to server: {connection_error}.`,
+ `Cannot connect to server: ${{{connection_error}}}.`,
{{...toast_props, onDismiss: () => setUserDismissed(true)}},
)
}}
@@ -137,20 +139,16 @@ def add_hooks(self) -> list[str | Var]:
toast.dismiss("{toast_id}");
setUserDismissed(false); // after reconnection reset dismissed state
}}
-}}, [{connect_errors}]);""",
- _var_is_string=False,
- )
- imports: ImportDict = {
- "react": ["useEffect", "useState"],
- **target_url._get_imports(), # type: ignore
- }
- hook._var_data = VarData.merge(
- connect_errors._var_data,
- VarData(imports=imports),
- )
+}}
+"""
+ ),
+ LiteralArrayVar.create([connect_errors]),
+ ),
+ ]
+
return [
Hooks.EVENTS,
- hook,
+ *individual_hooks,
]
@classmethod
@@ -240,6 +238,7 @@ def create(cls, *children, **props) -> Icon:
Returns:
The icon component with default props applied.
"""
+ pulse_var = ImmutableVar.create("pulse")
return super().create(
"wifi_off",
color=props.pop("color", "crimson"),
@@ -248,7 +247,7 @@ def create(cls, *children, **props) -> Icon:
position=props.pop("position", "fixed"),
bottom=props.pop("botton", "33px"),
right=props.pop("right", "33px"),
- animation=Var.create(f"${{pulse}} 1s infinite", _var_is_string=True),
+ animation=LiteralVar.create(f"{pulse_var} 1s infinite"),
**props,
)
diff --git a/reflex/components/core/banner.pyi b/reflex/components/core/banner.pyi
index b9b6d506fb9..6327afe0b3d 100644
--- a/reflex/components/core/banner.pyi
+++ b/reflex/components/core/banner.pyi
@@ -5,15 +5,15 @@
# ------------------------------------------------------
from typing import Any, Callable, Dict, Literal, Optional, Union, overload
-from reflex.components.base.bare import Bare
from reflex.components.component import Component
from reflex.components.el.elements.typography import Div
from reflex.components.lucide.icon import Icon
from reflex.components.sonner.toast import Toaster, ToastProps
from reflex.event import EventHandler, EventSpec
+from reflex.ivars.base import ImmutableVar
from reflex.style import Style
-from reflex.utils.imports import ImportDict, ImportVar
-from reflex.vars import BaseVar, Var, VarData
+from reflex.utils.imports import ImportVar
+from reflex.vars import Var, VarData
connect_error_var_data: VarData
connect_errors: Var
@@ -22,73 +22,9 @@ connection_errors_count: Var
has_connection_errors: Var
has_too_many_connection_errors: Var
-class WebsocketTargetURL(Bare):
- def add_imports(self) -> ImportDict: ...
- @overload
+class WebsocketTargetURL(ImmutableVar):
@classmethod
- def create( # type: ignore
- cls,
- *children,
- contents: Optional[Union[Var[str], str]] = None,
- style: Optional[Style] = None,
- key: Optional[Any] = None,
- id: Optional[Any] = None,
- class_name: Optional[Any] = None,
- autofocus: Optional[bool] = None,
- custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- **props,
- ) -> "WebsocketTargetURL":
- """Create a websocket target URL component.
-
- Returns:
- The websocket target URL component.
- """
- ...
+ def create(cls) -> ImmutableVar: ... # type: ignore
def default_connection_error() -> list[str | Var | Component]: ...
@@ -140,50 +76,40 @@ class ConnectionToaster(Toaster):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ConnectionToaster":
@@ -230,50 +156,40 @@ class ConnectionBanner(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ConnectionBanner":
@@ -299,50 +215,40 @@ class ConnectionModal(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ConnectionModal":
@@ -369,50 +275,40 @@ class WifiOffPulse(Icon):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "WifiOffPulse":
@@ -472,50 +368,40 @@ class ConnectionPulser(Div):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ConnectionPulser":
diff --git a/reflex/components/core/client_side_routing.pyi b/reflex/components/core/client_side_routing.pyi
index 7562f6f5c0a..605293ee812 100644
--- a/reflex/components/core/client_side_routing.pyi
+++ b/reflex/components/core/client_side_routing.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
route_not_found: Var
@@ -26,50 +26,40 @@ class ClientSideRouting(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ClientSideRouting":
@@ -105,50 +95,40 @@ class Default404Page(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Default404Page":
diff --git a/reflex/components/core/clipboard.pyi b/reflex/components/core/clipboard.pyi
index 29ad80c2f63..aaeac985c3c 100644
--- a/reflex/components/core/clipboard.pyi
+++ b/reflex/components/core/clipboard.pyi
@@ -9,7 +9,7 @@ from reflex.components.base.fragment import Fragment
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
from reflex.utils.imports import ImportVar
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class Clipboard(Fragment):
@overload
@@ -27,53 +27,41 @@ class Clipboard(Fragment):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_paste: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_paste: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Clipboard":
diff --git a/reflex/components/core/cond.py b/reflex/components/core/cond.py
index 5d9ab754404..80dd35f0f94 100644
--- a/reflex/components/core/cond.py
+++ b/reflex/components/core/cond.py
@@ -2,17 +2,17 @@
from __future__ import annotations
-from typing import Any, Dict, Optional, Union, overload
+from typing import Any, Dict, Optional, overload
from reflex.components.base.fragment import Fragment
from reflex.components.component import BaseComponent, Component, MemoizationLeaf
from reflex.components.tags import CondTag, Tag
from reflex.constants import Dirs
-from reflex.constants.colors import Color
+from reflex.ivars.base import ImmutableVar, LiteralVar
+from reflex.ivars.number import TernaryOperator
from reflex.style import LIGHT_COLOR_MODE, resolved_color_mode
-from reflex.utils import format
from reflex.utils.imports import ImportDict, ImportVar
-from reflex.vars import BaseVar, Var, VarData
+from reflex.vars import Var, VarData
_IS_TRUE_IMPORT: ImportDict = {
f"/{Dirs.STATE_PATH}": [ImportVar(tag="isTrue")],
@@ -104,7 +104,7 @@ def add_imports(self) -> ImportDict:
The import dict for the component.
"""
cond_imports: dict[str, str | ImportVar | list[str | ImportVar]] = getattr(
- self.cond._var_data, "imports", {}
+ VarData.merge(self.cond._get_all_var_data()), "imports", {}
)
return {**cond_imports, **_IS_TRUE_IMPORT}
@@ -118,10 +118,10 @@ def cond(condition: Any, c1: Component) -> Component: ...
@overload
-def cond(condition: Any, c1: Any, c2: Any) -> BaseVar: ...
+def cond(condition: Any, c1: Any, c2: Any) -> ImmutableVar: ...
-def cond(condition: Any, c1: Any, c2: Any = None):
+def cond(condition: Any, c1: Any, c2: Any = None) -> Component | ImmutableVar:
"""Create a conditional component or Prop.
Args:
@@ -135,14 +135,10 @@ def cond(condition: Any, c1: Any, c2: Any = None):
Raises:
ValueError: If the arguments are invalid.
"""
- var_datas: list[VarData | None] = [
- VarData( # type: ignore
- imports=_IS_TRUE_IMPORT,
- ),
- ]
-
+ if isinstance(condition, Var) and not isinstance(condition, ImmutableVar):
+ condition._var_is_local = True
# Convert the condition to a Var.
- cond_var = Var.create(condition)
+ cond_var = LiteralVar.create(condition)
assert cond_var is not None, "The condition must be set."
# If the first component is a component, create a Cond component.
@@ -151,8 +147,6 @@ def cond(condition: Any, c1: Any, c2: Any = None):
c2, BaseComponent
), "Both arguments must be components."
return Cond.create(cond_var, c1, c2)
- if isinstance(c1, Var):
- var_datas.append(c1._var_data)
# Otherwise, create a conditional Var.
# Check that the second argument is valid.
@@ -160,37 +154,20 @@ def cond(condition: Any, c1: Any, c2: Any = None):
raise ValueError("Both arguments must be props.")
if c2 is None:
raise ValueError("For conditional vars, the second argument must be set.")
- if isinstance(c2, Var):
- var_datas.append(c2._var_data)
def create_var(cond_part):
- return Var.create_safe(
- cond_part,
- _var_is_string=isinstance(cond_part, (str, Color)),
- )
+ return LiteralVar.create(cond_part)
# convert the truth and false cond parts into vars so the _var_data can be obtained.
c1 = create_var(c1)
c2 = create_var(c2)
- var_datas.extend([c1._var_data, c2._var_data])
-
- c1_type = c1._var_type if isinstance(c1, Var) else type(c1)
- c2_type = c2._var_type if isinstance(c2, Var) else type(c2)
-
- var_type = c1_type if c1_type == c2_type else Union[c1_type, c2_type]
# Create the conditional var.
- return cond_var._replace(
- _var_name=format.format_cond(
- cond=cond_var._var_full_name,
- true_value=c1,
- false_value=c2,
- is_prop=True,
- ),
- _var_type=var_type,
- _var_is_local=False,
- _var_full_name_needs_state_prefix=False,
- merge_var_data=VarData.merge(*var_datas),
+ return TernaryOperator.create(
+ condition=cond_var.to(bool), # type: ignore
+ if_true=c1,
+ if_false=c2,
+ _var_data=VarData(imports=_IS_TRUE_IMPORT),
)
@@ -205,7 +182,7 @@ def color_mode_cond(light: Any, dark: Any = None) -> Var | Component:
The conditional component or prop.
"""
return cond(
- resolved_color_mode == Var.create(LIGHT_COLOR_MODE, _var_is_string=True),
+ resolved_color_mode == LiteralVar.create(LIGHT_COLOR_MODE),
light,
dark,
)
diff --git a/reflex/components/core/debounce.pyi b/reflex/components/core/debounce.pyi
index 59e87f3661c..486fcc28425 100644
--- a/reflex/components/core/debounce.pyi
+++ b/reflex/components/core/debounce.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Type, Union, overload
from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
DEFAULT_DEBOUNCE_TIMEOUT = 300
@@ -31,53 +31,41 @@ class DebounceInput(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DebounceInput":
diff --git a/reflex/components/core/foreach.py b/reflex/components/core/foreach.py
index 44e0685dd58..327680a2bee 100644
--- a/reflex/components/core/foreach.py
+++ b/reflex/components/core/foreach.py
@@ -9,6 +9,7 @@
from reflex.components.component import Component
from reflex.components.tags import IterTag
from reflex.constants import MemoizationMode
+from reflex.ivars.base import ImmutableVar
from reflex.state import ComponentState
from reflex.utils import console
from reflex.vars import Var
@@ -61,7 +62,7 @@ def create(
deprecation_version="0.5.0",
removal_version="0.6.0",
)
- iterable = Var.create_safe(iterable, _var_is_string=False)
+ iterable = ImmutableVar.create_safe(iterable)
if iterable._var_type == Any:
raise ForeachVarError(
f"Could not foreach over var `{iterable._var_full_name}` of type Any. "
diff --git a/reflex/components/core/html.pyi b/reflex/components/core/html.pyi
index 62bec00639f..c3d2ed06fa4 100644
--- a/reflex/components/core/html.pyi
+++ b/reflex/components/core/html.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.el.elements.typography import Div
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class Html(Div):
@overload
@@ -49,50 +49,40 @@ class Html(Div):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Html":
diff --git a/reflex/components/core/match.py b/reflex/components/core/match.py
index e85739605b6..3ddef38c63d 100644
--- a/reflex/components/core/match.py
+++ b/reflex/components/core/match.py
@@ -5,13 +5,13 @@
from reflex.components.base import Fragment
from reflex.components.component import BaseComponent, Component, MemoizationLeaf
-from reflex.components.core.colors import Color
from reflex.components.tags import MatchTag, Tag
+from reflex.ivars.base import ImmutableVar, LiteralVar
from reflex.style import Style
from reflex.utils import format, types
from reflex.utils.exceptions import MatchTypeError
from reflex.utils.imports import ImportDict
-from reflex.vars import BaseVar, Var, VarData
+from reflex.vars import ImmutableVarData, Var, VarData
class Match(MemoizationLeaf):
@@ -27,7 +27,7 @@ class Match(MemoizationLeaf):
default: Any
@classmethod
- def create(cls, cond: Any, *cases) -> Union[Component, BaseVar]:
+ def create(cls, cond: Any, *cases) -> Union[Component, Var]:
"""Create a Match Component.
Args:
@@ -46,7 +46,7 @@ def create(cls, cond: Any, *cases) -> Union[Component, BaseVar]:
cls._validate_return_types(match_cases)
- if default is None and types._issubclass(type(match_cases[0][-1]), BaseVar):
+ if default is None and types._issubclass(type(match_cases[0][-1]), Var):
raise ValueError(
"For cases with return types as Vars, a default case must be provided"
)
@@ -56,7 +56,7 @@ def create(cls, cond: Any, *cases) -> Union[Component, BaseVar]:
)
@classmethod
- def _create_condition_var(cls, cond: Any) -> BaseVar:
+ def _create_condition_var(cls, cond: Any) -> Var:
"""Convert the condition to a Var.
Args:
@@ -68,16 +68,16 @@ def _create_condition_var(cls, cond: Any) -> BaseVar:
Raises:
ValueError: If the condition is not provided.
"""
- match_cond_var = Var.create(cond, _var_is_string=isinstance(cond, str))
+ match_cond_var = LiteralVar.create(cond)
if match_cond_var is None:
raise ValueError("The condition must be set")
- return match_cond_var # type: ignore
+ return match_cond_var
@classmethod
def _process_cases(
cls, cases: List
- ) -> Tuple[List, Optional[Union[BaseVar, BaseComponent]]]:
+ ) -> Tuple[List, Optional[Union[Var, BaseComponent]]]:
"""Process the list of match cases and the catchall default case.
Args:
@@ -94,6 +94,9 @@ def _process_cases(
if len([case for case in cases if not isinstance(case, tuple)]) > 1:
raise ValueError("rx.match can only have one default case.")
+ if not cases:
+ raise ValueError("rx.match should have at least one case.")
+
# Get the default case which should be the last non-tuple arg
if not isinstance(cases[-1], tuple):
default = cases.pop()
@@ -103,7 +106,7 @@ def _process_cases(
else default
)
- return cases, default # type: ignore
+ return cases, default
@classmethod
def _create_case_var_with_var_data(cls, case_element):
@@ -117,17 +120,12 @@ def _create_case_var_with_var_data(cls, case_element):
Returns:
The case element Var.
"""
- _var_data = case_element._var_data if isinstance(case_element, Style) else None # type: ignore
- case_element = Var.create(
- case_element,
- _var_is_string=isinstance(case_element, (str, Color)),
- )
- if _var_data is not None:
- case_element._var_data = VarData.merge(case_element._var_data, _var_data) # type: ignore
+ _var_data = case_element._var_data if isinstance(case_element, Style) else None
+ case_element = LiteralVar.create(case_element, _var_data=_var_data)
return case_element
@classmethod
- def _process_match_cases(cls, cases: List) -> List[List[BaseVar]]:
+ def _process_match_cases(cls, cases: List) -> List[List[Var]]:
"""Process the individual match cases.
Args:
@@ -159,7 +157,7 @@ def _process_match_cases(cls, cases: List) -> List[List[BaseVar]]:
if not isinstance(element, BaseComponent)
else element
)
- if not isinstance(el, (BaseVar, BaseComponent)):
+ if not isinstance(el, (Var, BaseComponent)):
raise ValueError("Case element must be a var or component")
case_list.append(el)
@@ -168,7 +166,7 @@ def _process_match_cases(cls, cases: List) -> List[List[BaseVar]]:
return match_cases
@classmethod
- def _validate_return_types(cls, match_cases: List[List[BaseVar]]) -> None:
+ def _validate_return_types(cls, match_cases: List[List[Var]]) -> None:
"""Validate that match cases have the same return types.
Args:
@@ -182,14 +180,14 @@ def _validate_return_types(cls, match_cases: List[List[BaseVar]]) -> None:
if types._isinstance(first_case_return, BaseComponent):
return_type = BaseComponent
- elif types._isinstance(first_case_return, BaseVar):
- return_type = BaseVar
+ elif types._isinstance(first_case_return, Var):
+ return_type = Var
for index, case in enumerate(match_cases):
if not types._issubclass(type(case[-1]), return_type):
raise MatchTypeError(
f"Match cases should have the same return types. Case {index} with return "
- f"value `{case[-1]._var_name if isinstance(case[-1], BaseVar) else textwrap.shorten(str(case[-1]), width=250)}`"
+ f"value `{case[-1]._var_name if isinstance(case[-1], Var) else textwrap.shorten(str(case[-1]), width=250)}`"
f" of type {type(case[-1])!r} is not {return_type}"
)
@@ -197,9 +195,9 @@ def _validate_return_types(cls, match_cases: List[List[BaseVar]]) -> None:
def _create_match_cond_var_or_component(
cls,
match_cond_var: Var,
- match_cases: List[List[BaseVar]],
- default: Optional[Union[BaseVar, BaseComponent]],
- ) -> Union[Component, BaseVar]:
+ match_cases: List[List[Var]],
+ default: Optional[Union[Var, BaseComponent]],
+ ) -> Union[Component, Var]:
"""Create and return the match condition var or component.
Args:
@@ -230,28 +228,22 @@ def _create_match_cond_var_or_component(
# Validate the match cases (as well as the default case) to have Var return types.
if any(
- case for case in match_cases if not types._isinstance(case[-1], BaseVar)
- ) or not types._isinstance(default, BaseVar):
+ case for case in match_cases if not types._isinstance(case[-1], Var)
+ ) or not types._isinstance(default, Var):
raise ValueError("Return types of match cases should be Vars.")
- # match cases and default should all be Vars at this point.
- # Retrieve var data of every var in the match cases and default.
- var_data = [
- *[el._var_data for case in match_cases for el in case],
- default._var_data, # type: ignore
- ]
-
- return match_cond_var._replace(
+ return ImmutableVar(
_var_name=format.format_match(
cond=match_cond_var._var_name_unwrapped,
match_cases=match_cases, # type: ignore
default=default, # type: ignore
),
_var_type=default._var_type, # type: ignore
- _var_is_local=False,
- _var_full_name_needs_state_prefix=False,
- _var_is_string=False,
- merge_var_data=VarData.merge(*var_data),
+ _var_data=ImmutableVarData.merge(
+ match_cond_var._get_all_var_data(),
+ *[el._get_all_var_data() for case in match_cases for el in case],
+ default._get_all_var_data(), # type: ignore
+ ),
)
def _render(self) -> Tag:
@@ -275,7 +267,7 @@ def add_imports(self) -> ImportDict:
Returns:
The import dict.
"""
- return getattr(self.cond._var_data, "imports", {})
+ return getattr(VarData.merge(self.cond._get_all_var_data()), "imports", {})
match = Match.create
diff --git a/reflex/components/core/upload.py b/reflex/components/core/upload.py
index 3c211325314..df9146c4d9f 100644
--- a/reflex/components/core/upload.py
+++ b/reflex/components/core/upload.py
@@ -19,8 +19,10 @@
call_script,
parse_args_spec,
)
+from reflex.ivars.base import ImmutableCallableVar, ImmutableVar
+from reflex.ivars.sequence import LiteralStringVar
from reflex.utils.imports import ImportVar
-from reflex.vars import BaseVar, CallableVar, Var, VarData
+from reflex.vars import ImmutableVarData, Var, VarData
DEFAULT_UPLOAD_ID: str = "default"
@@ -35,8 +37,8 @@
)
-@CallableVar
-def upload_file(id_: str = DEFAULT_UPLOAD_ID) -> BaseVar:
+@ImmutableCallableVar
+def upload_file(id_: str = DEFAULT_UPLOAD_ID) -> ImmutableVar:
"""Get the file upload drop trigger.
This var is passed to the dropzone component to update the file list when a
@@ -48,23 +50,25 @@ def upload_file(id_: str = DEFAULT_UPLOAD_ID) -> BaseVar:
Returns:
A var referencing the file upload drop trigger.
"""
- id_var = Var.create_safe(id_, _var_is_string=True)
+ id_var = LiteralStringVar.create(id_)
var_name = f"""e => setFilesById(filesById => {{
const updatedFilesById = Object.assign({{}}, filesById);
- updatedFilesById[{id_var._var_name_unwrapped}] = e;
+ updatedFilesById[{str(id_var)}] = e;
return updatedFilesById;
}})
"""
- return BaseVar(
+ return ImmutableVar(
_var_name=var_name,
_var_type=EventChain,
- _var_data=VarData.merge(upload_files_context_var_data, id_var._var_data),
+ _var_data=ImmutableVarData.merge(
+ upload_files_context_var_data, id_var._get_all_var_data()
+ ),
)
-@CallableVar
-def selected_files(id_: str = DEFAULT_UPLOAD_ID) -> BaseVar:
+@ImmutableCallableVar
+def selected_files(id_: str = DEFAULT_UPLOAD_ID) -> ImmutableVar:
"""Get the list of selected files.
Args:
@@ -73,12 +77,14 @@ def selected_files(id_: str = DEFAULT_UPLOAD_ID) -> BaseVar:
Returns:
A var referencing the list of selected file paths.
"""
- id_var = Var.create_safe(id_, _var_is_string=True)
- return BaseVar(
- _var_name=f"(filesById[{id_var._var_name_unwrapped}] ? filesById[{id_var._var_name_unwrapped}].map((f) => (f.path || f.name)) : [])",
+ id_var = LiteralStringVar.create(id_)
+ return ImmutableVar(
+ _var_name=f"(filesById[{str(id_var)}] ? filesById[{str(id_var)}].map((f) => (f.path || f.name)) : [])",
_var_type=List[str],
- _var_data=VarData.merge(upload_files_context_var_data, id_var._var_data),
- )
+ _var_data=ImmutableVarData.merge(
+ upload_files_context_var_data, id_var._get_all_var_data()
+ ),
+ ).guess_type()
@CallableEventSpec
@@ -245,7 +251,7 @@ def create(cls, *children, **props) -> Component:
# The file input to use.
upload = Input.create(type="file")
upload.special_props = {
- BaseVar(_var_name="{...getInputProps()}", _var_type=None)
+ ImmutableVar(_var_name="...getInputProps()", _var_type=None)
}
# The dropzone to use.
@@ -254,7 +260,9 @@ def create(cls, *children, **props) -> Component:
*children,
**{k: v for k, v in props.items() if k not in supported_props},
)
- zone.special_props = {BaseVar(_var_name="{...getRootProps()}", _var_type=None)}
+ zone.special_props = {
+ ImmutableVar(_var_name="...getRootProps()", _var_type=None)
+ }
# Create the component.
upload_props["id"] = props.get("id", DEFAULT_UPLOAD_ID)
diff --git a/reflex/components/core/upload.pyi b/reflex/components/core/upload.pyi
index 54bb351deac..ff5085514c2 100644
--- a/reflex/components/core/upload.pyi
+++ b/reflex/components/core/upload.pyi
@@ -12,16 +12,17 @@ from reflex.event import (
EventHandler,
EventSpec,
)
+from reflex.ivars.base import ImmutableCallableVar, ImmutableVar
from reflex.style import Style
-from reflex.vars import BaseVar, CallableVar, Var, VarData
+from reflex.vars import Var, VarData
DEFAULT_UPLOAD_ID: str
upload_files_context_var_data: VarData
-@CallableVar
-def upload_file(id_: str = DEFAULT_UPLOAD_ID) -> BaseVar: ...
-@CallableVar
-def selected_files(id_: str = DEFAULT_UPLOAD_ID) -> BaseVar: ...
+@ImmutableCallableVar
+def upload_file(id_: str = DEFAULT_UPLOAD_ID) -> ImmutableVar: ...
+@ImmutableCallableVar
+def selected_files(id_: str = DEFAULT_UPLOAD_ID) -> ImmutableVar: ...
@CallableEventSpec
def clear_selected_files(id_: str = DEFAULT_UPLOAD_ID) -> EventSpec: ...
def cancel_upload(upload_id: str) -> EventSpec: ...
@@ -43,50 +44,40 @@ class UploadFilesProvider(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "UploadFilesProvider":
@@ -130,53 +121,41 @@ class Upload(MemoizationLeaf):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_drop: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_drop: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Upload":
@@ -227,53 +206,41 @@ class StyledUpload(Upload):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_drop: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_drop: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "StyledUpload":
@@ -324,53 +291,41 @@ class UploadNamespace(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_drop: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_drop: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "StyledUpload":
diff --git a/reflex/components/datadisplay/code.py b/reflex/components/datadisplay/code.py
index 47cba3736d5..779d4c5d3ad 100644
--- a/reflex/components/datadisplay/code.py
+++ b/reflex/components/datadisplay/code.py
@@ -2,9 +2,10 @@
from __future__ import annotations
-import re
from typing import Dict, Literal, Optional, Union
+from typing_extensions import get_args
+
from reflex.components.component import Component
from reflex.components.core.cond import color_mode_cond
from reflex.components.lucide.icon import Icon
@@ -12,6 +13,7 @@
from reflex.components.radix.themes.layout.box import Box
from reflex.constants.colors import Color
from reflex.event import set_clipboard
+from reflex.ivars.base import ImmutableVar, LiteralVar
from reflex.style import Style
from reflex.utils import format
from reflex.utils.imports import ImportDict, ImportVar
@@ -349,6 +351,20 @@
]
+def replace_quotes_with_camel_case(value: str) -> str:
+ """Replaces quotes in the given string with camel case format.
+
+ Args:
+ value (str): The string to be processed.
+
+ Returns:
+ str: The processed string with quotes replaced by camel case.
+ """
+ for theme in get_args(LiteralCodeBlockTheme):
+ value = value.replace(f'"{theme}"', format.to_camel_case(theme))
+ return value
+
+
class CodeBlock(Component):
"""A code block."""
@@ -389,32 +405,42 @@ def add_imports(self) -> ImportDict:
The import dict.
"""
imports_: ImportDict = {}
- themes = re.findall(r"`(.*?)`", self.theme._var_name)
- if not themes:
- themes = [self.theme._var_name]
+
+ themeString = str(self.theme)
+
+ selected_themes = []
+
+ for possibleTheme in get_args(LiteralCodeBlockTheme):
+ if format.to_camel_case(possibleTheme) in themeString:
+ selected_themes.append(possibleTheme)
+ if possibleTheme in themeString:
+ selected_themes.append(possibleTheme)
+
+ selected_themes = sorted(set(map(self.convert_theme_name, selected_themes)))
imports_.update(
{
- f"react-syntax-highlighter/dist/cjs/styles/prism/{self.convert_theme_name(theme)}": [
+ f"react-syntax-highlighter/dist/cjs/styles/prism/{theme}": [
ImportVar(
- tag=format.to_camel_case(self.convert_theme_name(theme)),
+ tag=format.to_camel_case(theme),
is_default=True,
install=False,
)
]
- for theme in themes
+ for theme in selected_themes
}
)
if (
self.language is not None
- and self.language._var_name in LiteralCodeLanguage.__args__ # type: ignore
+ and (language_without_quotes := str(self.language).replace('"', ""))
+ in LiteralCodeLanguage.__args__ # type: ignore
):
imports_[
- f"react-syntax-highlighter/dist/cjs/languages/prism/{self.language._var_name}"
+ f"react-syntax-highlighter/dist/cjs/languages/prism/{language_without_quotes}"
] = [
ImportVar(
- tag=format.to_camel_case(self.language._var_name),
+ tag=format.to_camel_case(language_without_quotes),
is_default=True,
install=False,
)
@@ -425,9 +451,10 @@ def add_imports(self) -> ImportDict:
def _get_custom_code(self) -> Optional[str]:
if (
self.language is not None
- and self.language._var_name in LiteralCodeLanguage.__args__ # type: ignore
+ and (language_without_quotes := str(self.language).replace('"', ""))
+ in LiteralCodeLanguage.__args__ # type: ignore
):
- return f"{self.alias}.registerLanguage('{self.language._var_name}', {format.to_camel_case(self.language._var_name)})"
+ return f"{self.alias}.registerLanguage('{language_without_quotes}', {format.to_camel_case(language_without_quotes)})"
@classmethod
def create(
@@ -453,7 +480,10 @@ def create(
if "theme" not in props:
# Default color scheme responds to global color mode.
- props["theme"] = color_mode_cond(light="one-light", dark="one-dark")
+ props["theme"] = color_mode_cond(
+ light=ImmutableVar.create_safe("oneLight"),
+ dark=ImmutableVar.create_safe("oneDark"),
+ )
# react-syntax-highlighter doesnt have an explicit "light" or "dark" theme so we use one-light and one-dark
# themes respectively to ensure code compatibility.
@@ -484,7 +514,7 @@ def create(
if children:
props["code"] = children[0]
if not isinstance(props["code"], Var):
- props["code"] = Var.create(props["code"], _var_is_string=True)
+ props["code"] = LiteralVar.create(props["code"])
# Create the component.
code_block = super().create(
@@ -503,18 +533,15 @@ def add_style(self):
def _render(self):
out = super()._render()
- predicate, qmark, value = self.theme._var_name.partition("?")
- out.add_props(
- style=Var.create(
- format.to_camel_case(f"{predicate}{qmark}{value.replace('`', '')}"),
- _var_is_local=False,
- _var_is_string=False,
- )
- ).remove_props("theme", "code")
- if self.code is not None:
- out.special_props.add(
- Var.create_safe(f"children={str(self.code)}", _var_is_string=False)
- )
+
+ theme = self.theme._replace(
+ _var_name=replace_quotes_with_camel_case(str(self.theme))
+ )
+
+ out.add_props(style=theme).remove_props("theme", "code").add_props(
+ children=self.code
+ )
+
return out
@staticmethod
diff --git a/reflex/components/datadisplay/code.pyi b/reflex/components/datadisplay/code.pyi
index a60838b8e64..015cc0708ad 100644
--- a/reflex/components/datadisplay/code.pyi
+++ b/reflex/components/datadisplay/code.pyi
@@ -10,7 +10,7 @@ from reflex.constants.colors import Color
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
from reflex.utils.imports import ImportDict
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
LiteralCodeBlockTheme = Literal[
"a11y-dark",
@@ -341,6 +341,8 @@ LiteralCodeLanguage = Literal[
"zig",
]
+def replace_quotes_with_camel_case(value: str) -> str: ...
+
class CodeBlock(Component):
def add_imports(self) -> ImportDict: ...
@overload
@@ -1030,50 +1032,40 @@ class CodeBlock(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "CodeBlock":
diff --git a/reflex/components/datadisplay/dataeditor.py b/reflex/components/datadisplay/dataeditor.py
index c6d9c198116..f3296e0b70c 100644
--- a/reflex/components/datadisplay/dataeditor.py
+++ b/reflex/components/datadisplay/dataeditor.py
@@ -9,6 +9,7 @@
from reflex.components.component import Component, NoSSRComponent
from reflex.components.literals import LiteralRowMarker
from reflex.event import EventHandler
+from reflex.ivars.base import ImmutableVar
from reflex.utils import console, format, types
from reflex.utils.imports import ImportDict, ImportVar
from reflex.utils.serializers import serializer
@@ -293,9 +294,7 @@ def add_hooks(self) -> list[str]:
# Define the name of the getData callback associated with this component and assign to get_cell_content.
data_callback = f"getData_{editor_id}"
- self.get_cell_content = Var.create(
- data_callback, _var_is_local=False, _var_is_string=False
- ) # type: ignore
+ self.get_cell_content = ImmutableVar.create(data_callback) # type: ignore
code = [f"function {data_callback}([col, row])" "{"]
diff --git a/reflex/components/datadisplay/dataeditor.pyi b/reflex/components/datadisplay/dataeditor.pyi
index 21ee461c35f..b40890b73cc 100644
--- a/reflex/components/datadisplay/dataeditor.pyi
+++ b/reflex/components/datadisplay/dataeditor.pyi
@@ -12,7 +12,7 @@ from reflex.event import EventHandler, EventSpec
from reflex.style import Style
from reflex.utils.imports import ImportDict
from reflex.utils.serializers import serializer
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class GridColumnIcons(Enum):
Array = "array"
@@ -135,98 +135,86 @@ class DataEditor(NoSSRComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_cell_activated: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_cell_clicked: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_cell_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_cell_edited: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_column_resize: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_delete: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_delete: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_finished_editing: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_group_header_clicked: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_group_header_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_group_header_renamed: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_header_clicked: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_header_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_header_menu_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_item_hovered: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_row_appended: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_selection_cleared: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DataEditor":
diff --git a/reflex/components/el/element.pyi b/reflex/components/el/element.pyi
index ce87335c397..f18d9008c6e 100644
--- a/reflex/components/el/element.pyi
+++ b/reflex/components/el/element.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class Element(Component):
@overload
@@ -22,50 +22,40 @@ class Element(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Element":
diff --git a/reflex/components/el/elements/base.pyi b/reflex/components/el/elements/base.pyi
index 14ee5b62cfc..d802cc2ee93 100644
--- a/reflex/components/el/elements/base.pyi
+++ b/reflex/components/el/elements/base.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.el.element import Element
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class BaseHTML(Element):
@overload
@@ -46,50 +46,40 @@ class BaseHTML(Element):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "BaseHTML":
diff --git a/reflex/components/el/elements/forms.py b/reflex/components/el/elements/forms.py
index cdad212aa9e..dfbdc4c1f26 100644
--- a/reflex/components/el/elements/forms.py
+++ b/reflex/components/el/elements/forms.py
@@ -11,13 +11,14 @@
from reflex.components.tags.tag import Tag
from reflex.constants import Dirs, EventTriggers
from reflex.event import EventChain, EventHandler
+from reflex.ivars.base import ImmutableVar, LiteralVar
from reflex.utils.format import format_event_chain
from reflex.utils.imports import ImportDict
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var, VarData
from .base import BaseHTML
-FORM_DATA = Var.create("form_data", _var_is_string=False)
+FORM_DATA = ImmutableVar.create("form_data")
HANDLE_SUBMIT_JS_JINJA2 = Environment().from_string(
"""
const handleSubmit_{{ handle_submit_unique_name }} = useCallback((ev) => {
@@ -184,7 +185,7 @@ def add_hooks(self) -> list[str]:
HANDLE_SUBMIT_JS_JINJA2.render(
handle_submit_unique_name=self.handle_submit_unique_name,
form_data=FORM_DATA,
- field_ref_mapping=str(Var.create_safe(self._get_form_refs())),
+ field_ref_mapping=str(LiteralVar.create(self._get_form_refs())),
on_submit_event_chain=format_event_chain(
self.event_triggers[EventTriggers.ON_SUBMIT]
),
@@ -197,7 +198,7 @@ def _render(self) -> Tag:
if EventTriggers.ON_SUBMIT in self.event_triggers:
render_tag.add_props(
**{
- EventTriggers.ON_SUBMIT: BaseVar(
+ EventTriggers.ON_SUBMIT: ImmutableVar(
_var_name=f"handleSubmit_{self.handle_submit_unique_name}",
_var_type=EventChain,
)
@@ -212,21 +213,18 @@ def _get_form_refs(self) -> Dict[str, Any]:
# when ref start with refs_ it's an array of refs, so we need different method
# to collect data
if ref.startswith("refs_"):
- ref_var = Var.create_safe(ref[:-3], _var_is_string=False).as_ref()
- form_refs[ref[5:-3]] = Var.create_safe(
+ ref_var = ImmutableVar.create_safe(ref[:-3]).as_ref()
+ form_refs[ref[len("refs_") : -3]] = ImmutableVar.create_safe(
f"getRefValues({str(ref_var)})",
- _var_is_local=False,
- _var_is_string=False,
- _var_data=ref_var._var_data,
+ _var_data=VarData.merge(ref_var._get_all_var_data()),
)
else:
- ref_var = Var.create_safe(ref, _var_is_string=False).as_ref()
- form_refs[ref[4:]] = Var.create_safe(
+ ref_var = ImmutableVar.create_safe(ref).as_ref()
+ form_refs[ref[4:]] = ImmutableVar.create_safe(
f"getRefValue({str(ref_var)})",
- _var_is_local=False,
- _var_is_string=False,
- _var_data=ref_var._var_data,
+ _var_data=VarData.merge(ref_var._get_all_var_data()),
)
+ # print(repr(form_refs))
return form_refs
def _get_vars(self, include_children: bool = True) -> Iterator[Var]:
@@ -631,7 +629,7 @@ def _render(self) -> Tag:
f"(e) => enterKeySubmitOnKeyDown(e, {self.enter_key_submit._var_name_unwrapped})",
_var_is_local=False,
_var_is_string=False,
- _var_data=self.enter_key_submit._var_data,
+ _var_data=VarData.merge(self.enter_key_submit._get_all_var_data()),
)
)
if self.auto_height is not None:
@@ -640,7 +638,7 @@ def _render(self) -> Tag:
f"(e) => autoHeightOnInput(e, {self.auto_height._var_name_unwrapped})",
_var_is_local=False,
_var_is_string=False,
- _var_data=self.auto_height._var_data,
+ _var_data=VarData.merge(self.auto_height._get_all_var_data()),
)
)
return tag
diff --git a/reflex/components/el/elements/forms.pyi b/reflex/components/el/elements/forms.pyi
index 31a56e9bee5..7b20571ebb3 100644
--- a/reflex/components/el/elements/forms.pyi
+++ b/reflex/components/el/elements/forms.pyi
@@ -9,13 +9,14 @@ from jinja2 import Environment
from reflex.components.el.element import Element
from reflex.event import EventHandler, EventSpec
+from reflex.ivars.base import ImmutableVar
from reflex.style import Style
from reflex.utils.imports import ImportDict
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .base import BaseHTML
-FORM_DATA = Var.create("form_data", _var_is_string=False)
+FORM_DATA = ImmutableVar.create("form_data")
HANDLE_SUBMIT_JS_JINJA2 = Environment().from_string(
"\n const handleSubmit_{{ handle_submit_unique_name }} = useCallback((ev) => {\n const $form = ev.target\n ev.preventDefault()\n const {{ form_data }} = {...Object.fromEntries(new FormData($form).entries()), ...{{ field_ref_mapping }}}\n\n {{ on_submit_event_chain }}\n\n if ({{ reset_on_submit }}) {\n $form.reset()\n }\n })\n "
)
@@ -71,50 +72,40 @@ class Button(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Button":
@@ -198,50 +189,40 @@ class Datalist(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Datalist":
@@ -293,50 +274,40 @@ class Fieldset(Element):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Fieldset":
@@ -411,53 +382,41 @@ class Form(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_submit: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_submit: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Form":
@@ -583,59 +542,45 @@ class Input(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_key_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_key_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_key_up: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Input":
@@ -743,50 +688,40 @@ class Label(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Label":
@@ -861,50 +796,40 @@ class Legend(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Legend":
@@ -984,50 +909,40 @@ class Meter(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Meter":
@@ -1109,50 +1024,40 @@ class Optgroup(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Optgroup":
@@ -1231,50 +1136,40 @@ class Option(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Option":
@@ -1354,50 +1249,40 @@ class Output(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Output":
@@ -1476,50 +1361,40 @@ class Progress(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Progress":
@@ -1605,53 +1480,41 @@ class Select(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Select":
@@ -1754,59 +1617,45 @@ class Textarea(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_key_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_key_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_key_up: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Textarea":
diff --git a/reflex/components/el/elements/inline.pyi b/reflex/components/el/elements/inline.pyi
index c4cd4286fee..dfddf5f1053 100644
--- a/reflex/components/el/elements/inline.pyi
+++ b/reflex/components/el/elements/inline.pyi
@@ -7,7 +7,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .base import BaseHTML
@@ -58,50 +58,40 @@ class A(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "A":
@@ -183,50 +173,40 @@ class Abbr(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Abbr":
@@ -299,50 +279,40 @@ class B(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "B":
@@ -415,50 +385,40 @@ class Bdi(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Bdi":
@@ -531,50 +491,40 @@ class Bdo(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Bdo":
@@ -647,50 +597,40 @@ class Br(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Br":
@@ -763,50 +703,40 @@ class Cite(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Cite":
@@ -879,50 +809,40 @@ class Code(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Code":
@@ -996,50 +916,40 @@ class Data(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Data":
@@ -1113,50 +1023,40 @@ class Dfn(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Dfn":
@@ -1229,50 +1129,40 @@ class Em(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Em":
@@ -1345,50 +1235,40 @@ class I(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "I":
@@ -1461,50 +1341,40 @@ class Kbd(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Kbd":
@@ -1577,50 +1447,40 @@ class Mark(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Mark":
@@ -1694,50 +1554,40 @@ class Q(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Q":
@@ -1811,50 +1661,40 @@ class Rp(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Rp":
@@ -1927,50 +1767,40 @@ class Rt(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Rt":
@@ -2043,50 +1873,40 @@ class Ruby(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Ruby":
@@ -2159,50 +1979,40 @@ class S(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "S":
@@ -2275,50 +2085,40 @@ class Samp(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Samp":
@@ -2391,50 +2191,40 @@ class Small(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Small":
@@ -2507,50 +2297,40 @@ class Span(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Span":
@@ -2623,50 +2403,40 @@ class Strong(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Strong":
@@ -2739,50 +2509,40 @@ class Sub(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Sub":
@@ -2855,50 +2615,40 @@ class Sup(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Sup":
@@ -2972,50 +2722,40 @@ class Time(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Time":
@@ -3089,50 +2829,40 @@ class U(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "U":
@@ -3205,50 +2935,40 @@ class Wbr(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Wbr":
diff --git a/reflex/components/el/elements/media.pyi b/reflex/components/el/elements/media.pyi
index ba5f1413797..cf673ddf96f 100644
--- a/reflex/components/el/elements/media.pyi
+++ b/reflex/components/el/elements/media.pyi
@@ -9,7 +9,7 @@ from reflex import ComponentNamespace
from reflex.constants.colors import Color
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .base import BaseHTML
@@ -62,50 +62,40 @@ class Area(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Area":
@@ -199,50 +189,40 @@ class Audio(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Audio":
@@ -341,50 +321,40 @@ class Img(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Img":
@@ -471,50 +441,40 @@ class Map(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Map":
@@ -593,50 +553,40 @@ class Track(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Track":
@@ -728,50 +678,40 @@ class Video(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Video":
@@ -856,50 +796,40 @@ class Embed(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Embed":
@@ -985,50 +915,40 @@ class Iframe(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Iframe":
@@ -1115,50 +1035,40 @@ class Object(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Object":
@@ -1236,50 +1146,40 @@ class Picture(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Picture":
@@ -1352,50 +1252,40 @@ class Portal(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Portal":
@@ -1473,50 +1363,40 @@ class Source(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Source":
@@ -1597,50 +1477,40 @@ class Svg(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Svg":
@@ -1720,50 +1590,40 @@ class Circle(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Circle":
@@ -1847,50 +1707,40 @@ class Rect(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Rect":
@@ -1972,50 +1822,40 @@ class Polygon(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Polygon":
@@ -2090,50 +1930,40 @@ class Defs(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Defs":
@@ -2213,50 +2043,40 @@ class LinearGradient(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "LinearGradient":
@@ -2343,50 +2163,40 @@ class Stop(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Stop":
@@ -2463,50 +2273,40 @@ class Path(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Path":
@@ -2589,50 +2389,40 @@ class SVG(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Svg":
diff --git a/reflex/components/el/elements/metadata.pyi b/reflex/components/el/elements/metadata.pyi
index e08c1d723e4..cb7e1dca9d9 100644
--- a/reflex/components/el/elements/metadata.pyi
+++ b/reflex/components/el/elements/metadata.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.el.element import Element
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .base import BaseHTML
@@ -50,50 +50,40 @@ class Base(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Base":
@@ -166,50 +156,40 @@ class Head(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Head":
@@ -295,50 +275,40 @@ class Link(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Link":
@@ -424,50 +394,40 @@ class Meta(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Meta":
@@ -520,50 +480,40 @@ class Title(Element):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Title":
@@ -597,50 +547,40 @@ class StyleEl(Element):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "StyleEl":
diff --git a/reflex/components/el/elements/other.pyi b/reflex/components/el/elements/other.pyi
index 6dc5d0aa16e..89b50b085ec 100644
--- a/reflex/components/el/elements/other.pyi
+++ b/reflex/components/el/elements/other.pyi
@@ -7,7 +7,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .base import BaseHTML
@@ -48,50 +48,40 @@ class Details(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Details":
@@ -166,50 +156,40 @@ class Dialog(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Dialog":
@@ -283,50 +263,40 @@ class Summary(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Summary":
@@ -399,50 +369,40 @@ class Slot(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Slot":
@@ -515,50 +475,40 @@ class Template(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Template":
@@ -631,50 +581,40 @@ class Math(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Math":
@@ -748,50 +688,40 @@ class Html(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Html":
diff --git a/reflex/components/el/elements/scripts.pyi b/reflex/components/el/elements/scripts.pyi
index d7858dde8a9..9923d8c6b6d 100644
--- a/reflex/components/el/elements/scripts.pyi
+++ b/reflex/components/el/elements/scripts.pyi
@@ -7,7 +7,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .base import BaseHTML
@@ -47,50 +47,40 @@ class Canvas(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Canvas":
@@ -163,50 +153,40 @@ class Noscript(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Noscript":
@@ -292,50 +272,40 @@ class Script(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Script":
diff --git a/reflex/components/el/elements/sectioning.pyi b/reflex/components/el/elements/sectioning.pyi
index a6ea47d9c10..2d1cc457dc4 100644
--- a/reflex/components/el/elements/sectioning.pyi
+++ b/reflex/components/el/elements/sectioning.pyi
@@ -7,7 +7,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .base import BaseHTML
@@ -47,50 +47,40 @@ class Body(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Body":
@@ -163,50 +153,40 @@ class Address(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Address":
@@ -279,50 +259,40 @@ class Article(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Article":
@@ -395,50 +365,40 @@ class Aside(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Aside":
@@ -511,50 +471,40 @@ class Footer(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Footer":
@@ -627,50 +577,40 @@ class Header(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Header":
@@ -743,50 +683,40 @@ class H1(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "H1":
@@ -859,50 +789,40 @@ class H2(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "H2":
@@ -975,50 +895,40 @@ class H3(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "H3":
@@ -1091,50 +1001,40 @@ class H4(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "H4":
@@ -1207,50 +1107,40 @@ class H5(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "H5":
@@ -1323,50 +1213,40 @@ class H6(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "H6":
@@ -1439,50 +1319,40 @@ class Main(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Main":
@@ -1555,50 +1425,40 @@ class Nav(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Nav":
@@ -1671,50 +1531,40 @@ class Section(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Section":
diff --git a/reflex/components/el/elements/tables.pyi b/reflex/components/el/elements/tables.pyi
index d06d0cf6db5..39ca144b869 100644
--- a/reflex/components/el/elements/tables.pyi
+++ b/reflex/components/el/elements/tables.pyi
@@ -7,7 +7,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .base import BaseHTML
@@ -48,50 +48,40 @@ class Caption(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Caption":
@@ -167,50 +157,40 @@ class Col(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Col":
@@ -287,50 +267,40 @@ class Colgroup(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Colgroup":
@@ -407,50 +377,40 @@ class Table(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Table":
@@ -526,50 +486,40 @@ class Tbody(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Tbody":
@@ -647,50 +597,40 @@ class Td(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Td":
@@ -768,50 +708,40 @@ class Tfoot(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Tfoot":
@@ -890,50 +820,40 @@ class Th(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Th":
@@ -1012,50 +932,40 @@ class Thead(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Thead":
@@ -1130,50 +1040,40 @@ class Tr(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Tr":
diff --git a/reflex/components/el/elements/typography.pyi b/reflex/components/el/elements/typography.pyi
index a6deb12e457..92637644129 100644
--- a/reflex/components/el/elements/typography.pyi
+++ b/reflex/components/el/elements/typography.pyi
@@ -7,7 +7,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .base import BaseHTML
@@ -48,50 +48,40 @@ class Blockquote(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Blockquote":
@@ -165,50 +155,40 @@ class Dd(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Dd":
@@ -281,50 +261,40 @@ class Div(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Div":
@@ -397,50 +367,40 @@ class Dl(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Dl":
@@ -513,50 +473,40 @@ class Dt(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Dt":
@@ -629,50 +579,40 @@ class Figcaption(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Figcaption":
@@ -746,50 +686,40 @@ class Hr(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Hr":
@@ -863,50 +793,40 @@ class Li(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Li":
@@ -980,50 +900,40 @@ class Menu(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Menu":
@@ -1100,50 +1010,40 @@ class Ol(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Ol":
@@ -1219,50 +1119,40 @@ class P(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "P":
@@ -1335,50 +1225,40 @@ class Pre(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Pre":
@@ -1451,50 +1331,40 @@ class Ul(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Ul":
@@ -1569,50 +1439,40 @@ class Ins(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Ins":
@@ -1689,50 +1549,40 @@ class Del(BaseHTML):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Del":
diff --git a/reflex/components/gridjs/datatable.py b/reflex/components/gridjs/datatable.py
index 6d856cf4541..47069843b40 100644
--- a/reflex/components/gridjs/datatable.py
+++ b/reflex/components/gridjs/datatable.py
@@ -6,10 +6,11 @@
from reflex.components.component import Component
from reflex.components.tags import Tag
+from reflex.ivars.base import ImmutableComputedVar
from reflex.utils import types
from reflex.utils.imports import ImportDict
from reflex.utils.serializers import serialize
-from reflex.vars import BaseVar, ComputedVar, Var
+from reflex.vars import ComputedVar, Var
class Gridjs(Component):
@@ -65,14 +66,17 @@ def create(cls, *children, **props):
# The annotation should be provided if data is a computed var. We need this to know how to
# render pandas dataframes.
- if isinstance(data, ComputedVar) and data._var_type == Any:
+ if (
+ isinstance(data, (ComputedVar, ImmutableComputedVar))
+ and data._var_type == Any
+ ):
raise ValueError(
"Annotation of the computed var assigned to the data field should be provided."
)
if (
columns is not None
- and isinstance(columns, ComputedVar)
+ and isinstance(columns, (ComputedVar, ImmutableComputedVar))
and columns._var_type == Any
):
raise ValueError(
@@ -97,6 +101,8 @@ def create(cls, *children, **props):
"column field should be specified when the data field is a list type"
)
+ print("props", props)
+
# Create the component.
return super().create(
*children,
@@ -113,17 +119,13 @@ def add_imports(self) -> ImportDict:
def _render(self) -> Tag:
if isinstance(self.data, Var) and types.is_dataframe(self.data._var_type):
- self.columns = BaseVar(
+ self.columns = self.data._replace(
_var_name=f"{self.data._var_name}.columns",
_var_type=List[Any],
- _var_full_name_needs_state_prefix=True,
- _var_data=self.data._var_data,
)
- self.data = BaseVar(
+ self.data = self.data._replace(
_var_name=f"{self.data._var_name}.data",
_var_type=List[List[Any]],
- _var_full_name_needs_state_prefix=True,
- _var_data=self.data._var_data,
)
if types.is_dataframe(type(self.data)):
# If given a pandas df break up the data and columns
diff --git a/reflex/components/gridjs/datatable.pyi b/reflex/components/gridjs/datatable.pyi
index ee8bf6f3a05..8f0a427b1f2 100644
--- a/reflex/components/gridjs/datatable.pyi
+++ b/reflex/components/gridjs/datatable.pyi
@@ -9,7 +9,7 @@ from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
from reflex.utils.imports import ImportDict
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class Gridjs(Component):
@overload
@@ -23,50 +23,40 @@ class Gridjs(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Gridjs":
@@ -105,50 +95,40 @@ class DataTable(Gridjs):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DataTable":
diff --git a/reflex/components/lucide/icon.pyi b/reflex/components/lucide/icon.pyi
index 7fc7ee38d36..8fafa2827fa 100644
--- a/reflex/components/lucide/icon.pyi
+++ b/reflex/components/lucide/icon.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class LucideIconComponent(Component):
@overload
@@ -22,50 +22,40 @@ class LucideIconComponent(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "LucideIconComponent":
@@ -99,50 +89,40 @@ class Icon(LucideIconComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Icon":
diff --git a/reflex/components/markdown/markdown.py b/reflex/components/markdown/markdown.py
index db38e7d0e44..272b576a2d7 100644
--- a/reflex/components/markdown/markdown.py
+++ b/reflex/components/markdown/markdown.py
@@ -17,29 +17,26 @@
from reflex.components.radix.themes.typography.link import Link
from reflex.components.radix.themes.typography.text import Text
from reflex.components.tags.tag import Tag
+from reflex.ivars.base import ImmutableVar, LiteralVar
from reflex.utils import types
from reflex.utils.imports import ImportDict, ImportVar
from reflex.vars import Var
# Special vars used in the component map.
-_CHILDREN = Var.create_safe("children", _var_is_local=False, _var_is_string=False)
-_PROPS = Var.create_safe("...props", _var_is_local=False, _var_is_string=False)
-_MOCK_ARG = Var.create_safe("", _var_is_string=False)
+_CHILDREN = ImmutableVar.create_safe("children")
+_PROPS = ImmutableVar.create_safe("...props")
+_MOCK_ARG = ImmutableVar.create_safe("")
# Special remark plugins.
-_REMARK_MATH = Var.create_safe("remarkMath", _var_is_local=False, _var_is_string=False)
-_REMARK_GFM = Var.create_safe("remarkGfm", _var_is_local=False, _var_is_string=False)
-_REMARK_UNWRAP_IMAGES = Var.create_safe(
- "remarkUnwrapImages", _var_is_local=False, _var_is_string=False
-)
-_REMARK_PLUGINS = Var.create_safe([_REMARK_MATH, _REMARK_GFM, _REMARK_UNWRAP_IMAGES])
+_REMARK_MATH = ImmutableVar.create_safe("remarkMath")
+_REMARK_GFM = ImmutableVar.create_safe("remarkGfm")
+_REMARK_UNWRAP_IMAGES = ImmutableVar.create_safe("remarkUnwrapImages")
+_REMARK_PLUGINS = LiteralVar.create([_REMARK_MATH, _REMARK_GFM, _REMARK_UNWRAP_IMAGES])
# Special rehype plugins.
-_REHYPE_KATEX = Var.create_safe(
- "rehypeKatex", _var_is_local=False, _var_is_string=False
-)
-_REHYPE_RAW = Var.create_safe("rehypeRaw", _var_is_local=False, _var_is_string=False)
-_REHYPE_PLUGINS = Var.create_safe([_REHYPE_KATEX, _REHYPE_RAW])
+_REHYPE_KATEX = ImmutableVar.create_safe("rehypeKatex")
+_REHYPE_RAW = ImmutableVar.create_safe("rehypeRaw")
+_REHYPE_PLUGINS = LiteralVar.create([_REHYPE_KATEX, _REHYPE_RAW])
# These tags do NOT get props passed to them
NO_PROPS_TAGS = ("ul", "ol", "li")
@@ -208,10 +205,11 @@ def get_component(self, tag: str, **props) -> Component:
children_prop = props.pop("children", None)
if children_prop is not None:
special_props.add(
- Var.create_safe(f"children={str(children_prop)}", _var_is_string=False)
+ Var.create_safe(
+ f"children={{{str(children_prop)}}}", _var_is_string=False
+ )
)
children = []
-
# Get the component.
component = self.component_map[tag](*children, **props).set(
special_props=special_props
@@ -237,7 +235,7 @@ def format_component_map(self) -> dict[str, str]:
The formatted component map.
"""
components = {
- tag: f"{{({{node, {_CHILDREN._var_name}, {_PROPS._var_name}}}) => {self.format_component(tag)}}}"
+ tag: f"{{({{node, {_CHILDREN._var_name}, {_PROPS._var_name}}}) => ({self.format_component(tag)})}}"
for tag in self.component_map
}
@@ -260,7 +258,7 @@ def format_component_map(self) -> dict[str, str]:
return inline ? (
{self.format_component("code")}
) : (
- {self.format_component("codeblock", language=Var.create_safe("language", _var_is_local=False, _var_is_string=False))}
+ {self.format_component("codeblock", language=ImmutableVar.create_safe("language"))}
);
}}}}""".replace("\n", " ")
@@ -287,7 +285,7 @@ def _get_custom_code(self) -> str | None:
function {self._get_component_map_name()} () {{
{formatted_hooks}
return (
- {str(Var.create(self.format_component_map()))}
+ {str(ImmutableVar.create_safe(self.format_component_map()))}
)
}}
"""
@@ -299,14 +297,10 @@ def _render(self) -> Tag:
.add_props(
remark_plugins=_REMARK_PLUGINS,
rehype_plugins=_REHYPE_PLUGINS,
+ components=ImmutableVar.create_safe(
+ f"{self._get_component_map_name()}()"
+ ),
)
.remove_props("componentMap", "componentMapHash")
)
- tag.special_props.add(
- Var.create_safe(
- f"components={{{self._get_component_map_name()}()}}",
- _var_is_local=True,
- _var_is_string=False,
- ),
- )
return tag
diff --git a/reflex/components/markdown/markdown.pyi b/reflex/components/markdown/markdown.pyi
index e0eb4345442..299cb99ff5f 100644
--- a/reflex/components/markdown/markdown.pyi
+++ b/reflex/components/markdown/markdown.pyi
@@ -8,24 +8,21 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
+from reflex.ivars.base import ImmutableVar, LiteralVar
from reflex.style import Style
from reflex.utils.imports import ImportDict
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
-_CHILDREN = Var.create_safe("children", _var_is_local=False, _var_is_string=False)
-_PROPS = Var.create_safe("...props", _var_is_local=False, _var_is_string=False)
-_MOCK_ARG = Var.create_safe("", _var_is_string=False)
-_REMARK_MATH = Var.create_safe("remarkMath", _var_is_local=False, _var_is_string=False)
-_REMARK_GFM = Var.create_safe("remarkGfm", _var_is_local=False, _var_is_string=False)
-_REMARK_UNWRAP_IMAGES = Var.create_safe(
- "remarkUnwrapImages", _var_is_local=False, _var_is_string=False
-)
-_REMARK_PLUGINS = Var.create_safe([_REMARK_MATH, _REMARK_GFM, _REMARK_UNWRAP_IMAGES])
-_REHYPE_KATEX = Var.create_safe(
- "rehypeKatex", _var_is_local=False, _var_is_string=False
-)
-_REHYPE_RAW = Var.create_safe("rehypeRaw", _var_is_local=False, _var_is_string=False)
-_REHYPE_PLUGINS = Var.create_safe([_REHYPE_KATEX, _REHYPE_RAW])
+_CHILDREN = ImmutableVar.create_safe("children")
+_PROPS = ImmutableVar.create_safe("...props")
+_MOCK_ARG = ImmutableVar.create_safe("")
+_REMARK_MATH = ImmutableVar.create_safe("remarkMath")
+_REMARK_GFM = ImmutableVar.create_safe("remarkGfm")
+_REMARK_UNWRAP_IMAGES = ImmutableVar.create_safe("remarkUnwrapImages")
+_REMARK_PLUGINS = LiteralVar.create([_REMARK_MATH, _REMARK_GFM, _REMARK_UNWRAP_IMAGES])
+_REHYPE_KATEX = ImmutableVar.create_safe("rehypeKatex")
+_REHYPE_RAW = ImmutableVar.create_safe("rehypeRaw")
+_REHYPE_PLUGINS = LiteralVar.create([_REHYPE_KATEX, _REHYPE_RAW])
NO_PROPS_TAGS = ("ul", "ol", "li")
@lru_cache
@@ -45,50 +42,40 @@ class Markdown(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Markdown":
diff --git a/reflex/components/moment/moment.pyi b/reflex/components/moment/moment.pyi
index 5497a5336e8..05c7ffc9610 100644
--- a/reflex/components/moment/moment.pyi
+++ b/reflex/components/moment/moment.pyi
@@ -10,7 +10,7 @@ from reflex.components.component import NoSSRComponent
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
from reflex.utils.imports import ImportDict
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class MomentDelta(Base):
years: Optional[int]
@@ -56,53 +56,41 @@ class Moment(NoSSRComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Moment":
diff --git a/reflex/components/next/base.pyi b/reflex/components/next/base.pyi
index fd561fbecf3..c8b9934d80e 100644
--- a/reflex/components/next/base.pyi
+++ b/reflex/components/next/base.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class NextComponent(Component):
...
@@ -24,50 +24,40 @@ class NextComponent(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "NextComponent":
diff --git a/reflex/components/next/image.py b/reflex/components/next/image.py
index 108d174525b..817bf590a46 100644
--- a/reflex/components/next/image.py
+++ b/reflex/components/next/image.py
@@ -102,8 +102,4 @@ def check_prop_type(prop_name, prop_value):
# mysteriously, following `sizes` prop is needed to avoid blury images.
props["sizes"] = "100vw"
- src = props.get("src", None)
- if src is not None and not isinstance(src, (Var)):
- props["src"] = Var.create(value=src, _var_is_string=True)
-
return super().create(*children, **props)
diff --git a/reflex/components/next/image.pyi b/reflex/components/next/image.pyi
index a27a3420cb6..e6b902cb02e 100644
--- a/reflex/components/next/image.pyi
+++ b/reflex/components/next/image.pyi
@@ -7,7 +7,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .base import NextComponent
@@ -37,56 +37,42 @@ class Image(NextComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_error: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_load: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_error: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_load: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Image":
diff --git a/reflex/components/next/link.pyi b/reflex/components/next/link.pyi
index 06d138176fc..c25ca825884 100644
--- a/reflex/components/next/link.pyi
+++ b/reflex/components/next/link.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class NextLink(Component):
@overload
@@ -24,50 +24,40 @@ class NextLink(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "NextLink":
diff --git a/reflex/components/next/video.pyi b/reflex/components/next/video.pyi
index eb28fab4658..13b39a4f8fd 100644
--- a/reflex/components/next/video.pyi
+++ b/reflex/components/next/video.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .base import NextComponent
@@ -26,50 +26,40 @@ class Video(NextComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Video":
diff --git a/reflex/components/plotly/plotly.pyi b/reflex/components/plotly/plotly.pyi
index 219f113bc98..c308e160fa8 100644
--- a/reflex/components/plotly/plotly.pyi
+++ b/reflex/components/plotly/plotly.pyi
@@ -10,7 +10,7 @@ from reflex.components.component import NoSSRComponent
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
from reflex.utils import console
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
try:
from plotly.graph_objects import Figure, layout
@@ -46,103 +46,89 @@ class Plotly(NoSSRComponent):
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
on_after_plot: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_animated: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_animating_frame: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_animation_interrupted: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_autosize: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_before_hover: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_button_clicked: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_deselect: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_hover: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_hover: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_redraw: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_redraw: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_relayout: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_relayouting: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_restyle: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_selected: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_selecting: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_transition_interrupted: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_transitioning: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_unhover: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Plotly":
diff --git a/reflex/components/radix/primitives/accordion.py b/reflex/components/radix/primitives/accordion.py
index b93bbf284e2..da32d747b51 100644
--- a/reflex/components/radix/primitives/accordion.py
+++ b/reflex/components/radix/primitives/accordion.py
@@ -11,6 +11,7 @@
from reflex.components.radix.primitives.base import RadixPrimitiveComponent
from reflex.components.radix.themes.base import LiteralAccentColor, LiteralRadius
from reflex.event import EventHandler
+from reflex.ivars.base import LiteralVar
from reflex.style import Style
from reflex.vars import Var, get_uuid_string_var
@@ -102,10 +103,10 @@ class AccordionRoot(AccordionComponent):
radius: Var[LiteralRadius]
# The time in milliseconds to animate open and close
- duration: Var[int] = Var.create_safe(DEFAULT_ANIMATION_DURATION)
+ duration: Var[int] = LiteralVar.create(DEFAULT_ANIMATION_DURATION)
# The easing function to use for the animation.
- easing: Var[str] = Var.create_safe(DEFAULT_ANIMATION_EASING, _var_is_string=True)
+ easing: Var[str] = LiteralVar.create(DEFAULT_ANIMATION_EASING)
# Whether to show divider lines between items.
show_dividers: Var[bool]
@@ -464,14 +465,12 @@ def add_style(self) -> dict[str, Any] | None:
Returns:
The style of the component.
"""
- slideDown = Var.create(
+ slideDown = LiteralVar.create(
f"${{slideDown}} var(--animation-duration) var(--animation-easing)",
- _var_is_string=True,
)
- slideUp = Var.create(
+ slideUp = LiteralVar.create(
f"${{slideUp}} var(--animation-duration) var(--animation-easing)",
- _var_is_string=True,
)
return {
diff --git a/reflex/components/radix/primitives/accordion.pyi b/reflex/components/radix/primitives/accordion.pyi
index 7cc1059ab84..edf01118312 100644
--- a/reflex/components/radix/primitives/accordion.pyi
+++ b/reflex/components/radix/primitives/accordion.pyi
@@ -10,7 +10,7 @@ from reflex.components.lucide.icon import Icon
from reflex.components.radix.primitives.base import RadixPrimitiveComponent
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
LiteralAccordionType = Literal["single", "multiple"]
LiteralAccordionDir = Literal["ltr", "rtl"]
@@ -101,50 +101,40 @@ class AccordionComponent(RadixPrimitiveComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AccordionComponent":
@@ -275,53 +265,43 @@ class AccordionRoot(AccordionComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_value_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AccordionRoot":
@@ -441,50 +421,40 @@ class AccordionItem(AccordionComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AccordionItem":
@@ -595,50 +565,40 @@ class AccordionHeader(AccordionComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AccordionHeader":
@@ -745,50 +705,40 @@ class AccordionTrigger(AccordionComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AccordionTrigger":
@@ -827,50 +777,40 @@ class AccordionIcon(Icon):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AccordionIcon":
@@ -974,50 +914,40 @@ class AccordionContent(AccordionComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AccordionContent":
diff --git a/reflex/components/radix/primitives/base.pyi b/reflex/components/radix/primitives/base.pyi
index 0ddea6cb508..a94b2263c50 100644
--- a/reflex/components/radix/primitives/base.pyi
+++ b/reflex/components/radix/primitives/base.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.component import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class RadixPrimitiveComponent(Component):
@overload
@@ -23,50 +23,40 @@ class RadixPrimitiveComponent(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "RadixPrimitiveComponent":
@@ -101,50 +91,40 @@ class RadixPrimitiveComponentWithClassName(RadixPrimitiveComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "RadixPrimitiveComponentWithClassName":
diff --git a/reflex/components/radix/primitives/drawer.pyi b/reflex/components/radix/primitives/drawer.pyi
index dcbebfa15ce..c40bdf53df1 100644
--- a/reflex/components/radix/primitives/drawer.pyi
+++ b/reflex/components/radix/primitives/drawer.pyi
@@ -9,7 +9,7 @@ from reflex.components.component import ComponentNamespace
from reflex.components.radix.primitives.base import RadixPrimitiveComponent
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class DrawerComponent(RadixPrimitiveComponent):
@overload
@@ -24,50 +24,40 @@ class DrawerComponent(RadixPrimitiveComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DrawerComponent":
@@ -118,53 +108,43 @@ class DrawerRoot(DrawerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DrawerRoot":
@@ -208,50 +188,40 @@ class DrawerTrigger(DrawerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DrawerTrigger":
@@ -279,50 +249,40 @@ class DrawerPortal(DrawerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DrawerPortal":
@@ -357,65 +317,55 @@ class DrawerContent(DrawerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_close_auto_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_escape_key_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_interact_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_auto_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_pointer_down_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DrawerContent":
@@ -454,50 +404,40 @@ class DrawerOverlay(DrawerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DrawerOverlay":
@@ -532,50 +472,40 @@ class DrawerClose(DrawerTrigger):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DrawerClose":
@@ -603,50 +533,40 @@ class DrawerTitle(DrawerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DrawerTitle":
@@ -681,50 +601,40 @@ class DrawerDescription(DrawerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DrawerDescription":
@@ -780,53 +690,43 @@ class Drawer(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DrawerRoot":
diff --git a/reflex/components/radix/primitives/form.pyi b/reflex/components/radix/primitives/form.pyi
index 43bd0bbd2ff..758630c4a61 100644
--- a/reflex/components/radix/primitives/form.pyi
+++ b/reflex/components/radix/primitives/form.pyi
@@ -9,7 +9,7 @@ from reflex.components.component import ComponentNamespace
from reflex.components.el.elements.forms import Form as HTMLForm
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .base import RadixPrimitiveComponentWithClassName
@@ -26,50 +26,40 @@ class FormComponent(RadixPrimitiveComponentWithClassName):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "FormComponent":
@@ -144,56 +134,44 @@ class FormRoot(FormComponent, HTMLForm):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_clear_server_errors: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_submit: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_submit: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "FormRoot":
@@ -258,50 +236,40 @@ class FormField(FormComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "FormField":
@@ -339,50 +307,40 @@ class FormLabel(FormComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "FormLabel":
@@ -417,50 +375,40 @@ class FormControl(FormComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "FormControl":
@@ -545,50 +493,40 @@ class FormMessage(FormComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "FormMessage":
@@ -626,50 +564,40 @@ class FormValidityState(FormComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "FormValidityState":
@@ -704,50 +632,40 @@ class FormSubmit(FormComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "FormSubmit":
@@ -823,56 +741,44 @@ class Form(FormRoot):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_clear_server_errors: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_submit: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_submit: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Form":
@@ -979,56 +885,44 @@ class FormNamespace(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_clear_server_errors: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_submit: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_submit: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Form":
diff --git a/reflex/components/radix/primitives/progress.pyi b/reflex/components/radix/primitives/progress.pyi
index 99609c0fc40..f1c817587ba 100644
--- a/reflex/components/radix/primitives/progress.pyi
+++ b/reflex/components/radix/primitives/progress.pyi
@@ -9,7 +9,7 @@ from reflex.components.component import ComponentNamespace
from reflex.components.radix.primitives.base import RadixPrimitiveComponentWithClassName
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class ProgressComponent(RadixPrimitiveComponentWithClassName):
@overload
@@ -24,50 +24,40 @@ class ProgressComponent(RadixPrimitiveComponentWithClassName):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ProgressComponent":
@@ -109,50 +99,40 @@ class ProgressRoot(ProgressComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ProgressRoot":
@@ -253,50 +233,40 @@ class ProgressIndicator(ProgressComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ProgressIndicator":
@@ -404,50 +374,40 @@ class Progress(ProgressRoot):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Progress":
@@ -556,50 +516,40 @@ class ProgressNamespace(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Progress":
diff --git a/reflex/components/radix/primitives/slider.pyi b/reflex/components/radix/primitives/slider.pyi
index 0094bc3bbdb..9ce737df478 100644
--- a/reflex/components/radix/primitives/slider.pyi
+++ b/reflex/components/radix/primitives/slider.pyi
@@ -9,7 +9,7 @@ from reflex.components.component import Component, ComponentNamespace
from reflex.components.radix.primitives.base import RadixPrimitiveComponentWithClassName
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
LiteralSliderOrientation = Literal["horizontal", "vertical"]
LiteralSliderDir = Literal["ltr", "rtl"]
@@ -27,50 +27,40 @@ class SliderComponent(RadixPrimitiveComponentWithClassName):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "SliderComponent":
@@ -122,56 +112,46 @@ class SliderRoot(SliderComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_value_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_value_commit: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "SliderRoot":
@@ -207,50 +187,40 @@ class SliderTrack(SliderComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "SliderTrack":
@@ -286,50 +256,40 @@ class SliderRange(SliderComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "SliderRange":
@@ -365,50 +325,40 @@ class SliderThumb(SliderComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "SliderThumb":
diff --git a/reflex/components/radix/themes/base.py b/reflex/components/radix/themes/base.py
index e0e05cc816f..5a7fb2d9967 100644
--- a/reflex/components/radix/themes/base.py
+++ b/reflex/components/radix/themes/base.py
@@ -7,6 +7,7 @@
from reflex.components import Component
from reflex.components.tags import Tag
from reflex.config import get_config
+from reflex.ivars.base import ImmutableVar
from reflex.utils.imports import ImportDict, ImportVar
from reflex.vars import Var
@@ -113,6 +114,11 @@ def create(
component.alias = "RadixThemes" + (
component.tag or component.__class__.__name__
)
+ # value = props.get("value")
+ # if value is not None and component.alias == "RadixThemesSelect.Root":
+ # lv = LiteralVar.create(value)
+ # print(repr(lv))
+ # print(f"Warning: Value {value} is not used in {component.alias}.")
return component
@staticmethod
@@ -230,10 +236,8 @@ def add_imports(self) -> ImportDict | list[ImportDict]:
def _render(self, props: dict[str, Any] | None = None) -> Tag:
tag = super()._render(props)
tag.add_props(
- css=Var.create(
- "{{...theme.styles.global[':root'], ...theme.styles.global.body}}",
- _var_is_local=False,
- _var_is_string=False,
+ css=ImmutableVar.create(
+ f"{{...theme.styles.global[':root'], ...theme.styles.global.body}}"
),
)
return tag
diff --git a/reflex/components/radix/themes/base.pyi b/reflex/components/radix/themes/base.pyi
index 3014b50137c..5aea55d9089 100644
--- a/reflex/components/radix/themes/base.pyi
+++ b/reflex/components/radix/themes/base.pyi
@@ -9,7 +9,7 @@ from reflex.components import Component
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
from reflex.utils.imports import ImportDict
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
LiteralAlign = Literal["start", "center", "end", "baseline", "stretch"]
LiteralJustify = Literal["start", "center", "end", "between"]
@@ -103,50 +103,40 @@ class CommonMarginProps(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "CommonMarginProps":
@@ -187,50 +177,40 @@ class RadixLoadingProp(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "RadixLoadingProp":
@@ -264,50 +244,40 @@ class RadixThemesComponent(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "RadixThemesComponent":
@@ -343,50 +313,40 @@ class RadixThemesTriggerComponent(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "RadixThemesTriggerComponent":
@@ -505,50 +465,40 @@ class Theme(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Theme":
@@ -595,50 +545,40 @@ class ThemePanel(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ThemePanel":
@@ -675,50 +615,40 @@ class RadixThemesColorModeProvider(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "RadixThemesColorModeProvider":
diff --git a/reflex/components/radix/themes/color_mode.py b/reflex/components/radix/themes/color_mode.py
index 8243a822afc..511a2ea31ee 100644
--- a/reflex/components/radix/themes/color_mode.py
+++ b/reflex/components/radix/themes/color_mode.py
@@ -17,7 +17,6 @@
from __future__ import annotations
-import dataclasses
from typing import Literal, get_args
from reflex.components.component import BaseComponent
@@ -25,6 +24,7 @@
from reflex.components.lucide.icon import Icon
from reflex.components.radix.themes.components.dropdown_menu import dropdown_menu
from reflex.components.radix.themes.components.switch import Switch
+from reflex.ivars.base import ImmutableVar
from reflex.style import (
LIGHT_COLOR_MODE,
color_mode,
@@ -33,7 +33,7 @@
toggle_color_mode,
)
from reflex.utils import console
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .components.icon_button import IconButton
@@ -195,7 +195,7 @@ def create(cls, *children, **props):
)
-class ColorModeNamespace(BaseVar):
+class ColorModeNamespace(ImmutableVar):
"""Namespace for color mode components."""
icon = staticmethod(ColorModeIcon.create)
@@ -204,5 +204,7 @@ class ColorModeNamespace(BaseVar):
color_mode = color_mode_var_and_namespace = ColorModeNamespace(
- **dataclasses.asdict(color_mode)
+ _var_name=color_mode._var_name,
+ _var_type=color_mode._var_type,
+ _var_data=color_mode.get_default_value(),
)
diff --git a/reflex/components/radix/themes/color_mode.pyi b/reflex/components/radix/themes/color_mode.pyi
index 474c4cf3608..3ad5e46d34c 100644
--- a/reflex/components/radix/themes/color_mode.pyi
+++ b/reflex/components/radix/themes/color_mode.pyi
@@ -3,7 +3,6 @@
# ------------------- DO NOT EDIT ----------------------
# This file was generated by `reflex/utils/pyi_generator.py`!
# ------------------------------------------------------
-import dataclasses
from typing import Any, Callable, Dict, Literal, Optional, Union, get_args, overload
from reflex.components.component import BaseComponent
@@ -12,11 +11,12 @@ from reflex.components.core.cond import Cond
from reflex.components.lucide.icon import Icon
from reflex.components.radix.themes.components.switch import Switch
from reflex.event import EventHandler, EventSpec
+from reflex.ivars.base import ImmutableVar
from reflex.style import (
Style,
color_mode,
)
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .components.icon_button import IconButton
@@ -38,50 +38,40 @@ class ColorModeIcon(Cond):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ColorModeIcon":
@@ -250,50 +240,40 @@ class ColorModeIconButton(IconButton):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ColorModeIconButton":
@@ -454,53 +434,41 @@ class ColorModeSwitch(Switch):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ColorModeSwitch":
@@ -533,11 +501,13 @@ class ColorModeSwitch(Switch):
"""
...
-class ColorModeNamespace(BaseVar):
+class ColorModeNamespace(ImmutableVar):
icon = staticmethod(ColorModeIcon.create)
button = staticmethod(ColorModeIconButton.create)
switch = staticmethod(ColorModeSwitch.create)
color_mode = color_mode_var_and_namespace = ColorModeNamespace(
- **dataclasses.asdict(color_mode)
+ _var_name=color_mode._var_name,
+ _var_type=color_mode._var_type,
+ _var_data=color_mode.get_default_value(),
)
diff --git a/reflex/components/radix/themes/components/alert_dialog.pyi b/reflex/components/radix/themes/components/alert_dialog.pyi
index 406d5eb2dc1..4cb9e966cfd 100644
--- a/reflex/components/radix/themes/components/alert_dialog.pyi
+++ b/reflex/components/radix/themes/components/alert_dialog.pyi
@@ -10,7 +10,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent, RadixThemesTriggerComponent
@@ -29,53 +29,43 @@ class AlertDialogRoot(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AlertDialogRoot":
@@ -112,50 +102,40 @@ class AlertDialogTrigger(RadixThemesTriggerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AlertDialogTrigger":
@@ -219,59 +199,49 @@ class AlertDialogContent(elements.Div, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_close_auto_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_escape_key_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_auto_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AlertDialogContent":
@@ -325,50 +295,40 @@ class AlertDialogTitle(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AlertDialogTitle":
@@ -404,50 +364,40 @@ class AlertDialogDescription(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AlertDialogDescription":
@@ -483,50 +433,40 @@ class AlertDialogAction(RadixThemesTriggerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AlertDialogAction":
@@ -553,50 +493,40 @@ class AlertDialogCancel(RadixThemesTriggerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AlertDialogCancel":
diff --git a/reflex/components/radix/themes/components/aspect_ratio.pyi b/reflex/components/radix/themes/components/aspect_ratio.pyi
index 08109b740af..612c67a2965 100644
--- a/reflex/components/radix/themes/components/aspect_ratio.pyi
+++ b/reflex/components/radix/themes/components/aspect_ratio.pyi
@@ -7,7 +7,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -24,50 +24,40 @@ class AspectRatio(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AspectRatio":
diff --git a/reflex/components/radix/themes/components/avatar.pyi b/reflex/components/radix/themes/components/avatar.pyi
index 894ee6f6763..c0476d543de 100644
--- a/reflex/components/radix/themes/components/avatar.pyi
+++ b/reflex/components/radix/themes/components/avatar.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -114,50 +114,40 @@ class Avatar(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Avatar":
diff --git a/reflex/components/radix/themes/components/badge.pyi b/reflex/components/radix/themes/components/badge.pyi
index 74d6dec2404..327fe2b90f8 100644
--- a/reflex/components/radix/themes/components/badge.pyi
+++ b/reflex/components/radix/themes/components/badge.pyi
@@ -9,7 +9,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -135,50 +135,40 @@ class Badge(elements.Span, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Badge":
diff --git a/reflex/components/radix/themes/components/button.pyi b/reflex/components/radix/themes/components/button.pyi
index 877b7630bec..95a80c84e7a 100644
--- a/reflex/components/radix/themes/components/button.pyi
+++ b/reflex/components/radix/themes/components/button.pyi
@@ -9,7 +9,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import (
RadixLoadingProp,
@@ -158,50 +158,40 @@ class Button(elements.Button, RadixLoadingProp, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Button":
diff --git a/reflex/components/radix/themes/components/callout.pyi b/reflex/components/radix/themes/components/callout.pyi
index 2085fb4f551..04e1d131787 100644
--- a/reflex/components/radix/themes/components/callout.pyi
+++ b/reflex/components/radix/themes/components/callout.pyi
@@ -10,7 +10,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -133,50 +133,40 @@ class CalloutRoot(elements.Div, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "CalloutRoot":
@@ -257,50 +247,40 @@ class CalloutIcon(elements.Div, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "CalloutIcon":
@@ -376,50 +356,40 @@ class CalloutText(elements.P, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "CalloutText":
@@ -578,50 +548,40 @@ class Callout(CalloutRoot):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Callout":
@@ -786,50 +746,40 @@ class CalloutNamespace(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Callout":
diff --git a/reflex/components/radix/themes/components/card.pyi b/reflex/components/radix/themes/components/card.pyi
index dc12b7d884b..142cc74484b 100644
--- a/reflex/components/radix/themes/components/card.pyi
+++ b/reflex/components/radix/themes/components/card.pyi
@@ -9,7 +9,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -68,50 +68,40 @@ class Card(elements.Div, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Card":
diff --git a/reflex/components/radix/themes/components/checkbox.py b/reflex/components/radix/themes/components/checkbox.py
index 4751c499559..f191ce613e3 100644
--- a/reflex/components/radix/themes/components/checkbox.py
+++ b/reflex/components/radix/themes/components/checkbox.py
@@ -7,6 +7,7 @@
from reflex.components.radix.themes.layout.flex import Flex
from reflex.components.radix.themes.typography.text import Text
from reflex.event import EventHandler
+from reflex.ivars.base import LiteralVar
from reflex.vars import Var
from ..base import (
@@ -115,9 +116,7 @@ class HighLevelCheckbox(RadixThemesComponent):
on_change: EventHandler[lambda e0: [e0]]
@classmethod
- def create(
- cls, text: Var[str] = Var.create_safe("", _var_is_string=True), **props
- ) -> Component:
+ def create(cls, text: Var[str] = LiteralVar.create(""), **props) -> Component:
"""Create a checkbox with a label.
Args:
diff --git a/reflex/components/radix/themes/components/checkbox.pyi b/reflex/components/radix/themes/components/checkbox.pyi
index d21018e1d67..52441eef4c9 100644
--- a/reflex/components/radix/themes/components/checkbox.pyi
+++ b/reflex/components/radix/themes/components/checkbox.pyi
@@ -9,7 +9,7 @@ from reflex.components.component import ComponentNamespace
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -115,53 +115,41 @@ class Checkbox(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Checkbox":
@@ -294,53 +282,41 @@ class HighLevelCheckbox(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "HighLevelCheckbox":
@@ -470,53 +446,41 @@ class CheckboxNamespace(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "HighLevelCheckbox":
diff --git a/reflex/components/radix/themes/components/checkbox_cards.pyi b/reflex/components/radix/themes/components/checkbox_cards.pyi
index c35754bde21..d7be8a056e1 100644
--- a/reflex/components/radix/themes/components/checkbox_cards.pyi
+++ b/reflex/components/radix/themes/components/checkbox_cards.pyi
@@ -9,7 +9,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -148,50 +148,40 @@ class CheckboxCardsRoot(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "CheckboxCardsRoot":
@@ -233,50 +223,40 @@ class CheckboxCardsItem(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "CheckboxCardsItem":
diff --git a/reflex/components/radix/themes/components/checkbox_group.pyi b/reflex/components/radix/themes/components/checkbox_group.pyi
index 334ee3dd381..8a730b870c0 100644
--- a/reflex/components/radix/themes/components/checkbox_group.pyi
+++ b/reflex/components/radix/themes/components/checkbox_group.pyi
@@ -9,7 +9,7 @@ from typing import Any, Callable, Dict, List, Literal, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -107,50 +107,40 @@ class CheckboxGroupRoot(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "CheckboxGroupRoot":
@@ -194,50 +184,40 @@ class CheckboxGroupItem(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "CheckboxGroupItem":
diff --git a/reflex/components/radix/themes/components/context_menu.pyi b/reflex/components/radix/themes/components/context_menu.pyi
index dbe23ee81d2..e2f9d01e29d 100644
--- a/reflex/components/radix/themes/components/context_menu.pyi
+++ b/reflex/components/radix/themes/components/context_menu.pyi
@@ -9,7 +9,7 @@ from reflex.components.component import ComponentNamespace
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -26,53 +26,43 @@ class ContextMenuRoot(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ContextMenuRoot":
@@ -110,50 +100,40 @@ class ContextMenuTrigger(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ContextMenuTrigger":
@@ -265,65 +245,55 @@ class ContextMenuContent(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_close_auto_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_escape_key_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_focus_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_interact_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_pointer_down_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ContextMenuContent":
@@ -365,50 +335,40 @@ class ContextMenuSub(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ContextMenuSub":
@@ -445,50 +405,40 @@ class ContextMenuSubTrigger(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ContextMenuSubTrigger":
@@ -526,62 +476,52 @@ class ContextMenuSubContent(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_escape_key_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_focus_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_interact_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_pointer_down_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ContextMenuSubContent":
@@ -681,50 +621,40 @@ class ContextMenuItem(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ContextMenuItem":
@@ -762,50 +692,40 @@ class ContextMenuSeparator(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ContextMenuSeparator":
diff --git a/reflex/components/radix/themes/components/data_list.pyi b/reflex/components/radix/themes/components/data_list.pyi
index 8eb49e9f514..93d00c86b21 100644
--- a/reflex/components/radix/themes/components/data_list.pyi
+++ b/reflex/components/radix/themes/components/data_list.pyi
@@ -9,7 +9,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -60,50 +60,40 @@ class DataListRoot(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DataListRoot":
@@ -159,50 +149,40 @@ class DataListItem(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DataListItem":
@@ -310,50 +290,40 @@ class DataListLabel(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DataListLabel":
@@ -393,50 +363,40 @@ class DataListValue(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DataListValue":
diff --git a/reflex/components/radix/themes/components/dialog.pyi b/reflex/components/radix/themes/components/dialog.pyi
index 0f05ca40699..02b1a6c9f70 100644
--- a/reflex/components/radix/themes/components/dialog.pyi
+++ b/reflex/components/radix/themes/components/dialog.pyi
@@ -10,7 +10,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent, RadixThemesTriggerComponent
@@ -27,53 +27,43 @@ class DialogRoot(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DialogRoot":
@@ -110,50 +100,40 @@ class DialogTrigger(RadixThemesTriggerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DialogTrigger":
@@ -180,50 +160,40 @@ class DialogTitle(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DialogTitle":
@@ -295,65 +265,55 @@ class DialogContent(elements.Div, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_close_auto_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_escape_key_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_interact_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_auto_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_pointer_down_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DialogContent":
@@ -406,50 +366,40 @@ class DialogDescription(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DialogDescription":
@@ -485,50 +435,40 @@ class DialogClose(RadixThemesTriggerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DialogClose":
@@ -561,53 +501,43 @@ class Dialog(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DialogRoot":
diff --git a/reflex/components/radix/themes/components/dropdown_menu.pyi b/reflex/components/radix/themes/components/dropdown_menu.pyi
index d2b9216e1a6..df7b235894c 100644
--- a/reflex/components/radix/themes/components/dropdown_menu.pyi
+++ b/reflex/components/radix/themes/components/dropdown_menu.pyi
@@ -9,7 +9,7 @@ from reflex.components.component import ComponentNamespace
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent, RadixThemesTriggerComponent
@@ -36,53 +36,43 @@ class DropdownMenuRoot(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DropdownMenuRoot":
@@ -123,50 +113,40 @@ class DropdownMenuTrigger(RadixThemesTriggerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DropdownMenuTrigger":
@@ -297,65 +277,55 @@ class DropdownMenuContent(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_close_auto_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_escape_key_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_focus_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_interact_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_pointer_down_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DropdownMenuContent":
@@ -410,50 +380,40 @@ class DropdownMenuSubTrigger(RadixThemesTriggerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DropdownMenuSubTrigger":
@@ -482,53 +442,43 @@ class DropdownMenuSub(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DropdownMenuSub":
@@ -585,62 +535,52 @@ class DropdownMenuSubContent(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_escape_key_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_focus_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_interact_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_pointer_down_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DropdownMenuSubContent":
@@ -752,53 +692,41 @@ class DropdownMenuItem(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_select: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_select: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DropdownMenuItem":
@@ -839,50 +767,40 @@ class DropdownMenuSeparator(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DropdownMenuSeparator":
diff --git a/reflex/components/radix/themes/components/hover_card.pyi b/reflex/components/radix/themes/components/hover_card.pyi
index 0d43f387f2f..ad56a83027a 100644
--- a/reflex/components/radix/themes/components/hover_card.pyi
+++ b/reflex/components/radix/themes/components/hover_card.pyi
@@ -10,7 +10,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent, RadixThemesTriggerComponent
@@ -30,53 +30,43 @@ class HoverCardRoot(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "HoverCardRoot":
@@ -116,50 +106,40 @@ class HoverCardTrigger(RadixThemesTriggerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "HoverCardTrigger":
@@ -230,50 +210,40 @@ class HoverCardContent(elements.Div, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "HoverCardContent":
@@ -335,53 +305,43 @@ class HoverCard(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "HoverCardRoot":
diff --git a/reflex/components/radix/themes/components/icon_button.pyi b/reflex/components/radix/themes/components/icon_button.pyi
index 25de639384d..b5c75a9b6cf 100644
--- a/reflex/components/radix/themes/components/icon_button.pyi
+++ b/reflex/components/radix/themes/components/icon_button.pyi
@@ -9,7 +9,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import (
RadixLoadingProp,
@@ -158,50 +158,40 @@ class IconButton(elements.Button, RadixLoadingProp, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "IconButton":
diff --git a/reflex/components/radix/themes/components/inset.pyi b/reflex/components/radix/themes/components/inset.pyi
index 0106a23b2cf..3671d2a5ca8 100644
--- a/reflex/components/radix/themes/components/inset.pyi
+++ b/reflex/components/radix/themes/components/inset.pyi
@@ -9,7 +9,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -133,50 +133,40 @@ class Inset(elements.Div, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Inset":
diff --git a/reflex/components/radix/themes/components/popover.pyi b/reflex/components/radix/themes/components/popover.pyi
index 82bec124b34..d8bd9d1d6f6 100644
--- a/reflex/components/radix/themes/components/popover.pyi
+++ b/reflex/components/radix/themes/components/popover.pyi
@@ -10,7 +10,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent, RadixThemesTriggerComponent
@@ -28,53 +28,43 @@ class PopoverRoot(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "PopoverRoot":
@@ -112,50 +102,40 @@ class PopoverTrigger(RadixThemesTriggerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "PopoverTrigger":
@@ -233,68 +213,58 @@ class PopoverContent(elements.Div, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_close_auto_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_escape_key_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_focus_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_interact_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_auto_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_pointer_down_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "PopoverContent":
@@ -352,50 +322,40 @@ class PopoverClose(RadixThemesTriggerComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "PopoverClose":
diff --git a/reflex/components/radix/themes/components/progress.pyi b/reflex/components/radix/themes/components/progress.pyi
index 514061ba7fd..a647e94e641 100644
--- a/reflex/components/radix/themes/components/progress.pyi
+++ b/reflex/components/radix/themes/components/progress.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -113,50 +113,40 @@ class Progress(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Progress":
diff --git a/reflex/components/radix/themes/components/radio.pyi b/reflex/components/radix/themes/components/radio.pyi
index e00a6db581c..5c1b303fa06 100644
--- a/reflex/components/radix/themes/components/radio.pyi
+++ b/reflex/components/radix/themes/components/radio.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -104,50 +104,40 @@ class Radio(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Radio":
diff --git a/reflex/components/radix/themes/components/radio_cards.pyi b/reflex/components/radix/themes/components/radio_cards.pyi
index 4feb78d20a4..2c0bf002b0e 100644
--- a/reflex/components/radix/themes/components/radio_cards.pyi
+++ b/reflex/components/radix/themes/components/radio_cards.pyi
@@ -9,7 +9,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -162,53 +162,43 @@ class RadioCardsRoot(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_value_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "RadioCardsRoot":
@@ -262,50 +252,40 @@ class RadioCardsItem(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "RadioCardsItem":
diff --git a/reflex/components/radix/themes/components/radio_group.py b/reflex/components/radix/themes/components/radio_group.py
index 20ccbd5b5aa..049e47b292a 100644
--- a/reflex/components/radix/themes/components/radio_group.py
+++ b/reflex/components/radix/themes/components/radio_group.py
@@ -10,6 +10,8 @@
from reflex.components.radix.themes.layout.flex import Flex
from reflex.components.radix.themes.typography.text import Text
from reflex.event import EventHandler
+from reflex.ivars.base import ImmutableVar, LiteralVar
+from reflex.ivars.sequence import StringVar
from reflex.vars import Var
from ..base import (
@@ -27,14 +29,10 @@ class RadioGroupRoot(RadixThemesComponent):
tag = "RadioGroup.Root"
# The size of the radio group: "1" | "2" | "3"
- size: Var[Responsive[Literal["1", "2", "3"]]] = Var.create_safe(
- "2", _var_is_string=True
- )
+ size: Var[Responsive[Literal["1", "2", "3"]]] = LiteralVar.create("2")
# The variant of the radio group
- variant: Var[Literal["classic", "surface", "soft"]] = Var.create_safe(
- "classic", _var_is_string=True
- )
+ variant: Var[Literal["classic", "surface", "soft"]] = LiteralVar.create("classic")
# The color of the radio group
color_scheme: Var[LiteralAccentColor]
@@ -86,20 +84,16 @@ class HighLevelRadioGroup(RadixThemesComponent):
items: Var[List[str]]
# The direction of the radio group.
- direction: Var[LiteralFlexDirection] = Var.create_safe(
- "column", _var_is_string=True
- )
+ direction: Var[LiteralFlexDirection] = LiteralVar.create("column")
# The gap between the items of the radio group.
- spacing: Var[LiteralSpacing] = Var.create_safe("2", _var_is_string=True)
+ spacing: Var[LiteralSpacing] = LiteralVar.create("2")
# The size of the radio group.
- size: Var[Literal["1", "2", "3"]] = Var.create_safe("2", _var_is_string=True)
+ size: Var[Literal["1", "2", "3"]] = LiteralVar.create("2")
# The variant of the radio group
- variant: Var[Literal["classic", "surface", "soft"]] = Var.create_safe(
- "classic", _var_is_string=True
- )
+ variant: Var[Literal["classic", "surface", "soft"]] = LiteralVar.create("classic")
# The color of the radio group
color_scheme: Var[LiteralAccentColor]
@@ -147,34 +141,29 @@ def create(
color_scheme = props.pop("color_scheme", None)
default_value = props.pop("default_value", "")
- default_value = Var.create(default_value, _var_is_string=True)
+ default_value = LiteralVar.create(default_value)
# convert only non-strings to json(JSON.stringify) so quotes are not rendered
# for string literal types.
if isinstance(default_value, str) or (
isinstance(default_value, Var) and default_value._var_type is str
):
- default_value = Var.create(default_value, _var_is_string=True) # type: ignore
+ default_value = LiteralVar.create(default_value) # type: ignore
else:
- default_value = (
- Var.create(default_value, _var_is_string=False)
- .to_string() # type: ignore
- ._replace(_var_is_local=False)
- )
+ default_value = ImmutableVar.create_safe(default_value).to_string()
- def radio_group_item(value: str | Var) -> Component:
- item_value = Var.create(value, _var_is_string=False) # type: ignore
+ def radio_group_item(value: Var) -> Component:
item_value = rx.cond(
- item_value._type() == str, # type: ignore
- item_value,
- item_value.to_string()._replace(_var_is_local=False), # type: ignore
- )._replace(_var_type=str)
+ value._type() == "string",
+ value,
+ value.to_string(),
+ ).to(StringVar)
return Text.create(
Flex.create(
RadioGroupItem.create(
value=item_value,
- disabled=props.get("disabled", Var.create(False)),
+ disabled=props.get("disabled", LiteralVar.create(False)),
),
item_value,
spacing="2",
@@ -183,8 +172,7 @@ def radio_group_item(value: str | Var) -> Component:
as_="label",
)
- items = Var.create(items) # type: ignore
- children = [rx.foreach(items, radio_group_item)]
+ children = [rx.foreach(LiteralVar.create(items), radio_group_item)]
return RadioGroupRoot.create(
Flex.create(
diff --git a/reflex/components/radix/themes/components/radio_group.pyi b/reflex/components/radix/themes/components/radio_group.pyi
index 0452450ff0b..8fb19ae677b 100644
--- a/reflex/components/radix/themes/components/radio_group.pyi
+++ b/reflex/components/radix/themes/components/radio_group.pyi
@@ -9,7 +9,7 @@ from reflex.components.component import ComponentNamespace
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -112,53 +112,41 @@ class RadioGroupRoot(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "RadioGroupRoot":
@@ -206,50 +194,40 @@ class RadioGroupItem(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "RadioGroupItem":
@@ -378,50 +356,40 @@ class HighLevelRadioGroup(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "HighLevelRadioGroup":
@@ -557,50 +525,40 @@ class RadioGroup(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "HighLevelRadioGroup":
diff --git a/reflex/components/radix/themes/components/scroll_area.pyi b/reflex/components/radix/themes/components/scroll_area.pyi
index e7d2018da37..8b4e44df524 100644
--- a/reflex/components/radix/themes/components/scroll_area.pyi
+++ b/reflex/components/radix/themes/components/scroll_area.pyi
@@ -7,7 +7,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -36,50 +36,40 @@ class ScrollArea(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ScrollArea":
diff --git a/reflex/components/radix/themes/components/segmented_control.pyi b/reflex/components/radix/themes/components/segmented_control.pyi
index 4ac662e1352..f284dab771f 100644
--- a/reflex/components/radix/themes/components/segmented_control.pyi
+++ b/reflex/components/radix/themes/components/segmented_control.pyi
@@ -9,7 +9,7 @@ from typing import Any, Callable, Dict, List, Literal, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -114,53 +114,41 @@ class SegmentedControlRoot(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "SegmentedControlRoot":
@@ -202,50 +190,40 @@ class SegmentedControlItem(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "SegmentedControlItem":
diff --git a/reflex/components/radix/themes/components/select.pyi b/reflex/components/radix/themes/components/select.pyi
index 125ced252da..e2657b7ce0e 100644
--- a/reflex/components/radix/themes/components/select.pyi
+++ b/reflex/components/radix/themes/components/select.pyi
@@ -9,7 +9,7 @@ from reflex.components.component import ComponentNamespace
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -43,56 +43,44 @@ class SelectRoot(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "SelectRoot":
@@ -211,50 +199,40 @@ class SelectTrigger(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "SelectTrigger":
@@ -380,59 +358,49 @@ class SelectContent(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_close_auto_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_escape_key_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_pointer_down_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "SelectContent":
@@ -476,50 +444,40 @@ class SelectGroup(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "SelectGroup":
@@ -557,50 +515,40 @@ class SelectItem(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "SelectItem":
@@ -638,50 +586,40 @@ class SelectLabel(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "SelectLabel":
@@ -717,50 +655,40 @@ class SelectSeparator(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "SelectSeparator":
@@ -899,56 +827,44 @@ class HighLevelSelect(SelectRoot):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "HighLevelSelect":
@@ -1107,56 +1023,44 @@ class Select(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "HighLevelSelect":
diff --git a/reflex/components/radix/themes/components/separator.py b/reflex/components/radix/themes/components/separator.py
index fbc44587893..81f83194bf3 100644
--- a/reflex/components/radix/themes/components/separator.py
+++ b/reflex/components/radix/themes/components/separator.py
@@ -3,6 +3,7 @@
from typing import Literal
from reflex.components.core.breakpoints import Responsive
+from reflex.ivars.base import LiteralVar
from reflex.vars import Var
from ..base import (
@@ -19,9 +20,7 @@ class Separator(RadixThemesComponent):
tag = "Separator"
# The size of the select: "1" | "2" | "3" | "4"
- size: Var[Responsive[LiteralSeperatorSize]] = Var.create_safe(
- "4", _var_is_string=True
- )
+ size: Var[Responsive[LiteralSeperatorSize]] = LiteralVar.create("4")
# The color of the select
color_scheme: Var[LiteralAccentColor]
diff --git a/reflex/components/radix/themes/components/separator.pyi b/reflex/components/radix/themes/components/separator.pyi
index 0c5dc64ec5f..15670f51a9d 100644
--- a/reflex/components/radix/themes/components/separator.pyi
+++ b/reflex/components/radix/themes/components/separator.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -113,50 +113,40 @@ class Separator(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Separator":
diff --git a/reflex/components/radix/themes/components/skeleton.pyi b/reflex/components/radix/themes/components/skeleton.pyi
index 3f2c048f6fc..d6c6bbb03c0 100644
--- a/reflex/components/radix/themes/components/skeleton.pyi
+++ b/reflex/components/radix/themes/components/skeleton.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixLoadingProp, RadixThemesComponent
@@ -43,50 +43,40 @@ class Skeleton(RadixLoadingProp, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Skeleton":
diff --git a/reflex/components/radix/themes/components/slider.pyi b/reflex/components/radix/themes/components/slider.pyi
index 57fda44d273..362451bfe25 100644
--- a/reflex/components/radix/themes/components/slider.pyi
+++ b/reflex/components/radix/themes/components/slider.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, List, Literal, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -133,56 +133,44 @@ class Slider(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_value_commit: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Slider":
diff --git a/reflex/components/radix/themes/components/spinner.pyi b/reflex/components/radix/themes/components/spinner.pyi
index f061e581336..7fa62734a92 100644
--- a/reflex/components/radix/themes/components/spinner.pyi
+++ b/reflex/components/radix/themes/components/spinner.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixLoadingProp, RadixThemesComponent
@@ -38,50 +38,40 @@ class Spinner(RadixLoadingProp, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Spinner":
diff --git a/reflex/components/radix/themes/components/switch.pyi b/reflex/components/radix/themes/components/switch.pyi
index cd01cc60481..a0f85dbac1b 100644
--- a/reflex/components/radix/themes/components/switch.pyi
+++ b/reflex/components/radix/themes/components/switch.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -118,53 +118,41 @@ class Switch(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Switch":
diff --git a/reflex/components/radix/themes/components/table.pyi b/reflex/components/radix/themes/components/table.pyi
index 01b4e61c4fb..9cac240f272 100644
--- a/reflex/components/radix/themes/components/table.pyi
+++ b/reflex/components/radix/themes/components/table.pyi
@@ -10,7 +10,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -66,50 +66,40 @@ class TableRoot(elements.Table, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "TableRoot":
@@ -190,50 +180,40 @@ class TableHeader(elements.Thead, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "TableHeader":
@@ -316,50 +296,40 @@ class TableRow(elements.Tr, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "TableRow":
@@ -447,50 +417,40 @@ class TableColumnHeaderCell(elements.Th, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "TableColumnHeaderCell":
@@ -573,50 +533,40 @@ class TableBody(elements.Tbody, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "TableBody":
@@ -703,50 +653,40 @@ class TableCell(elements.Td, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "TableCell":
@@ -838,50 +778,40 @@ class TableRowHeaderCell(elements.Th, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "TableRowHeaderCell":
diff --git a/reflex/components/radix/themes/components/tabs.pyi b/reflex/components/radix/themes/components/tabs.pyi
index 7d324e96d3b..0fb33b16dd7 100644
--- a/reflex/components/radix/themes/components/tabs.pyi
+++ b/reflex/components/radix/themes/components/tabs.pyi
@@ -9,7 +9,7 @@ from reflex.components.component import ComponentNamespace
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -40,53 +40,41 @@ class TabsRoot(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "TabsRoot":
@@ -136,50 +124,40 @@ class TabsList(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "TabsList":
@@ -281,50 +259,40 @@ class TabsTrigger(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "TabsTrigger":
@@ -365,50 +333,40 @@ class TabsContent(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "TabsContent":
@@ -461,53 +419,41 @@ class Tabs(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "TabsRoot":
diff --git a/reflex/components/radix/themes/components/text_area.pyi b/reflex/components/radix/themes/components/text_area.pyi
index 231158c8418..9a8a4787349 100644
--- a/reflex/components/radix/themes/components/text_area.pyi
+++ b/reflex/components/radix/themes/components/text_area.pyi
@@ -9,7 +9,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -168,59 +168,45 @@ class TextArea(RadixThemesComponent, elements.Textarea):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_key_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_key_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_key_up: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "TextArea":
diff --git a/reflex/components/radix/themes/components/text_field.py b/reflex/components/radix/themes/components/text_field.py
index c6d7ddf4874..aca42284018 100644
--- a/reflex/components/radix/themes/components/text_field.py
+++ b/reflex/components/radix/themes/components/text_field.py
@@ -10,6 +10,7 @@
from reflex.components.core.debounce import DebounceInput
from reflex.components.el import elements
from reflex.event import EventHandler
+from reflex.ivars.base import LiteralVar
from reflex.style import Style, format_as_emotion
from reflex.utils import console
from reflex.vars import Var
@@ -154,7 +155,7 @@ def create_root_deprecated(cls, *children, **props) -> Component:
style = Style(template.style)
style.update(child.style)
child._get_style = lambda style=style: {
- "css": Var.create(format_as_emotion(style))
+ "css": LiteralVar.create(format_as_emotion(style))
}
for trigger in template.event_triggers:
if trigger not in child.event_triggers:
diff --git a/reflex/components/radix/themes/components/text_field.pyi b/reflex/components/radix/themes/components/text_field.pyi
index 86ba7e70f6e..5d6df2f265f 100644
--- a/reflex/components/radix/themes/components/text_field.pyi
+++ b/reflex/components/radix/themes/components/text_field.pyi
@@ -10,7 +10,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -149,59 +149,45 @@ class TextFieldRoot(elements.Div, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_key_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_key_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_key_up: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "TextFieldRoot":
@@ -332,50 +318,40 @@ class TextFieldSlot(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "TextFieldSlot":
@@ -534,59 +510,45 @@ class TextField(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_key_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_key_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_key_up: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "TextFieldRoot":
diff --git a/reflex/components/radix/themes/components/tooltip.pyi b/reflex/components/radix/themes/components/tooltip.pyi
index 0628acff166..a2344958ffa 100644
--- a/reflex/components/radix/themes/components/tooltip.pyi
+++ b/reflex/components/radix/themes/components/tooltip.pyi
@@ -7,7 +7,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -62,59 +62,49 @@ class Tooltip(RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_escape_key_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_pointer_down_outside: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Tooltip":
diff --git a/reflex/components/radix/themes/layout/base.pyi b/reflex/components/radix/themes/layout/base.pyi
index 83e0e018f8f..21fed38eff2 100644
--- a/reflex/components/radix/themes/layout/base.pyi
+++ b/reflex/components/radix/themes/layout/base.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import CommonMarginProps, RadixThemesComponent
@@ -201,50 +201,40 @@ class LayoutComponent(CommonMarginProps, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "LayoutComponent":
diff --git a/reflex/components/radix/themes/layout/box.pyi b/reflex/components/radix/themes/layout/box.pyi
index 9c4bd800d9e..6bcd75cadaa 100644
--- a/reflex/components/radix/themes/layout/box.pyi
+++ b/reflex/components/radix/themes/layout/box.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -48,50 +48,40 @@ class Box(elements.Div, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Box":
diff --git a/reflex/components/radix/themes/layout/center.pyi b/reflex/components/radix/themes/layout/center.pyi
index bbdf51d07da..93f8848983d 100644
--- a/reflex/components/radix/themes/layout/center.pyi
+++ b/reflex/components/radix/themes/layout/center.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .flex import Flex
@@ -125,50 +125,40 @@ class Center(Flex):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Center":
diff --git a/reflex/components/radix/themes/layout/container.py b/reflex/components/radix/themes/layout/container.py
index c0f1c7dc8b9..4ed18031d5d 100644
--- a/reflex/components/radix/themes/layout/container.py
+++ b/reflex/components/radix/themes/layout/container.py
@@ -6,6 +6,7 @@
from reflex.components.core.breakpoints import Responsive
from reflex.components.el import elements
+from reflex.ivars.base import LiteralVar
from reflex.style import STACK_CHILDREN_FULL_WIDTH
from reflex.vars import Var
@@ -23,9 +24,7 @@ class Container(elements.Div, RadixThemesComponent):
tag = "Container"
# The size of the container: "1" - "4" (default "3")
- size: Var[Responsive[LiteralContainerSize]] = Var.create_safe(
- "3", _var_is_string=True
- )
+ size: Var[Responsive[LiteralContainerSize]] = LiteralVar.create("3")
@classmethod
def create(
diff --git a/reflex/components/radix/themes/layout/container.pyi b/reflex/components/radix/themes/layout/container.pyi
index 4e4c0bae324..3c2013b8e43 100644
--- a/reflex/components/radix/themes/layout/container.pyi
+++ b/reflex/components/radix/themes/layout/container.pyi
@@ -9,7 +9,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -65,50 +65,40 @@ class Container(elements.Div, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Container":
diff --git a/reflex/components/radix/themes/layout/flex.pyi b/reflex/components/radix/themes/layout/flex.pyi
index f4e851d091b..a49f082627a 100644
--- a/reflex/components/radix/themes/layout/flex.pyi
+++ b/reflex/components/radix/themes/layout/flex.pyi
@@ -9,7 +9,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -128,50 +128,40 @@ class Flex(elements.Div, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Flex":
diff --git a/reflex/components/radix/themes/layout/grid.pyi b/reflex/components/radix/themes/layout/grid.pyi
index 1acc6f9b1be..c11d1dfcddf 100644
--- a/reflex/components/radix/themes/layout/grid.pyi
+++ b/reflex/components/radix/themes/layout/grid.pyi
@@ -9,7 +9,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -157,50 +157,40 @@ class Grid(elements.Div, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Grid":
diff --git a/reflex/components/radix/themes/layout/list.pyi b/reflex/components/radix/themes/layout/list.pyi
index f6cc3141ef9..bf8da641cc1 100644
--- a/reflex/components/radix/themes/layout/list.pyi
+++ b/reflex/components/radix/themes/layout/list.pyi
@@ -9,7 +9,7 @@ from reflex.components.component import Component, ComponentNamespace
from reflex.components.el.elements.typography import Li, Ol, Ul
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
LiteralListStyleTypeUnordered = Literal["none", "disc", "circle", "square"]
LiteralListStyleTypeOrdered = Literal[
@@ -84,50 +84,40 @@ class BaseList(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "BaseList":
@@ -191,50 +181,40 @@ class UnorderedList(BaseList, Ul):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "UnorderedList":
@@ -315,50 +295,40 @@ class OrderedList(BaseList, Ol):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "OrderedList":
@@ -437,50 +407,40 @@ class ListItem(Li):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ListItem":
@@ -575,50 +535,40 @@ class List(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "BaseList":
diff --git a/reflex/components/radix/themes/layout/section.py b/reflex/components/radix/themes/layout/section.py
index d9b27bdf954..a3e58be8618 100644
--- a/reflex/components/radix/themes/layout/section.py
+++ b/reflex/components/radix/themes/layout/section.py
@@ -6,6 +6,7 @@
from reflex.components.core.breakpoints import Responsive
from reflex.components.el import elements
+from reflex.ivars.base import LiteralVar
from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -19,9 +20,7 @@ class Section(elements.Section, RadixThemesComponent):
tag = "Section"
# The size of the section: "1" - "3" (default "2")
- size: Var[Responsive[LiteralSectionSize]] = Var.create_safe(
- "2", _var_is_string=True
- )
+ size: Var[Responsive[LiteralSectionSize]] = LiteralVar.create("2")
section = Section.create
diff --git a/reflex/components/radix/themes/layout/section.pyi b/reflex/components/radix/themes/layout/section.pyi
index 31cf355e898..b4e1050d817 100644
--- a/reflex/components/radix/themes/layout/section.pyi
+++ b/reflex/components/radix/themes/layout/section.pyi
@@ -9,7 +9,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -62,50 +62,40 @@ class Section(elements.Section, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Section":
diff --git a/reflex/components/radix/themes/layout/spacer.pyi b/reflex/components/radix/themes/layout/spacer.pyi
index aedd9b041e2..652c1a0b09e 100644
--- a/reflex/components/radix/themes/layout/spacer.pyi
+++ b/reflex/components/radix/themes/layout/spacer.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .flex import Flex
@@ -125,50 +125,40 @@ class Spacer(Flex):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Spacer":
diff --git a/reflex/components/radix/themes/layout/stack.pyi b/reflex/components/radix/themes/layout/stack.pyi
index 0296f92ca75..4ba630fc236 100644
--- a/reflex/components/radix/themes/layout/stack.pyi
+++ b/reflex/components/radix/themes/layout/stack.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.components.core.breakpoints import Breakpoints
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import LiteralAlign, LiteralSpacing
from .flex import Flex
@@ -93,50 +93,40 @@ class Stack(Flex):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Stack":
@@ -248,50 +238,40 @@ class VStack(Stack):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "VStack":
@@ -403,50 +383,40 @@ class HStack(Stack):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "HStack":
diff --git a/reflex/components/radix/themes/typography/blockquote.pyi b/reflex/components/radix/themes/typography/blockquote.pyi
index 5ffe7135568..3ab3c829b4c 100644
--- a/reflex/components/radix/themes/typography/blockquote.pyi
+++ b/reflex/components/radix/themes/typography/blockquote.pyi
@@ -9,7 +9,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -139,50 +139,40 @@ class Blockquote(elements.Blockquote, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Blockquote":
diff --git a/reflex/components/radix/themes/typography/code.pyi b/reflex/components/radix/themes/typography/code.pyi
index f1fc274e184..f30a39f9a54 100644
--- a/reflex/components/radix/themes/typography/code.pyi
+++ b/reflex/components/radix/themes/typography/code.pyi
@@ -9,7 +9,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -144,50 +144,40 @@ class Code(elements.Code, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Code":
diff --git a/reflex/components/radix/themes/typography/heading.pyi b/reflex/components/radix/themes/typography/heading.pyi
index 1dad3b97f06..d1fe2621894 100644
--- a/reflex/components/radix/themes/typography/heading.pyi
+++ b/reflex/components/radix/themes/typography/heading.pyi
@@ -9,7 +9,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -164,50 +164,40 @@ class Heading(elements.H1, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Heading":
diff --git a/reflex/components/radix/themes/typography/link.pyi b/reflex/components/radix/themes/typography/link.pyi
index ab29e8f5979..54cebee64da 100644
--- a/reflex/components/radix/themes/typography/link.pyi
+++ b/reflex/components/radix/themes/typography/link.pyi
@@ -12,7 +12,7 @@ from reflex.components.next.link import NextLink
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
from reflex.utils.imports import ImportDict
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -176,50 +176,40 @@ class Link(RadixThemesComponent, A, MemoizationLeaf):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Link":
diff --git a/reflex/components/radix/themes/typography/text.pyi b/reflex/components/radix/themes/typography/text.pyi
index 1d7857a5dcf..919ed17e035 100644
--- a/reflex/components/radix/themes/typography/text.pyi
+++ b/reflex/components/radix/themes/typography/text.pyi
@@ -10,7 +10,7 @@ from reflex.components.core.breakpoints import Breakpoints
from reflex.components.el import elements
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from ..base import RadixThemesComponent
@@ -231,50 +231,40 @@ class Text(elements.Span, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Text":
@@ -518,50 +508,40 @@ class Span(Text):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Span":
@@ -645,50 +625,40 @@ class Em(elements.Em, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Em":
@@ -770,50 +740,40 @@ class Kbd(elements.Kbd, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Kbd":
@@ -891,50 +851,40 @@ class Quote(elements.Q, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Quote":
@@ -1011,50 +961,40 @@ class Strong(elements.Strong, RadixThemesComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Strong":
@@ -1294,50 +1234,40 @@ class TextNamespace(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Text":
diff --git a/reflex/components/react_player/audio.pyi b/reflex/components/react_player/audio.pyi
index f138d3fd8f3..f84122403eb 100644
--- a/reflex/components/react_player/audio.pyi
+++ b/reflex/components/react_player/audio.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.react_player.react_player import ReactPlayer
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class Audio(ReactPlayer):
pass
@@ -33,98 +33,72 @@ class Audio(ReactPlayer):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_buffer: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_buffer: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_buffer_end: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_click_preview: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_disable_pip: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_duration: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_enable_pip: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_ended: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_error: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_ended: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_error: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_pause: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_play: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_pause: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_play: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_playback_quality_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_playback_rate_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_progress: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_ready: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_seek: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_start: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_ready: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_seek: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_start: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Audio":
diff --git a/reflex/components/react_player/react_player.pyi b/reflex/components/react_player/react_player.pyi
index 79e38353aa4..c9e8ba56920 100644
--- a/reflex/components/react_player/react_player.pyi
+++ b/reflex/components/react_player/react_player.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.component import NoSSRComponent
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class ReactPlayer(NoSSRComponent):
@overload
@@ -31,98 +31,72 @@ class ReactPlayer(NoSSRComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_buffer: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_buffer: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_buffer_end: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_click_preview: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_disable_pip: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_duration: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_enable_pip: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_ended: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_error: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_ended: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_error: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_pause: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_play: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_pause: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_play: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_playback_quality_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_playback_rate_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_progress: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_ready: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_seek: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_start: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_ready: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_seek: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_start: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ReactPlayer":
diff --git a/reflex/components/react_player/video.pyi b/reflex/components/react_player/video.pyi
index 4016c6f44b9..7f7c1fda198 100644
--- a/reflex/components/react_player/video.pyi
+++ b/reflex/components/react_player/video.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Optional, Union, overload
from reflex.components.react_player.react_player import ReactPlayer
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class Video(ReactPlayer):
pass
@@ -33,98 +33,72 @@ class Video(ReactPlayer):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_buffer: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_buffer: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_buffer_end: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_click_preview: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_disable_pip: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_duration: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_enable_pip: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_ended: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_error: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_ended: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_error: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_pause: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_play: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_pause: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_play: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_playback_quality_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_playback_rate_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_progress: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_ready: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_seek: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_start: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_ready: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_seek: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_start: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Video":
diff --git a/reflex/components/recharts/cartesian.py b/reflex/components/recharts/cartesian.py
index 0f2ec2f3291..4c76e82ea46 100644
--- a/reflex/components/recharts/cartesian.py
+++ b/reflex/components/recharts/cartesian.py
@@ -7,6 +7,7 @@
from reflex.constants import EventTriggers
from reflex.constants.colors import Color
from reflex.event import EventHandler
+from reflex.ivars.base import LiteralVar
from reflex.vars import Var
from .recharts import (
@@ -86,7 +87,7 @@ class Axis(Recharts):
tick_count: Var[int]
# If set false, no axis tick lines will be drawn.
- tick_line: Var[bool] = Var.create_safe(False)
+ tick_line: Var[bool] = LiteralVar.create(False)
# The length of tick line.
tick_size: Var[int]
@@ -95,7 +96,7 @@ class Axis(Recharts):
min_tick_gap: Var[int]
# The stroke color of axis
- stroke: Var[Union[str, Color]] = Var.create_safe(Color("gray", 9))
+ stroke: Var[Union[str, Color]] = LiteralVar.create(Color("gray", 9))
# The text anchor of axis
text_anchor: Var[str] # 'start', 'middle', 'end'
@@ -136,7 +137,10 @@ class XAxis(Axis):
x_axis_id: Var[Union[str, int]]
# Ensures that all datapoints within a chart contribute to its domain calculation, even when they are hidden
- include_hidden: Var[bool] = Var.create_safe(False)
+ include_hidden: Var[bool] = LiteralVar.create(False)
+
+ # The range of the axis. Work best in conjuction with allow_data_overflow.
+ domain: Var[List]
# The range of the axis. Work best in conjuction with allow_data_overflow.
domain: Var[List]
@@ -190,10 +194,10 @@ class Brush(Recharts):
alias = "RechartsBrush"
# Stroke color
- stroke: Var[Union[str, Color]] = Var.create_safe(Color("gray", 9))
+ stroke: Var[Union[str, Color]] = LiteralVar.create(Color("gray", 9))
# The fill color of brush.
- fill: Var[Union[str, Color]] = Var.create_safe(Color("gray", 2))
+ fill: Var[Union[str, Color]] = LiteralVar.create(Color("gray", 2))
# The key of data displayed in the axis.
data_key: Var[Union[str, int]]
@@ -293,22 +297,22 @@ class Area(Cartesian):
alias = "RechartsArea"
# The color of the line stroke.
- stroke: Var[Union[str, Color]] = Var.create_safe(Color("accent", 9))
+ stroke: Var[Union[str, Color]] = LiteralVar.create(Color("accent", 9))
# The width of the line stroke.
- stroke_width: Var[int] = Var.create_safe(1)
+ stroke_width: Var[int] = LiteralVar.create(1)
# The color of the area fill.
- fill: Var[Union[str, Color]] = Var.create_safe(Color("accent", 5))
+ fill: Var[Union[str, Color]] = LiteralVar.create(Color("accent", 5))
# The interpolation type of area. And customized interpolation function can be set to type. 'basis' | 'basisClosed' | 'basisOpen' | 'bumpX' | 'bumpY' | 'bump' | 'linear' | 'linearClosed' | 'natural' | 'monotoneX' | 'monotoneY' | 'monotone' | 'step' | 'stepBefore' | 'stepAfter' |
- type_: Var[LiteralAreaType] = Var.create_safe("monotone", _var_is_string=True)
+ type_: Var[LiteralAreaType] = LiteralVar.create("monotone")
# If false set, dots will not be drawn. If true set, dots will be drawn which have the props calculated internally.
dot: Var[Union[bool, Dict[str, Any]]]
# The dot is shown when user enter an area chart and this chart has tooltip. If false set, no active dot will not be drawn. If true set, active dot will be drawn which have the props calculated internally.
- active_dot: Var[Union[bool, Dict[str, Any]]] = Var.create_safe(
+ active_dot: Var[Union[bool, Dict[str, Any]]] = LiteralVar.create(
{
"stroke": Color("accent", 2),
"fill": Color("accent", 10),
@@ -345,7 +349,7 @@ class Bar(Cartesian):
stroke_width: Var[int]
# The width of the line stroke.
- fill: Var[Union[str, Color]] = Var.create_safe(Color("accent", 9))
+ fill: Var[Union[str, Color]] = LiteralVar.create(Color("accent", 9))
# If false set, background of bars will not be drawn. If true set, background of bars will be drawn which have the props calculated internally.
background: Var[bool]
@@ -406,13 +410,13 @@ class Line(Cartesian):
type_: Var[LiteralAreaType]
# The color of the line stroke.
- stroke: Var[Union[str, Color]] = Var.create_safe(Color("accent", 9))
+ stroke: Var[Union[str, Color]] = LiteralVar.create(Color("accent", 9))
# The width of the line stroke.
stroke_width: Var[int]
# The dot is shown when mouse enter a line chart and this chart has tooltip. If false set, no active dot will not be drawn. If true set, active dot will be drawn which have the props calculated internally.
- dot: Var[Union[bool, Dict[str, Any]]] = Var.create_safe(
+ dot: Var[Union[bool, Dict[str, Any]]] = LiteralVar.create(
{
"stroke": Color("accent", 10),
"fill": Color("accent", 4),
@@ -420,7 +424,7 @@ class Line(Cartesian):
)
# The dot is shown when user enter an area chart and this chart has tooltip. If false set, no active dot will not be drawn. If true set, active dot will be drawn which have the props calculated internally.
- active_dot: Var[Union[bool, Dict[str, Any]]] = Var.create_safe(
+ active_dot: Var[Union[bool, Dict[str, Any]]] = LiteralVar.create(
{
"stroke": Color("accent", 2),
"fill": Color("accent", 10),
@@ -478,7 +482,7 @@ class Scatter(Recharts):
line_type: Var[LiteralLineType]
# The fill
- fill: Var[Union[str, Color]] = Var.create_safe(Color("accent", 9))
+ fill: Var[Union[str, Color]] = LiteralVar.create(Color("accent", 9))
# the name
name: Var[Union[str, int]]
@@ -555,7 +559,7 @@ class Funnel(Recharts):
animation_easing: Var[LiteralAnimationEasing]
# stroke color
- stroke: Var[Union[str, Color]] = Var.create_safe(Color("gray", 3))
+ stroke: Var[Union[str, Color]] = LiteralVar.create(Color("gray", 3))
# Valid children components
_valid_children: List[str] = ["LabelList", "Cell"]
@@ -608,7 +612,7 @@ class ErrorBar(Recharts):
width: Var[int]
# The stroke color of error bar.
- stroke: Var[Union[str, Color]] = Var.create_safe(Color("gray", 8))
+ stroke: Var[Union[str, Color]] = LiteralVar.create(Color("gray", 8))
# The stroke width of error bar.
stroke_width: Var[int]
@@ -798,7 +802,7 @@ class CartesianGrid(Grid):
stroke_dasharray: Var[str]
# the stroke color of grid
- stroke: Var[Union[str, Color]] = Var.create_safe(Color("gray", 7))
+ stroke: Var[Union[str, Color]] = LiteralVar.create(Color("gray", 7))
class CartesianAxis(Grid):
diff --git a/reflex/components/recharts/cartesian.pyi b/reflex/components/recharts/cartesian.pyi
index 498ed74442c..0ffbd6c534d 100644
--- a/reflex/components/recharts/cartesian.pyi
+++ b/reflex/components/recharts/cartesian.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, List, Literal, Optional, Union, overload
from reflex.constants.colors import Color
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .recharts import (
Recharts,
@@ -94,50 +94,40 @@ class Axis(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Axis":
@@ -267,50 +257,40 @@ class XAxis(Axis):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "XAxis":
@@ -443,50 +423,40 @@ class YAxis(Axis):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "YAxis":
@@ -589,50 +559,40 @@ class ZAxis(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ZAxis":
@@ -683,9 +643,7 @@ class Brush(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
**props,
) -> "Brush":
"""Create the component.
@@ -770,50 +728,40 @@ class Cartesian(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Cartesian":
@@ -945,50 +893,40 @@ class Area(Cartesian):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Area":
@@ -1098,55 +1036,45 @@ class Bar(Cartesian):
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
on_animation_end: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_animation_start: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Bar":
@@ -1293,50 +1221,40 @@ class Line(Cartesian):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Line":
@@ -1453,50 +1371,40 @@ class Scatter(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Scatter":
@@ -1589,55 +1497,45 @@ class Funnel(Recharts):
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
on_animation_end: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_animation_start: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Funnel":
@@ -1686,50 +1584,40 @@ class ErrorBar(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ErrorBar":
@@ -1777,50 +1665,40 @@ class Reference(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Reference":
@@ -1873,50 +1751,40 @@ class ReferenceLine(Reference):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ReferenceLine":
@@ -1974,50 +1842,40 @@ class ReferenceDot(Reference):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ReferenceDot":
@@ -2076,50 +1934,40 @@ class ReferenceArea(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ReferenceArea":
@@ -2167,50 +2015,40 @@ class Grid(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Grid":
@@ -2263,50 +2101,40 @@ class CartesianGrid(Grid):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "CartesianGrid":
@@ -2374,50 +2202,40 @@ class CartesianAxis(Grid):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "CartesianAxis":
diff --git a/reflex/components/recharts/charts.py b/reflex/components/recharts/charts.py
index 0f52545d0ab..37b865b1d4f 100644
--- a/reflex/components/recharts/charts.py
+++ b/reflex/components/recharts/charts.py
@@ -9,6 +9,7 @@
from reflex.constants import EventTriggers
from reflex.constants.colors import Color
from reflex.event import EventHandler
+from reflex.ivars.base import LiteralVar
from reflex.vars import Var
from .recharts import (
@@ -156,10 +157,10 @@ class BarChart(CategoricalChartBase):
alias = "RechartsBarChart"
# The gap between two bar categories, which can be a percent value or a fixed value. Percentage | Number
- bar_category_gap: Var[Union[str, int]] = Var.create_safe("10%", _var_is_string=True) # type: ignore
+ bar_category_gap: Var[Union[str, int]] = LiteralVar.create("10%")
# The gap between two bars in the same category, which can be a percent value or a fixed value. Percentage | Number
- bar_gap: Var[Union[str, int]] = Var.create_safe(4) # type: ignore
+ bar_gap: Var[Union[str, int]] = LiteralVar.create(4) # type: ignore
# The width of all the bars in the chart. Number
bar_size: Var[int]
diff --git a/reflex/components/recharts/charts.pyi b/reflex/components/recharts/charts.pyi
index 9984bd8c5ad..48bde748322 100644
--- a/reflex/components/recharts/charts.pyi
+++ b/reflex/components/recharts/charts.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, List, Literal, Optional, Union, overload
from reflex.constants.colors import Color
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .recharts import (
RechartsCharts,
@@ -28,50 +28,40 @@ class ChartBase(RechartsCharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ChartBase":
@@ -126,50 +116,40 @@ class CategoricalChartBase(ChartBase):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "CategoricalChartBase":
@@ -237,50 +217,40 @@ class AreaChart(CategoricalChartBase):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "AreaChart":
@@ -347,50 +317,40 @@ class BarChart(CategoricalChartBase):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "BarChart":
@@ -456,50 +416,40 @@ class LineChart(CategoricalChartBase):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "LineChart":
@@ -571,50 +521,40 @@ class ComposedChart(CategoricalChartBase):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ComposedChart":
@@ -663,50 +603,40 @@ class PieChart(ChartBase):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "PieChart":
@@ -753,14 +683,12 @@ class RadarChart(ChartBase):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "RadarChart":
@@ -816,50 +744,40 @@ class RadialBarChart(ChartBase):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "RadialBarChart":
@@ -909,29 +827,27 @@ class ScatterChart(ChartBase):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ScatterChart":
@@ -972,50 +888,40 @@ class FunnelChart(ChartBase):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "FunnelChart":
@@ -1068,55 +974,45 @@ class Treemap(RechartsCharts):
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
on_animation_end: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_animation_start: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Treemap":
diff --git a/reflex/components/recharts/general.py b/reflex/components/recharts/general.py
index 613e6fbf00f..4f81ea83382 100644
--- a/reflex/components/recharts/general.py
+++ b/reflex/components/recharts/general.py
@@ -7,6 +7,7 @@
from reflex.components.component import MemoizationLeaf
from reflex.constants.colors import Color
from reflex.event import EventHandler
+from reflex.ivars.base import LiteralVar
from reflex.vars import Var
from .recharts import (
@@ -139,7 +140,7 @@ class GraphingTooltip(Recharts):
filter_null: Var[bool]
# If set false, no cursor will be drawn when tooltip is active.
- cursor: Var[Union[Dict[str, Any], bool]] = Var.create_safe(
+ cursor: Var[Union[Dict[str, Any], bool]] = LiteralVar.create(
{
"strokeWidth": 1,
"fill": Color("gray", 3),
@@ -150,7 +151,7 @@ class GraphingTooltip(Recharts):
view_box: Var[Dict[str, Any]]
# The style of default tooltip content item which is a li element. DEFAULT: {}
- item_style: Var[Dict[str, Any]] = Var.create_safe(
+ item_style: Var[Dict[str, Any]] = LiteralVar.create(
{
"color": Color("gray", 12),
}
@@ -159,7 +160,7 @@ class GraphingTooltip(Recharts):
# The style of tooltip wrapper which is a dom element. DEFAULT: {}
wrapper_style: Var[Dict[str, Any]]
# The style of tooltip content which is a dom element. DEFAULT: {}
- content_style: Var[Dict[str, Any]] = Var.create_safe(
+ content_style: Var[Dict[str, Any]] = LiteralVar.create(
{
"background": Color("gray", 1),
"borderColor": Color("gray", 4),
@@ -168,10 +169,10 @@ class GraphingTooltip(Recharts):
)
# The style of default tooltip label which is a p element. DEFAULT: {}
- label_style: Var[Dict[str, Any]] = Var.create_safe({"color": Color("gray", 11)})
+ label_style: Var[Dict[str, Any]] = LiteralVar.create({"color": Color("gray", 11)})
# This option allows the tooltip to extend beyond the viewBox of the chart itself. DEFAULT: { x: false, y: false }
- allow_escape_view_box: Var[Dict[str, bool]] = Var.create_safe(
+ allow_escape_view_box: Var[Dict[str, bool]] = LiteralVar.create(
{"x": False, "y": False}
)
@@ -231,10 +232,10 @@ class LabelList(Recharts):
offset: Var[int]
# The fill color of each label
- fill: Var[Union[str, Color]] = Var.create_safe(Color("gray", 10))
+ fill: Var[Union[str, Color]] = LiteralVar.create(Color("gray", 10))
# The stroke color of each label
- stroke: Var[Union[str, Color]] = Var.create_safe("none", _var_is_string=True)
+ stroke: Var[Union[str, Color]] = LiteralVar.create("none")
responsive_container = ResponsiveContainer.create
diff --git a/reflex/components/recharts/general.pyi b/reflex/components/recharts/general.pyi
index 9dd2ae19c0f..be6a0d42f92 100644
--- a/reflex/components/recharts/general.pyi
+++ b/reflex/components/recharts/general.pyi
@@ -9,7 +9,7 @@ from reflex.components.component import MemoizationLeaf
from reflex.constants.colors import Color
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .recharts import (
Recharts,
@@ -33,50 +33,40 @@ class ResponsiveContainer(Recharts, MemoizationLeaf):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "ResponsiveContainer":
@@ -169,50 +159,40 @@ class Legend(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Legend":
@@ -280,50 +260,40 @@ class GraphingTooltip(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "GraphingTooltip":
@@ -421,50 +391,40 @@ class Label(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Label":
@@ -551,50 +511,40 @@ class LabelList(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "LabelList":
diff --git a/reflex/components/recharts/polar.py b/reflex/components/recharts/polar.py
index 64fa00ecd58..76347352bef 100644
--- a/reflex/components/recharts/polar.py
+++ b/reflex/components/recharts/polar.py
@@ -7,6 +7,7 @@
from reflex.constants import EventTriggers
from reflex.constants.colors import Color
from reflex.event import EventHandler
+from reflex.ivars.base import LiteralVar
from reflex.vars import Var
from .recharts import (
@@ -72,10 +73,10 @@ class Pie(Recharts):
_valid_children: List[str] = ["Cell", "LabelList"]
# Stoke color
- stroke: Var[Union[str, Color]] = Var.create_safe(Color("accent", 9))
+ stroke: Var[Union[str, Color]] = LiteralVar.create(Color("accent", 9))
# Fill color
- fill: Var[Union[str, Color]] = Var.create_safe(Color("accent", 3))
+ fill: Var[Union[str, Color]] = LiteralVar.create(Color("accent", 3))
def get_event_triggers(self) -> dict[str, Union[Var, Any]]:
"""Get the event triggers that pass the component's value to the handler.
@@ -110,13 +111,13 @@ class Radar(Recharts):
dot: Var[bool]
# Stoke color
- stroke: Var[Union[str, Color]] = Var.create_safe(Color("accent", 9))
+ stroke: Var[Union[str, Color]] = LiteralVar.create(Color("accent", 9))
# Fill color
- fill: Var[str] = Var.create_safe(Color("accent", 3))
+ fill: Var[str] = LiteralVar.create(Color("accent", 3))
# opacity
- fill_opacity: Var[float] = Var.create_safe(0.6)
+ fill_opacity: Var[float] = LiteralVar.create(0.6)
# The type of icon in legend. If set to 'none', no legend item will be rendered.
legend_type: Var[str]
@@ -218,7 +219,7 @@ class PolarAngleAxis(Recharts):
axis_line_type: Var[str]
# If false set, tick lines will not be drawn. If true set, tick lines will be drawn which have the props calculated internally. If object set, tick lines will be drawn which have the props mergered by the internal calculated props and the option.
- tick_line: Var[Union[bool, Dict[str, Any]]] = Var.create_safe(False)
+ tick_line: Var[Union[bool, Dict[str, Any]]] = LiteralVar.create(False)
# The width or height of tick.
tick: Var[Union[int, str]]
@@ -230,7 +231,7 @@ class PolarAngleAxis(Recharts):
orient: Var[str]
# The stroke color of axis
- stroke: Var[Union[str, Color]] = Var.create_safe(Color("gray", 10))
+ stroke: Var[Union[str, Color]] = LiteralVar.create(Color("gray", 10))
# Allow the axis has duplicated categorys or not when the type of axis is "category".
allow_duplicated_category: Var[bool]
@@ -292,7 +293,7 @@ class PolarGrid(Recharts):
grid_type: Var[LiteralGridType]
# The stroke color of grid
- stroke: Var[Union[str, Color]] = Var.create_safe(Color("gray", 10))
+ stroke: Var[Union[str, Color]] = LiteralVar.create(Color("gray", 10))
# Valid children components
_valid_children: List[str] = ["RadarChart", "RadiarBarChart"]
@@ -342,10 +343,10 @@ class PolarRadiusAxis(Recharts):
_valid_children: List[str] = ["Label"]
# The domain of the polar radius axis, specifying the minimum and maximum values.
- domain: Var[List[int]] = Var.create_safe([0, 250])
+ domain: Var[List[int]] = LiteralVar.create([0, 250])
# The stroke color of axis
- stroke: Var[Union[str, Color]] = Var.create_safe(Color("gray", 10))
+ stroke: Var[Union[str, Color]] = LiteralVar.create(Color("gray", 10))
def get_event_triggers(self) -> dict[str, Union[Var, Any]]:
"""Get the event triggers that pass the component's value to the handler.
diff --git a/reflex/components/recharts/polar.pyi b/reflex/components/recharts/polar.pyi
index d91186296bd..81fb74b2766 100644
--- a/reflex/components/recharts/polar.pyi
+++ b/reflex/components/recharts/polar.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, List, Literal, Optional, Union, overload
from reflex.constants.colors import Color
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
from .recharts import (
Recharts,
@@ -74,23 +74,21 @@ class Pie(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Pie":
@@ -155,50 +153,40 @@ class Radar(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Radar":
@@ -262,28 +250,26 @@ class RadialBar(Recharts):
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
on_animation_end: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_animation_start: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "RadialBar":
@@ -341,50 +327,40 @@ class PolarAngleAxis(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "PolarAngleAxis":
@@ -439,50 +415,40 @@ class PolarGrid(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "PolarGrid":
@@ -580,23 +546,21 @@ class PolarRadiusAxis(Recharts):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "PolarRadiusAxis":
diff --git a/reflex/components/recharts/recharts.pyi b/reflex/components/recharts/recharts.pyi
index 409285eb52d..695ecab48fe 100644
--- a/reflex/components/recharts/recharts.pyi
+++ b/reflex/components/recharts/recharts.pyi
@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
from reflex.components.component import Component, MemoizationLeaf, NoSSRComponent
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class Recharts(Component):
def render(self) -> Dict: ...
@@ -23,50 +23,40 @@ class Recharts(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Recharts":
@@ -99,50 +89,40 @@ class RechartsCharts(NoSSRComponent, MemoizationLeaf):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "RechartsCharts":
diff --git a/reflex/components/sonner/toast.py b/reflex/components/sonner/toast.py
index e00eaad4e51..07e18b15615 100644
--- a/reflex/components/sonner/toast.py
+++ b/reflex/components/sonner/toast.py
@@ -14,6 +14,7 @@
EventSpec,
call_script,
)
+from reflex.ivars.base import LiteralVar
from reflex.style import Style, resolved_color_mode
from reflex.utils import format
from reflex.utils.imports import ImportVar
@@ -197,21 +198,19 @@ class Toaster(Component):
theme: Var[str] = resolved_color_mode
# whether to show rich colors
- rich_colors: Var[bool] = Var.create_safe(True)
+ rich_colors: Var[bool] = LiteralVar.create(True)
# whether to expand the toast
- expand: Var[bool] = Var.create_safe(True)
+ expand: Var[bool] = LiteralVar.create(True)
# the number of toasts that are currently visible
visible_toasts: Var[int]
# the position of the toast
- position: Var[LiteralPosition] = Var.create_safe(
- "bottom-right", _var_is_string=True
- )
+ position: Var[LiteralPosition] = LiteralVar.create("bottom-right")
# whether to show the close button
- close_button: Var[bool] = Var.create_safe(False)
+ close_button: Var[bool] = LiteralVar.create(False)
# offset of the toast
offset: Var[str]
@@ -356,7 +355,7 @@ def toast_dismiss(id: Var | str | None = None):
if isinstance(id, Var):
dismiss = f"{toast_ref}.dismiss({id._var_name_unwrapped})"
- dismiss_var_data = id._var_data
+ dismiss_var_data = id._get_all_var_data()
elif isinstance(id, str):
dismiss = f"{toast_ref}.dismiss('{id}')"
else:
@@ -365,7 +364,7 @@ def toast_dismiss(id: Var | str | None = None):
dismiss,
_var_is_string=False,
_var_is_local=True,
- _var_data=dismiss_var_data,
+ _var_data=VarData.merge(dismiss_var_data),
)
return call_script(dismiss_action)
diff --git a/reflex/components/sonner/toast.pyi b/reflex/components/sonner/toast.pyi
index c7e6269151b..8826e9df7aa 100644
--- a/reflex/components/sonner/toast.pyi
+++ b/reflex/components/sonner/toast.pyi
@@ -12,7 +12,7 @@ from reflex.components.props import PropsBase
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
from reflex.utils.serializers import serializer
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
LiteralPosition = Literal[
"top-left",
@@ -120,50 +120,40 @@ class Toaster(Component):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Toaster":
diff --git a/reflex/components/suneditor/editor.pyi b/reflex/components/suneditor/editor.pyi
index 8a86e02702c..b1bc8a8301f 100644
--- a/reflex/components/suneditor/editor.pyi
+++ b/reflex/components/suneditor/editor.pyi
@@ -11,7 +11,7 @@ from reflex.components.component import NoSSRComponent
from reflex.event import EventHandler, EventSpec
from reflex.style import Style
from reflex.utils.imports import ImportDict
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class EditorButtonList(list, enum.Enum):
BASIC = [["font", "fontSize"], ["fontColor"], ["horizontalRule"], ["link", "image"]]
@@ -122,77 +122,55 @@ class Editor(NoSSRComponent):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_change: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_copy: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_cut: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_copy: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_cut: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_input: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_load: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_input: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_load: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_paste: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_paste: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_resize_editor: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
toggle_code_view: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
toggle_full_screen: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Editor":
diff --git a/reflex/components/tags/iter_tag.py b/reflex/components/tags/iter_tag.py
index 95a496b715f..0828f8b10ab 100644
--- a/reflex/components/tags/iter_tag.py
+++ b/reflex/components/tags/iter_tag.py
@@ -6,7 +6,8 @@
from typing import TYPE_CHECKING, Any, Callable, List, Tuple, Type, Union, get_args
from reflex.components.tags.tag import Tag
-from reflex.vars import BaseVar, Var
+from reflex.ivars.base import ImmutableVar
+from reflex.vars import Var
if TYPE_CHECKING:
from reflex.components.component import Component
@@ -53,10 +54,10 @@ def get_index_var(self) -> Var:
Returns:
The index var.
"""
- return BaseVar(
+ return ImmutableVar(
_var_name=self.index_var_name,
_var_type=int,
- )
+ ).guess_type()
def get_arg_var(self) -> Var:
"""Get the arg var for the tag (with curly braces).
@@ -66,10 +67,10 @@ def get_arg_var(self) -> Var:
Returns:
The arg var.
"""
- return BaseVar(
+ return ImmutableVar(
_var_name=self.arg_var_name,
_var_type=self.get_iterable_var_type(),
- )
+ ).guess_type()
def get_index_var_arg(self) -> Var:
"""Get the index var for the tag (without curly braces).
@@ -79,11 +80,10 @@ def get_index_var_arg(self) -> Var:
Returns:
The index var.
"""
- return BaseVar(
+ return ImmutableVar(
_var_name=self.index_var_name,
_var_type=int,
- _var_is_local=True,
- )
+ ).guess_type()
def get_arg_var_arg(self) -> Var:
"""Get the arg var for the tag (without curly braces).
@@ -93,11 +93,10 @@ def get_arg_var_arg(self) -> Var:
Returns:
The arg var.
"""
- return BaseVar(
+ return ImmutableVar(
_var_name=self.arg_var_name,
_var_type=self.get_iterable_var_type(),
- _var_is_local=True,
- )
+ ).guess_type()
def render_component(self) -> Component:
"""Render the component.
diff --git a/reflex/components/tags/tag.py b/reflex/components/tags/tag.py
index bacea6a4155..9a8cca11f57 100644
--- a/reflex/components/tags/tag.py
+++ b/reflex/components/tags/tag.py
@@ -6,6 +6,7 @@
from reflex.base import Base
from reflex.event import EventChain
+from reflex.ivars.base import LiteralVar
from reflex.utils import format, types
from reflex.vars import Var
@@ -41,7 +42,7 @@ def __init__(self, *args, **kwargs):
# Convert any props to vars.
if "props" in kwargs:
kwargs["props"] = {
- name: Var.create(value, _var_is_string=False)
+ name: LiteralVar.create(value)
for name, value in kwargs["props"].items()
}
super().__init__(*args, **kwargs)
@@ -63,14 +64,12 @@ def add_props(self, **kwargs: Optional[Any]) -> Tag:
Returns:
The tag with the props added.
"""
- from reflex.components.core.colors import Color
-
self.props.update(
{
- format.to_camel_case(name, allow_hyphens=True): prop
- if types._isinstance(prop, Union[EventChain, dict])
- else Var.create(
- prop, _var_is_string=isinstance(prop, Color)
+ format.to_camel_case(name, allow_hyphens=True): (
+ prop
+ if types._isinstance(prop, Union[EventChain, dict])
+ else LiteralVar.create(prop)
) # rx.color is always a string
for name, prop in kwargs.items()
if self.is_valid_prop(prop)
diff --git a/reflex/event.py b/reflex/event.py
index 7e98ade38d6..6d0577c6fe8 100644
--- a/reflex/event.py
+++ b/reflex/event.py
@@ -18,9 +18,12 @@
from reflex import constants
from reflex.base import Base
+from reflex.ivars.base import ImmutableVar, LiteralVar
+from reflex.ivars.function import FunctionStringVar, FunctionVar
+from reflex.ivars.object import ObjectVar
from reflex.utils import format
from reflex.utils.types import ArgsSpec
-from reflex.vars import BaseVar, Var
+from reflex.vars import ImmutableVarData, Var
try:
from typing import Annotated
@@ -186,7 +189,7 @@ def __call__(self, *args: Any) -> EventSpec:
# Get the function args.
fn_args = inspect.getfullargspec(self.fn).args[1:]
- fn_args = (Var.create_safe(arg, _var_is_string=False) for arg in fn_args)
+ fn_args = (ImmutableVar.create_safe(arg) for arg in fn_args)
# Construct the payload.
values = []
@@ -197,7 +200,7 @@ def __call__(self, *args: Any) -> EventSpec:
# Otherwise, convert to JSON.
try:
- values.append(Var.create(arg, _var_is_string=isinstance(arg, str)))
+ values.append(LiteralVar.create(arg))
except TypeError as e:
raise EventHandlerTypeError(
f"Arguments to event handlers must be Vars or JSON-serializable. Got {arg} of type {type(arg)}."
@@ -264,13 +267,13 @@ def add_args(self, *args: Var) -> EventSpec:
# Get the remaining unfilled function args.
fn_args = inspect.getfullargspec(self.handler.fn).args[1 + len(self.args) :]
- fn_args = (Var.create_safe(arg, _var_is_string=False) for arg in fn_args)
+ fn_args = (ImmutableVar.create_safe(arg) for arg in fn_args)
# Construct the payload.
values = []
for arg in args:
try:
- values.append(Var.create(arg, _var_is_string=isinstance(arg, str)))
+ values.append(LiteralVar.create(arg))
except TypeError as e:
raise EventHandlerTypeError(
f"Arguments to event handlers must be Vars or JSON-serializable. Got {arg} of type {type(arg)}."
@@ -388,15 +391,16 @@ def as_event_spec(self, handler: EventHandler) -> EventSpec:
upload_id = self.upload_id or DEFAULT_UPLOAD_ID
spec_args = [
(
- Var.create_safe("files", _var_is_string=False),
- Var.create_safe(
- f"filesById[{Var.create_safe(upload_id, _var_is_string=True)._var_name_unwrapped}]",
- _var_is_string=False,
- )._replace(_var_data=upload_files_context_var_data),
+ ImmutableVar.create_safe("files"),
+ ImmutableVar(
+ _var_name="filesById",
+ _var_type=Dict[str, Any],
+ _var_data=ImmutableVarData.merge(upload_files_context_var_data),
+ ).to(ObjectVar)[LiteralVar.create(upload_id)],
),
(
- Var.create_safe("upload_id", _var_is_string=False),
- Var.create_safe(upload_id, _var_is_string=True),
+ ImmutableVar.create_safe("upload_id"),
+ LiteralVar.create(upload_id),
),
]
if self.on_upload_progress is not None:
@@ -424,11 +428,10 @@ def as_event_spec(self, handler: EventHandler) -> EventSpec:
formatted_chain = str(format.format_prop(on_upload_progress_chain))
spec_args.append(
(
- Var.create_safe("on_upload_progress", _var_is_string=False),
- BaseVar(
- _var_name=formatted_chain.strip("{}"),
- _var_type=EventChain,
- ),
+ ImmutableVar.create_safe("on_upload_progress"),
+ FunctionStringVar(
+ formatted_chain.strip("{}"),
+ ).to(FunctionVar, EventChain),
),
)
return EventSpec(
@@ -465,8 +468,8 @@ def fn():
handler=EventHandler(fn=fn),
args=tuple(
(
- Var.create_safe(k, _var_is_string=False),
- Var.create_safe(v, _var_is_string=isinstance(v, str)),
+ ImmutableVar.create_safe(k),
+ LiteralVar.create(v),
)
for k, v in kwargs.items()
),
@@ -542,7 +545,7 @@ def set_focus(ref: str) -> EventSpec:
return server_side(
"_set_focus",
get_fn_signature(set_focus),
- ref=Var.create_safe(format.format_ref(ref), _var_is_string=True),
+ ref=LiteralVar.create(format.format_ref(ref)),
)
@@ -573,7 +576,7 @@ def set_value(ref: str, value: Any) -> EventSpec:
return server_side(
"_set_value",
get_fn_signature(set_value),
- ref=Var.create_safe(format.format_ref(ref), _var_is_string=True),
+ ref=LiteralVar.create(format.format_ref(ref)),
value=value,
)
@@ -711,15 +714,11 @@ def download(
url = "data:text/plain," + urllib.parse.quote(data)
elif isinstance(data, Var):
# Need to check on the frontend if the Var already looks like a data: URI.
- is_data_url = data._replace(
- _var_name=(
- f"typeof {data._var_full_name} == 'string' && "
- f"{data._var_full_name}.startsWith('data:')"
- ),
- _var_type=bool,
- _var_is_string=False,
- _var_full_name_needs_state_prefix=False,
- )
+
+ is_data_url = (data._type() == "string") & (
+ data.to(str).startswith("data:")
+ ) # type: ignore
+
# If it's a data: URI, use it as is, otherwise convert the Var to JSON in a data: URI.
url = cond( # type: ignore
is_data_url,
@@ -757,11 +756,13 @@ def _callback_arg_spec(eval_result):
def call_script(
javascript_code: str | Var[str],
- callback: EventSpec
- | EventHandler
- | Callable
- | List[EventSpec | EventHandler | Callable]
- | None = None,
+ callback: (
+ EventSpec
+ | EventHandler
+ | Callable
+ | List[EventSpec | EventHandler | Callable]
+ | None
+ ) = None,
) -> EventSpec:
"""Create an event handler that executes arbitrary javascript code.
@@ -865,10 +866,8 @@ def parse_args_spec(arg_spec: ArgsSpec):
annotations = get_type_hints(arg_spec)
return arg_spec(
*[
- BaseVar(
- _var_name=f"_{l_arg}",
- _var_type=annotations.get(l_arg, FrontendEvent),
- _var_is_local=True,
+ ImmutableVar(f"_{l_arg}").to(
+ ObjectVar, annotations.get(l_arg, FrontendEvent)
)
for l_arg in spec.args
]
diff --git a/reflex/experimental/__init__.py b/reflex/experimental/__init__.py
index 060f7e7f15d..f0eca0c845a 100644
--- a/reflex/experimental/__init__.py
+++ b/reflex/experimental/__init__.py
@@ -8,7 +8,6 @@
from ..utils.console import warn
from . import hooks as hooks
-from . import vars as vars
from .assets import asset as asset
from .client_state import ClientStateVar as ClientStateVar
from .layout import layout as layout
@@ -43,7 +42,6 @@ def toast(self):
asset=asset,
client_state=ClientStateVar.create,
hooks=hooks,
- vars=vars,
layout=layout,
progress=progress,
PropsBase=PropsBase,
diff --git a/reflex/experimental/client_state.py b/reflex/experimental/client_state.py
index 3033b94dd2c..af3056c4d5f 100644
--- a/reflex/experimental/client_state.py
+++ b/reflex/experimental/client_state.py
@@ -8,8 +8,10 @@
from reflex import constants
from reflex.event import EventChain, EventHandler, EventSpec, call_script
+from reflex.ivars.base import ImmutableVar, LiteralVar
+from reflex.ivars.function import FunctionVar
from reflex.utils.imports import ImportVar
-from reflex.vars import Var, VarData, get_unique_variable_name
+from reflex.vars import ImmutableVarData, Var, VarData, get_unique_variable_name
NoValue = object()
@@ -109,12 +111,11 @@ def create(
var_name = get_unique_variable_name()
assert isinstance(var_name, str), "var_name must be a string."
if default is NoValue:
- default_var = Var.create_safe("", _var_is_local=False, _var_is_string=False)
- elif not isinstance(default, Var):
- default_var = Var.create_safe(
- default,
- _var_is_string=isinstance(default, str),
+ default_var = ImmutableVar.create_safe(
+ "", _var_is_local=False, _var_is_string=False
)
+ elif not isinstance(default, Var):
+ default_var = LiteralVar.create(default)
else:
default_var = default
setter_name = f"set{var_name.capitalize()}"
@@ -157,12 +158,10 @@ def value(self) -> Var:
an accessor for the client state variable.
"""
return (
- Var.create_safe(
+ ImmutableVar.create_safe(
_client_state_ref(self._getter_name)
if self._global_ref
- else self._getter_name,
- _var_is_local=False,
- _var_is_string=False,
+ else self._getter_name
)
.to(self._var_type)
._replace(
@@ -192,25 +191,18 @@ def set_value(self, value: Any = NoValue) -> Var:
)
if value is not NoValue:
# This is a hack to make it work like an EventSpec taking an arg
- value = Var.create_safe(value, _var_is_string=isinstance(value, str))
+ value = LiteralVar.create(value)
if not value._var_is_string and value._var_full_name.startswith("_"):
arg = value._var_name_unwrapped.partition(".")[0]
else:
arg = ""
setter = f"({arg}) => {setter}({value._var_name_unwrapped})"
- return (
- Var.create_safe(
- setter,
- _var_is_local=False,
- _var_is_string=False,
- )
- .to(EventChain)
- ._replace(
- merge_var_data=VarData( # type: ignore
- imports=_refs_import if self._global_ref else {}
- )
- )
- )
+ return ImmutableVar(
+ _var_name=setter,
+ _var_data=ImmutableVarData(
+ imports=_refs_import if self._global_ref else {}
+ ),
+ ).to(FunctionVar, EventChain)
@property
def set(self) -> Var:
diff --git a/reflex/experimental/layout.pyi b/reflex/experimental/layout.pyi
index 68e7e1ecdd1..8799b4961d2 100644
--- a/reflex/experimental/layout.pyi
+++ b/reflex/experimental/layout.pyi
@@ -13,7 +13,7 @@ from reflex.components.radix.themes.layout.box import Box
from reflex.event import EventHandler, EventSpec
from reflex.state import ComponentState
from reflex.style import Style
-from reflex.vars import BaseVar, Var
+from reflex.vars import Var
class Sidebar(Box, MemoizationLeaf):
@overload
@@ -51,50 +51,40 @@ class Sidebar(Box, MemoizationLeaf):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Sidebar":
@@ -146,53 +136,43 @@ class DrawerSidebar(DrawerRoot):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_open_change: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "DrawerSidebar":
@@ -227,50 +207,40 @@ class SidebarTrigger(Fragment):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "SidebarTrigger":
@@ -322,50 +292,40 @@ class Layout(Box):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Layout":
@@ -420,50 +380,40 @@ class LayoutNamespace(ComponentNamespace):
class_name: Optional[Any] = None,
autofocus: Optional[bool] = None,
custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
- on_blur: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
+ on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_context_menu: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_double_click: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_focus: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_mount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+ on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_mouse_down: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_enter: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_leave: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_move: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_out: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_over: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
on_mouse_up: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
- ] = None,
- on_scroll: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
+ on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
on_unmount: Optional[
- Union[EventHandler, EventSpec, list, Callable, BaseVar]
+ Union[EventHandler, EventSpec, list, Callable, Var]
] = None,
**props,
) -> "Layout":
diff --git a/reflex/experimental/vars/base.py b/reflex/experimental/vars/base.py
deleted file mode 100644
index 7da1e6537af..00000000000
--- a/reflex/experimental/vars/base.py
+++ /dev/null
@@ -1,583 +0,0 @@
-"""Collection of base classes."""
-
-from __future__ import annotations
-
-import dataclasses
-import functools
-import inspect
-import sys
-from typing import (
- TYPE_CHECKING,
- Any,
- Callable,
- Dict,
- Generic,
- List,
- Optional,
- Set,
- Tuple,
- Type,
- TypeVar,
- Union,
- overload,
-)
-
-from typing_extensions import ParamSpec, get_origin
-
-from reflex import constants
-from reflex.base import Base
-from reflex.utils import serializers, types
-from reflex.utils.exceptions import VarTypeError
-from reflex.vars import (
- ImmutableVarData,
- Var,
- VarData,
- _decode_var_immutable,
- _extract_var_data,
- _global_vars,
-)
-
-if TYPE_CHECKING:
- from .function import FunctionVar, ToFunctionOperation
- from .number import (
- BooleanVar,
- NumberVar,
- ToBooleanVarOperation,
- ToNumberVarOperation,
- )
- from .object import ObjectVar, ToObjectOperation
- from .sequence import ArrayVar, StringVar, ToArrayOperation, ToStringOperation
-
-VAR_TYPE = TypeVar("VAR_TYPE")
-
-
-@dataclasses.dataclass(
- eq=False,
- frozen=True,
- **{"slots": True} if sys.version_info >= (3, 10) else {},
-)
-class ImmutableVar(Var, Generic[VAR_TYPE]):
- """Base class for immutable vars."""
-
- # The name of the var.
- _var_name: str = dataclasses.field()
-
- # The type of the var.
- _var_type: types.GenericType = dataclasses.field(default=Any)
-
- # Extra metadata associated with the Var
- _var_data: Optional[ImmutableVarData] = dataclasses.field(default=None)
-
- def __str__(self) -> str:
- """String representation of the var. Guaranteed to be a valid Javascript expression.
-
- Returns:
- The name of the var.
- """
- return self._var_name
-
- @property
- def _var_is_local(self) -> bool:
- """Whether this is a local javascript variable.
-
- Returns:
- False
- """
- return False
-
- @property
- def _var_is_string(self) -> bool:
- """Whether the var is a string literal.
-
- Returns:
- False
- """
- return False
-
- @property
- def _var_full_name_needs_state_prefix(self) -> bool:
- """Whether the full name of the var needs a _var_state prefix.
-
- Returns:
- False
- """
- return False
-
- def __post_init__(self):
- """Post-initialize the var."""
- # Decode any inline Var markup and apply it to the instance
- _var_data, _var_name = _decode_var_immutable(self._var_name)
-
- if _var_data or _var_name != self._var_name:
- self.__init__(
- _var_name=_var_name,
- _var_type=self._var_type,
- _var_data=ImmutableVarData.merge(self._var_data, _var_data),
- )
-
- def __hash__(self) -> int:
- """Define a hash function for the var.
-
- Returns:
- The hash of the var.
- """
- return hash((self._var_name, self._var_type, self._var_data))
-
- def _get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
-
- Returns:
- The VarData of the components and all of its children.
- """
- return self._var_data
-
- def _replace(self, merge_var_data=None, **kwargs: Any):
- """Make a copy of this Var with updated fields.
-
- Args:
- merge_var_data: VarData to merge into the existing VarData.
- **kwargs: Var fields to update.
-
- Returns:
- A new ImmutableVar with the updated fields overwriting the corresponding fields in this Var.
-
- Raises:
- TypeError: If _var_is_local, _var_is_string, or _var_full_name_needs_state_prefix is not None.
- """
- if kwargs.get("_var_is_local", False) is not False:
- raise TypeError(
- "The _var_is_local argument is not supported for ImmutableVar."
- )
-
- if kwargs.get("_var_is_string", False) is not False:
- raise TypeError(
- "The _var_is_string argument is not supported for ImmutableVar."
- )
-
- if kwargs.get("_var_full_name_needs_state_prefix", False) is not False:
- raise TypeError(
- "The _var_full_name_needs_state_prefix argument is not supported for ImmutableVar."
- )
-
- field_values = dict(
- _var_name=kwargs.pop("_var_name", self._var_name),
- _var_type=kwargs.pop("_var_type", self._var_type),
- _var_data=ImmutableVarData.merge(
- kwargs.get("_var_data", self._var_data), merge_var_data
- ),
- )
- return type(self)(**field_values)
-
- @classmethod
- def create(
- cls,
- value: Any,
- _var_is_local: bool | None = None,
- _var_is_string: bool | None = None,
- _var_data: VarData | None = None,
- ) -> ImmutableVar | Var | None:
- """Create a var from a value.
-
- Args:
- value: The value to create the var from.
- _var_is_local: Whether the var is local. Deprecated.
- _var_is_string: Whether the var is a string literal. Deprecated.
- _var_data: Additional hooks and imports associated with the Var.
-
- Returns:
- The var.
-
- Raises:
- VarTypeError: If the value is JSON-unserializable.
- TypeError: If _var_is_local or _var_is_string is not None.
- """
- if _var_is_local is not None:
- raise TypeError(
- "The _var_is_local argument is not supported for ImmutableVar."
- )
-
- if _var_is_string is not None:
- raise TypeError(
- "The _var_is_string argument is not supported for ImmutableVar."
- )
-
- from reflex.utils import format
-
- # Check for none values.
- if value is None:
- return None
-
- # If the value is already a var, do nothing.
- if isinstance(value, Var):
- return value
-
- # Try to pull the imports and hooks from contained values.
- if not isinstance(value, str):
- _var_data = VarData.merge(*_extract_var_data(value), _var_data)
-
- # Try to serialize the value.
- type_ = type(value)
- if type_ in types.JSONType:
- name = value
- else:
- name, _serialized_type = serializers.serialize(value, get_type=True)
- if name is None:
- raise VarTypeError(
- f"No JSON serializer found for var {value} of type {type_}."
- )
- name = name if isinstance(name, str) else format.json_dumps(name)
-
- return cls(
- _var_name=name,
- _var_type=type_,
- _var_data=(
- ImmutableVarData(
- state=_var_data.state,
- imports=_var_data.imports,
- hooks=_var_data.hooks,
- )
- if _var_data
- else None
- ),
- )
-
- @classmethod
- def create_safe(
- cls,
- value: Any,
- _var_is_local: bool | None = None,
- _var_is_string: bool | None = None,
- _var_data: VarData | None = None,
- ) -> Var | ImmutableVar:
- """Create a var from a value, asserting that it is not None.
-
- Args:
- value: The value to create the var from.
- _var_is_local: Whether the var is local. Deprecated.
- _var_is_string: Whether the var is a string literal. Deprecated.
- _var_data: Additional hooks and imports associated with the Var.
-
- Returns:
- The var.
- """
- var = cls.create(
- value,
- _var_is_local=_var_is_local,
- _var_is_string=_var_is_string,
- _var_data=_var_data,
- )
- assert var is not None
- return var
-
- def __format__(self, format_spec: str) -> str:
- """Format the var into a Javascript equivalent to an f-string.
-
- Args:
- format_spec: The format specifier (Ignored for now).
-
- Returns:
- The formatted var.
- """
- hashed_var = hash(self)
-
- _global_vars[hashed_var] = self
-
- # Encode the _var_data into the formatted output for tracking purposes.
- return f"{constants.REFLEX_VAR_OPENING_TAG}{hashed_var}{constants.REFLEX_VAR_CLOSING_TAG}{self._var_name}"
-
- @overload
- def to(
- self, output: Type[NumberVar], var_type: type[int] | type[float] = float
- ) -> ToNumberVarOperation: ...
-
- @overload
- def to(self, output: Type[BooleanVar]) -> ToBooleanVarOperation: ...
-
- @overload
- def to(
- self,
- output: Type[ArrayVar],
- var_type: type[list] | type[tuple] | type[set] = list,
- ) -> ToArrayOperation: ...
-
- @overload
- def to(self, output: Type[StringVar]) -> ToStringOperation: ...
-
- @overload
- def to(
- self, output: Type[ObjectVar], var_type: types.GenericType = dict
- ) -> ToObjectOperation: ...
-
- @overload
- def to(
- self, output: Type[FunctionVar], var_type: Type[Callable] = Callable
- ) -> ToFunctionOperation: ...
-
- @overload
- def to(
- self, output: Type[OUTPUT], var_type: types.GenericType | None = None
- ) -> OUTPUT: ...
-
- def to(
- self, output: Type[OUTPUT], var_type: types.GenericType | None = None
- ) -> Var:
- """Convert the var to a different type.
-
- Args:
- output: The output type.
- var_type: The type of the var.
-
- Raises:
- TypeError: If the var_type is not a supported type for the output.
-
- Returns:
- The converted var.
- """
- from .number import (
- BooleanVar,
- NumberVar,
- ToBooleanVarOperation,
- ToNumberVarOperation,
- )
-
- fixed_type = (
- var_type
- if var_type is None or inspect.isclass(var_type)
- else get_origin(var_type)
- )
-
- if issubclass(output, NumberVar):
- if fixed_type is not None and not issubclass(fixed_type, (int, float)):
- raise TypeError(
- f"Unsupported type {var_type} for NumberVar. Must be int or float."
- )
- return ToNumberVarOperation(self, var_type or float)
- if issubclass(output, BooleanVar):
- return ToBooleanVarOperation(self)
-
- from .sequence import ArrayVar, StringVar, ToArrayOperation, ToStringOperation
-
- if issubclass(output, ArrayVar):
- if fixed_type is not None and not issubclass(
- fixed_type, (list, tuple, set)
- ):
- raise TypeError(
- f"Unsupported type {var_type} for ArrayVar. Must be list, tuple, or set."
- )
- return ToArrayOperation(self, var_type or list)
- if issubclass(output, StringVar):
- return ToStringOperation(self)
-
- from .object import ObjectVar, ToObjectOperation
-
- if issubclass(output, ObjectVar):
- return ToObjectOperation(self, var_type or dict)
-
- from .function import FunctionVar, ToFunctionOperation
-
- if issubclass(output, FunctionVar):
- if fixed_type is not None and not issubclass(fixed_type, Callable):
- raise TypeError(
- f"Unsupported type {var_type} for FunctionVar. Must be Callable."
- )
- return ToFunctionOperation(self, var_type or Callable)
-
- return output(
- _var_name=self._var_name,
- _var_type=self._var_type if var_type is None else var_type,
- _var_data=self._var_data,
- )
-
- def guess_type(self) -> ImmutableVar:
- """Guess the type of the var.
-
- Returns:
- The guessed type.
- """
- from .number import NumberVar
- from .object import ObjectVar
- from .sequence import ArrayVar, StringVar
-
- if self._var_type is Any:
- return self
-
- var_type = self._var_type
-
- fixed_type = var_type if inspect.isclass(var_type) else get_origin(var_type)
-
- if issubclass(fixed_type, (int, float)):
- return self.to(NumberVar, var_type)
- if issubclass(fixed_type, dict):
- return self.to(ObjectVar, var_type)
- if issubclass(fixed_type, (list, tuple, set)):
- return self.to(ArrayVar, var_type)
- if issubclass(fixed_type, str):
- return self.to(StringVar)
- if issubclass(fixed_type, Base):
- return self.to(ObjectVar, var_type)
- return self
-
-
-OUTPUT = TypeVar("OUTPUT", bound=ImmutableVar)
-
-
-class LiteralVar(ImmutableVar):
- """Base class for immutable literal vars."""
-
- @classmethod
- def create(
- cls,
- value: Any,
- _var_data: VarData | None = None,
- ) -> Var:
- """Create a var from a value.
-
- Args:
- value: The value to create the var from.
- _var_data: Additional hooks and imports associated with the Var.
-
- Returns:
- The var.
-
- Raises:
- TypeError: If the value is not a supported type for LiteralVar.
- """
- if isinstance(value, Var):
- if _var_data is None:
- return value
- return value._replace(merge_var_data=_var_data)
-
- if value is None:
- return ImmutableVar.create_safe("null", _var_data=_var_data)
-
- from .object import LiteralObjectVar
-
- if isinstance(value, Base):
- return LiteralObjectVar(
- value.dict(), _var_type=type(value), _var_data=_var_data
- )
-
- from .number import LiteralBooleanVar, LiteralNumberVar
- from .sequence import LiteralArrayVar, LiteralStringVar
-
- if isinstance(value, str):
- return LiteralStringVar.create(value, _var_data=_var_data)
-
- type_mapping = {
- int: LiteralNumberVar,
- float: LiteralNumberVar,
- bool: LiteralBooleanVar,
- dict: LiteralObjectVar,
- list: LiteralArrayVar,
- tuple: LiteralArrayVar,
- set: LiteralArrayVar,
- }
-
- constructor = type_mapping.get(type(value))
-
- if constructor is None:
- raise TypeError(f"Unsupported type {type(value)} for LiteralVar.")
-
- return constructor(value, _var_data=_var_data)
-
- def __post_init__(self):
- """Post-initialize the var."""
-
- def json(self) -> str:
- """Serialize the var to a JSON string.
-
- Raises:
- NotImplementedError: If the method is not implemented.
- """
- raise NotImplementedError(
- "LiteralVar subclasses must implement the json method."
- )
-
-
-P = ParamSpec("P")
-T = TypeVar("T", bound=ImmutableVar)
-
-
-def var_operation(*, output: Type[T]) -> Callable[[Callable[P, str]], Callable[P, T]]:
- """Decorator for creating a var operation.
-
- Example:
- ```python
- @var_operation(output=NumberVar)
- def add(a: NumberVar, b: NumberVar):
- return f"({a} + {b})"
- ```
-
- Args:
- output: The output type of the operation.
-
- Returns:
- The decorator.
- """
-
- def decorator(func: Callable[P, str], output=output):
- @functools.wraps(func)
- def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
- args_vars = [
- LiteralVar.create(arg) if not isinstance(arg, Var) else arg
- for arg in args
- ]
- kwargs_vars = {
- key: LiteralVar.create(value) if not isinstance(value, Var) else value
- for key, value in kwargs.items()
- }
- return output(
- _var_name=func(*args_vars, **kwargs_vars), # type: ignore
- _var_data=VarData.merge(
- *[arg._get_all_var_data() for arg in args if isinstance(arg, Var)],
- *[
- arg._get_all_var_data()
- for arg in kwargs.values()
- if isinstance(arg, Var)
- ],
- ),
- )
-
- return wrapper
-
- return decorator
-
-
-def unionize(*args: Type) -> Type:
- """Unionize the types.
-
- Args:
- args: The types to unionize.
-
- Returns:
- The unionized types.
- """
- if not args:
- return Any
- first, *rest = args
- if not rest:
- return first
- return Union[first, unionize(*rest)]
-
-
-def figure_out_type(value: Any) -> Type:
- """Figure out the type of the value.
-
- Args:
- value: The value to figure out the type of.
-
- Returns:
- The type of the value.
- """
- if isinstance(value, list):
- return List[unionize(*(figure_out_type(v) for v in value))]
- if isinstance(value, set):
- return Set[unionize(*(figure_out_type(v) for v in value))]
- if isinstance(value, tuple):
- return Tuple[unionize(*(figure_out_type(v) for v in value)), ...]
- if isinstance(value, dict):
- return Dict[
- unionize(*(figure_out_type(k) for k in value)),
- unionize(*(figure_out_type(v) for v in value.values())),
- ]
- return type(value)
diff --git a/reflex/experimental/vars/function.py b/reflex/experimental/vars/function.py
deleted file mode 100644
index 4514a482d15..00000000000
--- a/reflex/experimental/vars/function.py
+++ /dev/null
@@ -1,290 +0,0 @@
-"""Immutable function vars."""
-
-from __future__ import annotations
-
-import dataclasses
-import sys
-from functools import cached_property
-from typing import Any, Callable, Optional, Tuple, Type, Union
-
-from reflex.experimental.vars.base import ImmutableVar, LiteralVar
-from reflex.vars import ImmutableVarData, Var, VarData
-
-
-class FunctionVar(ImmutableVar[Callable]):
- """Base class for immutable function vars."""
-
- def __call__(self, *args: Var | Any) -> ArgsFunctionOperation:
- """Call the function with the given arguments.
-
- Args:
- *args: The arguments to call the function with.
-
- Returns:
- The function call operation.
- """
- return ArgsFunctionOperation(
- ("...args",),
- VarOperationCall(self, *args, ImmutableVar.create_safe("...args")),
- )
-
- def call(self, *args: Var | Any) -> VarOperationCall:
- """Call the function with the given arguments.
-
- Args:
- *args: The arguments to call the function with.
-
- Returns:
- The function call operation.
- """
- return VarOperationCall(self, *args)
-
-
-class FunctionStringVar(FunctionVar):
- """Base class for immutable function vars from a string."""
-
- def __init__(self, func: str, _var_data: VarData | None = None) -> None:
- """Initialize the function var.
-
- Args:
- func: The function to call.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(FunctionVar, self).__init__(
- _var_name=func,
- _var_type=Callable,
- _var_data=ImmutableVarData.merge(_var_data),
- )
-
-
-@dataclasses.dataclass(
- eq=False,
- frozen=True,
- **{"slots": True} if sys.version_info >= (3, 10) else {},
-)
-class VarOperationCall(ImmutableVar):
- """Base class for immutable vars that are the result of a function call."""
-
- _func: Optional[FunctionVar] = dataclasses.field(default=None)
- _args: Tuple[Union[Var, Any], ...] = dataclasses.field(default_factory=tuple)
-
- def __init__(
- self, func: FunctionVar, *args: Var | Any, _var_data: VarData | None = None
- ):
- """Initialize the function call var.
-
- Args:
- func: The function to call.
- *args: The arguments to call the function with.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(VarOperationCall, self).__init__(
- _var_name="",
- _var_type=Any,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "_func", func)
- object.__setattr__(self, "_args", args)
- object.__delattr__(self, "_var_name")
-
- def __getattr__(self, name):
- """Get an attribute of the var.
-
- Args:
- name: The name of the attribute.
-
- Returns:
- The attribute of the var.
- """
- if name == "_var_name":
- return self._cached_var_name
- return super(type(self), self).__getattr__(name)
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- return f"({str(self._func)}({', '.join([str(LiteralVar.create(arg)) for arg in self._args])}))"
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
-
- Returns:
- The VarData of the components and all of its children.
- """
- return ImmutableVarData.merge(
- self._func._get_all_var_data() if self._func is not None else None,
- *[var._get_all_var_data() for var in self._args],
- self._var_data,
- )
-
- def _get_all_var_data(self) -> ImmutableVarData | None:
- """Wrapper method for cached property.
-
- Returns:
- The VarData of the components and all of its children.
- """
- return self._cached_get_all_var_data
-
- def __post_init__(self):
- """Post-initialize the var."""
- pass
-
-
-@dataclasses.dataclass(
- eq=False,
- frozen=True,
- **{"slots": True} if sys.version_info >= (3, 10) else {},
-)
-class ArgsFunctionOperation(FunctionVar):
- """Base class for immutable function defined via arguments and return expression."""
-
- _args_names: Tuple[str, ...] = dataclasses.field(default_factory=tuple)
- _return_expr: Union[Var, Any] = dataclasses.field(default=None)
-
- def __init__(
- self,
- args_names: Tuple[str, ...],
- return_expr: Var | Any,
- _var_data: VarData | None = None,
- ) -> None:
- """Initialize the function with arguments var.
-
- Args:
- args_names: The names of the arguments.
- return_expr: The return expression of the function.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(ArgsFunctionOperation, self).__init__(
- _var_name=f"",
- _var_type=Callable,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "_args_names", args_names)
- object.__setattr__(self, "_return_expr", return_expr)
- object.__delattr__(self, "_var_name")
-
- def __getattr__(self, name):
- """Get an attribute of the var.
-
- Args:
- name: The name of the attribute.
-
- Returns:
- The attribute of the var.
- """
- if name == "_var_name":
- return self._cached_var_name
- return super(type(self), self).__getattr__(name)
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- return f"(({', '.join(self._args_names)}) => ({str(LiteralVar.create(self._return_expr))}))"
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
-
- Returns:
- The VarData of the components and all of its children.
- """
- return ImmutableVarData.merge(
- self._return_expr._get_all_var_data(),
- self._var_data,
- )
-
- def _get_all_var_data(self) -> ImmutableVarData | None:
- """Wrapper method for cached property.
-
- Returns:
- The VarData of the components and all of its children.
- """
- return self._cached_get_all_var_data
-
- def __post_init__(self):
- """Post-initialize the var."""
-
-
-@dataclasses.dataclass(
- eq=False,
- frozen=True,
- **{"slots": True} if sys.version_info >= (3, 10) else {},
-)
-class ToFunctionOperation(FunctionVar):
- """Base class of converting a var to a function."""
-
- _original_var: Var = dataclasses.field(
- default_factory=lambda: LiteralVar.create(None)
- )
-
- def __init__(
- self,
- original_var: Var,
- _var_type: Type[Callable] = Callable,
- _var_data: VarData | None = None,
- ) -> None:
- """Initialize the function with arguments var.
-
- Args:
- original_var: The original var to convert to a function.
- _var_type: The type of the function.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(ToFunctionOperation, self).__init__(
- _var_name=f"",
- _var_type=_var_type,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "_original_var", original_var)
- object.__delattr__(self, "_var_name")
-
- def __getattr__(self, name):
- """Get an attribute of the var.
-
- Args:
- name: The name of the attribute.
-
- Returns:
- The attribute of the var.
- """
- if name == "_var_name":
- return self._cached_var_name
- return super(type(self), self).__getattr__(name)
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- return str(self._original_var)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
-
- Returns:
- The VarData of the components and all of its children.
- """
- return ImmutableVarData.merge(
- self._original_var._get_all_var_data(),
- self._var_data,
- )
-
- def _get_all_var_data(self) -> ImmutableVarData | None:
- """Wrapper method for cached property.
-
- Returns:
- The VarData of the components and all of its children.
- """
- return self._cached_get_all_var_data
diff --git a/reflex/experimental/vars/number.py b/reflex/experimental/vars/number.py
deleted file mode 100644
index 6bd3a7ff767..00000000000
--- a/reflex/experimental/vars/number.py
+++ /dev/null
@@ -1,1458 +0,0 @@
-"""Immutable number vars."""
-
-from __future__ import annotations
-
-import dataclasses
-import json
-import sys
-from functools import cached_property
-from typing import Any, Union
-
-from reflex.experimental.vars.base import (
- ImmutableVar,
- LiteralVar,
-)
-from reflex.vars import ImmutableVarData, Var, VarData
-
-
-class NumberVar(ImmutableVar[Union[int, float]]):
- """Base class for immutable number vars."""
-
- def __add__(self, other: number_types | boolean_types) -> NumberAddOperation:
- """Add two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The number addition operation.
- """
- return NumberAddOperation(self, +other)
-
- def __radd__(self, other: number_types | boolean_types) -> NumberAddOperation:
- """Add two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The number addition operation.
- """
- return NumberAddOperation(+other, self)
-
- def __sub__(self, other: number_types | boolean_types) -> NumberSubtractOperation:
- """Subtract two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The number subtraction operation.
- """
- return NumberSubtractOperation(self, +other)
-
- def __rsub__(self, other: number_types | boolean_types) -> NumberSubtractOperation:
- """Subtract two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The number subtraction operation.
- """
- return NumberSubtractOperation(+other, self)
-
- def __abs__(self) -> NumberAbsoluteOperation:
- """Get the absolute value of the number.
-
- Returns:
- The number absolute operation.
- """
- return NumberAbsoluteOperation(self)
-
- def __mul__(self, other: number_types | boolean_types) -> NumberMultiplyOperation:
- """Multiply two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The number multiplication operation.
- """
- return NumberMultiplyOperation(self, +other)
-
- def __rmul__(self, other: number_types | boolean_types) -> NumberMultiplyOperation:
- """Multiply two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The number multiplication operation.
- """
- return NumberMultiplyOperation(+other, self)
-
- def __truediv__(self, other: number_types | boolean_types) -> NumberTrueDivision:
- """Divide two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The number true division operation.
- """
- return NumberTrueDivision(self, +other)
-
- def __rtruediv__(self, other: number_types | boolean_types) -> NumberTrueDivision:
- """Divide two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The number true division operation.
- """
- return NumberTrueDivision(+other, self)
-
- def __floordiv__(self, other: number_types | boolean_types) -> NumberFloorDivision:
- """Floor divide two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The number floor division operation.
- """
- return NumberFloorDivision(self, +other)
-
- def __rfloordiv__(self, other: number_types | boolean_types) -> NumberFloorDivision:
- """Floor divide two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The number floor division operation.
- """
- return NumberFloorDivision(+other, self)
-
- def __mod__(self, other: number_types | boolean_types) -> NumberModuloOperation:
- """Modulo two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The number modulo operation.
- """
- return NumberModuloOperation(self, +other)
-
- def __rmod__(self, other: number_types | boolean_types) -> NumberModuloOperation:
- """Modulo two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The number modulo operation.
- """
- return NumberModuloOperation(+other, self)
-
- def __pow__(self, other: number_types | boolean_types) -> NumberExponentOperation:
- """Exponentiate two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The number exponent operation.
- """
- return NumberExponentOperation(self, +other)
-
- def __rpow__(self, other: number_types | boolean_types) -> NumberExponentOperation:
- """Exponentiate two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The number exponent operation.
- """
- return NumberExponentOperation(+other, self)
-
- def __neg__(self) -> NumberNegateOperation:
- """Negate the number.
-
- Returns:
- The number negation operation.
- """
- return NumberNegateOperation(self)
-
- def __and__(self, other: number_types | boolean_types) -> BooleanAndOperation:
- """Boolean AND two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The boolean AND operation.
- """
- boolified_other = other.bool() if isinstance(other, Var) else bool(other)
- return BooleanAndOperation(self.bool(), boolified_other)
-
- def __rand__(self, other: number_types | boolean_types) -> BooleanAndOperation:
- """Boolean AND two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The boolean AND operation.
- """
- boolified_other = other.bool() if isinstance(other, Var) else bool(other)
- return BooleanAndOperation(boolified_other, self.bool())
-
- def __or__(self, other: number_types | boolean_types) -> BooleanOrOperation:
- """Boolean OR two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The boolean OR operation.
- """
- boolified_other = other.bool() if isinstance(other, Var) else bool(other)
- return BooleanOrOperation(self.bool(), boolified_other)
-
- def __ror__(self, other: number_types | boolean_types) -> BooleanOrOperation:
- """Boolean OR two numbers.
-
- Args:
- other: The other number.
-
- Returns:
- The boolean OR operation.
- """
- boolified_other = other.bool() if isinstance(other, Var) else bool(other)
- return BooleanOrOperation(boolified_other, self.bool())
-
- def __invert__(self) -> BooleanNotOperation:
- """Boolean NOT the number.
-
- Returns:
- The boolean NOT operation.
- """
- return BooleanNotOperation(self.bool())
-
- def __pos__(self) -> NumberVar:
- """Positive the number.
-
- Returns:
- The number.
- """
- return self
-
- def __round__(self) -> NumberRoundOperation:
- """Round the number.
-
- Returns:
- The number round operation.
- """
- return NumberRoundOperation(self)
-
- def __ceil__(self) -> NumberCeilOperation:
- """Ceil the number.
-
- Returns:
- The number ceil operation.
- """
- return NumberCeilOperation(self)
-
- def __floor__(self) -> NumberFloorOperation:
- """Floor the number.
-
- Returns:
- The number floor operation.
- """
- return NumberFloorOperation(self)
-
- def __trunc__(self) -> NumberTruncOperation:
- """Trunc the number.
-
- Returns:
- The number trunc operation.
- """
- return NumberTruncOperation(self)
-
- def __lt__(self, other: number_types | boolean_types) -> LessThanOperation:
- """Less than comparison.
-
- Args:
- other: The other number.
-
- Returns:
- The result of the comparison.
- """
- return LessThanOperation(self, +other)
-
- def __le__(self, other: number_types | boolean_types) -> LessThanOrEqualOperation:
- """Less than or equal comparison.
-
- Args:
- other: The other number.
-
- Returns:
- The result of the comparison.
- """
- return LessThanOrEqualOperation(self, +other)
-
- def __eq__(self, other: number_types | boolean_types) -> EqualOperation:
- """Equal comparison.
-
- Args:
- other: The other number.
-
- Returns:
- The result of the comparison.
- """
- return EqualOperation(self, +other)
-
- def __ne__(self, other: number_types | boolean_types) -> NotEqualOperation:
- """Not equal comparison.
-
- Args:
- other: The other number.
-
- Returns:
- The result of the comparison.
- """
- return NotEqualOperation(self, +other)
-
- def __gt__(self, other: number_types | boolean_types) -> GreaterThanOperation:
- """Greater than comparison.
-
- Args:
- other: The other number.
-
- Returns:
- The result of the comparison.
- """
- return GreaterThanOperation(self, +other)
-
- def __ge__(
- self, other: number_types | boolean_types
- ) -> GreaterThanOrEqualOperation:
- """Greater than or equal comparison.
-
- Args:
- other: The other number.
-
- Returns:
- The result of the comparison.
- """
- return GreaterThanOrEqualOperation(self, +other)
-
- def bool(self) -> NotEqualOperation:
- """Boolean conversion.
-
- Returns:
- The boolean value of the number.
- """
- return NotEqualOperation(self, 0)
-
-
-@dataclasses.dataclass(
- eq=False,
- frozen=True,
- **{"slots": True} if sys.version_info >= (3, 10) else {},
-)
-class BinaryNumberOperation(NumberVar):
- """Base class for immutable number vars that are the result of a binary operation."""
-
- a: number_types = dataclasses.field(default=0)
- b: number_types = dataclasses.field(default=0)
-
- def __init__(
- self,
- a: number_types,
- b: number_types,
- _var_data: VarData | None = None,
- ):
- """Initialize the binary number operation var.
-
- Args:
- a: The first number.
- b: The second number.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(BinaryNumberOperation, self).__init__(
- _var_name="",
- _var_type=float,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "a", a)
- object.__setattr__(self, "b", b)
- object.__delattr__(self, "_var_name")
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Raises:
- NotImplementedError: Must be implemented by subclasses
- """
- raise NotImplementedError(
- "BinaryNumberOperation must implement _cached_var_name"
- )
-
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
-
- Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(BinaryNumberOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
-
- Returns:
- The VarData of the components and all of its children.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralNumberVar(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralNumberVar(self.b)
- return ImmutableVarData.merge(
- first_value._get_all_var_data(),
- second_value._get_all_var_data(),
- self._var_data,
- )
-
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
-
-@dataclasses.dataclass(
- eq=False,
- frozen=True,
- **{"slots": True} if sys.version_info >= (3, 10) else {},
-)
-class UnaryNumberOperation(NumberVar):
- """Base class for immutable number vars that are the result of a unary operation."""
-
- a: number_types = dataclasses.field(default=0)
-
- def __init__(
- self,
- a: number_types,
- _var_data: VarData | None = None,
- ):
- """Initialize the unary number operation var.
-
- Args:
- a: The number.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(UnaryNumberOperation, self).__init__(
- _var_name="",
- _var_type=float,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "a", a)
- object.__delattr__(self, "_var_name")
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Raises:
- NotImplementedError: Must be implemented by subclasses.
- """
- raise NotImplementedError(
- "UnaryNumberOperation must implement _cached_var_name"
- )
-
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
-
- Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(UnaryNumberOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
-
- Returns:
- The VarData of the components and all of its children.
- """
- value = self.a if isinstance(self.a, Var) else LiteralNumberVar(self.a)
- return ImmutableVarData.merge(value._get_all_var_data(), self._var_data)
-
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
-
-class NumberAddOperation(BinaryNumberOperation):
- """Base class for immutable number vars that are the result of an addition operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralNumberVar(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralNumberVar(self.b)
- return f"({str(first_value)} + {str(second_value)})"
-
-
-class NumberSubtractOperation(BinaryNumberOperation):
- """Base class for immutable number vars that are the result of a subtraction operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralNumberVar(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralNumberVar(self.b)
- return f"({str(first_value)} - {str(second_value)})"
-
-
-class NumberAbsoluteOperation(UnaryNumberOperation):
- """Base class for immutable number vars that are the result of an absolute operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- value = self.a if isinstance(self.a, Var) else LiteralNumberVar(self.a)
- return f"Math.abs({str(value)})"
-
-
-class NumberMultiplyOperation(BinaryNumberOperation):
- """Base class for immutable number vars that are the result of a multiplication operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralNumberVar(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralNumberVar(self.b)
- return f"({str(first_value)} * {str(second_value)})"
-
-
-class NumberNegateOperation(UnaryNumberOperation):
- """Base class for immutable number vars that are the result of a negation operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- value = self.a if isinstance(self.a, Var) else LiteralNumberVar(self.a)
- return f"-({str(value)})"
-
-
-class NumberTrueDivision(BinaryNumberOperation):
- """Base class for immutable number vars that are the result of a true division operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralNumberVar(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralNumberVar(self.b)
- return f"({str(first_value)} / {str(second_value)})"
-
-
-class NumberFloorDivision(BinaryNumberOperation):
- """Base class for immutable number vars that are the result of a floor division operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralNumberVar(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralNumberVar(self.b)
- return f"Math.floor({str(first_value)} / {str(second_value)})"
-
-
-class NumberModuloOperation(BinaryNumberOperation):
- """Base class for immutable number vars that are the result of a modulo operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralNumberVar(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralNumberVar(self.b)
- return f"({str(first_value)} % {str(second_value)})"
-
-
-class NumberExponentOperation(BinaryNumberOperation):
- """Base class for immutable number vars that are the result of an exponent operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralNumberVar(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralNumberVar(self.b)
- return f"({str(first_value)} ** {str(second_value)})"
-
-
-class NumberRoundOperation(UnaryNumberOperation):
- """Base class for immutable number vars that are the result of a round operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- value = self.a if isinstance(self.a, Var) else LiteralNumberVar(self.a)
- return f"Math.round({str(value)})"
-
-
-class NumberCeilOperation(UnaryNumberOperation):
- """Base class for immutable number vars that are the result of a ceil operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- value = self.a if isinstance(self.a, Var) else LiteralNumberVar(self.a)
- return f"Math.ceil({str(value)})"
-
-
-class NumberFloorOperation(UnaryNumberOperation):
- """Base class for immutable number vars that are the result of a floor operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- value = self.a if isinstance(self.a, Var) else LiteralNumberVar(self.a)
- return f"Math.floor({str(value)})"
-
-
-class NumberTruncOperation(UnaryNumberOperation):
- """Base class for immutable number vars that are the result of a trunc operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- value = self.a if isinstance(self.a, Var) else LiteralNumberVar(self.a)
- return f"Math.trunc({str(value)})"
-
-
-class BooleanVar(ImmutableVar[bool]):
- """Base class for immutable boolean vars."""
-
- def __and__(self, other: bool) -> BooleanAndOperation:
- """AND two booleans.
-
- Args:
- other: The other boolean.
-
- Returns:
- The boolean AND operation.
- """
- return BooleanAndOperation(self, other)
-
- def __rand__(self, other: bool) -> BooleanAndOperation:
- """AND two booleans.
-
- Args:
- other: The other boolean.
-
- Returns:
- The boolean AND operation.
- """
- return BooleanAndOperation(other, self)
-
- def __or__(self, other: bool) -> BooleanOrOperation:
- """OR two booleans.
-
- Args:
- other: The other boolean.
-
- Returns:
- The boolean OR operation.
- """
- return BooleanOrOperation(self, other)
-
- def __ror__(self, other: bool) -> BooleanOrOperation:
- """OR two booleans.
-
- Args:
- other: The other boolean.
-
- Returns:
- The boolean OR operation.
- """
- return BooleanOrOperation(other, self)
-
- def __invert__(self) -> BooleanNotOperation:
- """NOT the boolean.
-
- Returns:
- The boolean NOT operation.
- """
- return BooleanNotOperation(self)
-
- def __int__(self) -> BooleanToIntOperation:
- """Convert the boolean to an int.
-
- Returns:
- The boolean to int operation.
- """
- return BooleanToIntOperation(self)
-
- def __pos__(self) -> BooleanToIntOperation:
- """Convert the boolean to an int.
-
- Returns:
- The boolean to int operation.
- """
- return BooleanToIntOperation(self)
-
- def bool(self) -> BooleanVar:
- """Boolean conversion.
-
- Returns:
- The boolean value of the boolean.
- """
- return self
-
- def __lt__(self, other: boolean_types | number_types) -> LessThanOperation:
- """Less than comparison.
-
- Args:
- other: The other boolean.
-
- Returns:
- The result of the comparison.
- """
- return LessThanOperation(+self, +other)
-
- def __le__(self, other: boolean_types | number_types) -> LessThanOrEqualOperation:
- """Less than or equal comparison.
-
- Args:
- other: The other boolean.
-
- Returns:
- The result of the comparison.
- """
- return LessThanOrEqualOperation(+self, +other)
-
- def __eq__(self, other: boolean_types | number_types) -> EqualOperation:
- """Equal comparison.
-
- Args:
- other: The other boolean.
-
- Returns:
- The result of the comparison.
- """
- return EqualOperation(+self, +other)
-
- def __ne__(self, other: boolean_types | number_types) -> NotEqualOperation:
- """Not equal comparison.
-
- Args:
- other: The other boolean.
-
- Returns:
- The result of the comparison.
- """
- return NotEqualOperation(+self, +other)
-
- def __gt__(self, other: boolean_types | number_types) -> GreaterThanOperation:
- """Greater than comparison.
-
- Args:
- other: The other boolean.
-
- Returns:
- The result of the comparison.
- """
- return GreaterThanOperation(+self, +other)
-
- def __ge__(
- self, other: boolean_types | number_types
- ) -> GreaterThanOrEqualOperation:
- """Greater than or equal comparison.
-
- Args:
- other: The other boolean.
-
- Returns:
- The result of the comparison.
- """
- return GreaterThanOrEqualOperation(+self, +other)
-
-
-@dataclasses.dataclass(
- eq=False,
- frozen=True,
- **{"slots": True} if sys.version_info >= (3, 10) else {},
-)
-class BooleanToIntOperation(NumberVar):
- """Base class for immutable number vars that are the result of a boolean to int operation."""
-
- a: boolean_types = dataclasses.field(default=False)
-
- def __init__(
- self,
- a: boolean_types,
- _var_data: VarData | None = None,
- ):
- """Initialize the boolean to int operation var.
-
- Args:
- a: The boolean.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(BooleanToIntOperation, self).__init__(
- _var_name="",
- _var_type=int,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "a", a)
- object.__delattr__(self, "_var_name")
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- return f"({str(self.a)} ? 1 : 0)"
-
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
-
- Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(BooleanToIntOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
-
- Returns:
- The VarData of the components and all of its children.
- """
- return ImmutableVarData.merge(
- self.a._get_all_var_data() if isinstance(self.a, Var) else None,
- self._var_data,
- )
-
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
-
-@dataclasses.dataclass(
- eq=False,
- frozen=True,
- **{"slots": True} if sys.version_info >= (3, 10) else {},
-)
-class NumberComparisonOperation(BooleanVar):
- """Base class for immutable boolean vars that are the result of a comparison operation."""
-
- a: number_types = dataclasses.field(default=0)
- b: number_types = dataclasses.field(default=0)
-
- def __init__(
- self,
- a: number_types,
- b: number_types,
- _var_data: VarData | None = None,
- ):
- """Initialize the comparison operation var.
-
- Args:
- a: The first value.
- b: The second value.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(NumberComparisonOperation, self).__init__(
- _var_name="",
- _var_type=bool,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "a", a)
- object.__setattr__(self, "b", b)
- object.__delattr__(self, "_var_name")
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Raises:
- NotImplementedError: Must be implemented by subclasses.
- """
- raise NotImplementedError("ComparisonOperation must implement _cached_var_name")
-
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
-
- Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(NumberComparisonOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
-
- Returns:
- The VarData of the components and all of its children.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralVar.create(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralVar.create(self.b)
- return ImmutableVarData.merge(
- first_value._get_all_var_data(), second_value._get_all_var_data()
- )
-
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
-
-class GreaterThanOperation(NumberComparisonOperation):
- """Base class for immutable boolean vars that are the result of a greater than operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralVar.create(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralVar.create(self.b)
- return f"({str(first_value)} > {str(second_value)})"
-
-
-class GreaterThanOrEqualOperation(NumberComparisonOperation):
- """Base class for immutable boolean vars that are the result of a greater than or equal operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralVar.create(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralVar.create(self.b)
- return f"({str(first_value)} >= {str(second_value)})"
-
-
-class LessThanOperation(NumberComparisonOperation):
- """Base class for immutable boolean vars that are the result of a less than operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralVar.create(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralVar.create(self.b)
- return f"({str(first_value)} < {str(second_value)})"
-
-
-class LessThanOrEqualOperation(NumberComparisonOperation):
- """Base class for immutable boolean vars that are the result of a less than or equal operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralVar.create(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralVar.create(self.b)
- return f"({str(first_value)} <= {str(second_value)})"
-
-
-class EqualOperation(NumberComparisonOperation):
- """Base class for immutable boolean vars that are the result of an equal operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralVar.create(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralVar.create(self.b)
- return f"({str(first_value)} == {str(second_value)})"
-
-
-class NotEqualOperation(NumberComparisonOperation):
- """Base class for immutable boolean vars that are the result of a not equal operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralVar.create(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralVar.create(self.b)
- return f"({str(first_value)} != {str(second_value)})"
-
-
-@dataclasses.dataclass(
- eq=False,
- frozen=True,
- **{"slots": True} if sys.version_info >= (3, 10) else {},
-)
-class LogicalOperation(BooleanVar):
- """Base class for immutable boolean vars that are the result of a logical operation."""
-
- a: boolean_types = dataclasses.field(default=False)
- b: boolean_types = dataclasses.field(default=False)
-
- def __init__(
- self, a: boolean_types, b: boolean_types, _var_data: VarData | None = None
- ):
- """Initialize the logical operation var.
-
- Args:
- a: The first value.
- b: The second value.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(LogicalOperation, self).__init__(
- _var_name="",
- _var_type=bool,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "a", a)
- object.__setattr__(self, "b", b)
- object.__delattr__(self, "_var_name")
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Raises:
- NotImplementedError: Must be implemented by subclasses.
- """
- raise NotImplementedError("LogicalOperation must implement _cached_var_name")
-
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
-
- Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(LogicalOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
-
- Returns:
- The VarData of the components and all of its children.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralVar.create(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralVar.create(self.b)
- return ImmutableVarData.merge(
- first_value._get_all_var_data(), second_value._get_all_var_data()
- )
-
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
-
-class BooleanAndOperation(LogicalOperation):
- """Base class for immutable boolean vars that are the result of a logical AND operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralVar.create(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralVar.create(self.b)
- return f"({str(first_value)} && {str(second_value)})"
-
-
-class BooleanOrOperation(LogicalOperation):
- """Base class for immutable boolean vars that are the result of a logical OR operation."""
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- first_value = self.a if isinstance(self.a, Var) else LiteralVar.create(self.a)
- second_value = self.b if isinstance(self.b, Var) else LiteralVar.create(self.b)
- return f"({str(first_value)} || {str(second_value)})"
-
-
-class BooleanNotOperation(BooleanVar):
- """Base class for immutable boolean vars that are the result of a logical NOT operation."""
-
- a: boolean_types = dataclasses.field()
-
- def __init__(self, a: boolean_types, _var_data: VarData | None = None):
- """Initialize the logical NOT operation var.
-
- Args:
- a: The value.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(BooleanNotOperation, self).__init__(
- _var_name="",
- _var_type=bool,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "a", a)
- object.__delattr__(self, "_var_name")
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- value = self.a if isinstance(self.a, Var) else LiteralVar.create(self.a)
- return f"!({str(value)})"
-
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
-
- Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(BooleanNotOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
-
- Returns:
- The VarData of the components and all of its children.
- """
- value = self.a if isinstance(self.a, Var) else LiteralVar.create(self.a)
- return ImmutableVarData.merge(value._get_all_var_data())
-
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
-
-@dataclasses.dataclass(
- eq=False,
- frozen=True,
- **{"slots": True} if sys.version_info >= (3, 10) else {},
-)
-class LiteralBooleanVar(LiteralVar, BooleanVar):
- """Base class for immutable literal boolean vars."""
-
- _var_value: bool = dataclasses.field(default=False)
-
- def __init__(
- self,
- _var_value: bool,
- _var_data: VarData | None = None,
- ):
- """Initialize the boolean var.
-
- Args:
- _var_value: The value of the var.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(LiteralBooleanVar, self).__init__(
- _var_name="true" if _var_value else "false",
- _var_type=bool,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "_var_value", _var_value)
-
- def __hash__(self) -> int:
- """Hash the var.
-
- Returns:
- The hash of the var.
- """
- return hash((self.__class__.__name__, self._var_value))
-
- def json(self) -> str:
- """Get the JSON representation of the var.
-
- Returns:
- The JSON representation of the var.
- """
- return "true" if self._var_value else "false"
-
-
-@dataclasses.dataclass(
- eq=False,
- frozen=True,
- **{"slots": True} if sys.version_info >= (3, 10) else {},
-)
-class LiteralNumberVar(LiteralVar, NumberVar):
- """Base class for immutable literal number vars."""
-
- _var_value: float | int = dataclasses.field(default=0)
-
- def __init__(
- self,
- _var_value: float | int,
- _var_data: VarData | None = None,
- ):
- """Initialize the number var.
-
- Args:
- _var_value: The value of the var.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(LiteralNumberVar, self).__init__(
- _var_name=str(_var_value),
- _var_type=type(_var_value),
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "_var_value", _var_value)
-
- def __hash__(self) -> int:
- """Hash the var.
-
- Returns:
- The hash of the var.
- """
- return hash((self.__class__.__name__, self._var_value))
-
- def json(self) -> str:
- """Get the JSON representation of the var.
-
- Returns:
- The JSON representation of the var.
- """
- return json.dumps(self._var_value)
-
-
-number_types = Union[NumberVar, LiteralNumberVar, int, float]
-boolean_types = Union[BooleanVar, LiteralBooleanVar, bool]
-
-
-@dataclasses.dataclass(
- eq=False,
- frozen=True,
- **{"slots": True} if sys.version_info >= (3, 10) else {},
-)
-class ToNumberVarOperation(NumberVar):
- """Base class for immutable number vars that are the result of a number operation."""
-
- _original_value: Var = dataclasses.field(
- default_factory=lambda: LiteralNumberVar(0)
- )
-
- def __init__(
- self,
- _original_value: Var,
- _var_type: type[int] | type[float] = float,
- _var_data: VarData | None = None,
- ):
- """Initialize the number var.
-
- Args:
- _original_value: The original value.
- _var_type: The type of the Var.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(ToNumberVarOperation, self).__init__(
- _var_name="",
- _var_type=_var_type,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "_original_value", _original_value)
- object.__delattr__(self, "_var_name")
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- return str(self._original_value)
-
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
-
- Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(ToNumberVarOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
-
- Returns:
- The VarData of the components and all of its children.
- """
- return ImmutableVarData.merge(
- self._original_value._get_all_var_data(), self._var_data
- )
-
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
-
-@dataclasses.dataclass(
- eq=False,
- frozen=True,
- **{"slots": True} if sys.version_info >= (3, 10) else {},
-)
-class ToBooleanVarOperation(BooleanVar):
- """Base class for immutable boolean vars that are the result of a boolean operation."""
-
- _original_value: Var = dataclasses.field(
- default_factory=lambda: LiteralBooleanVar(False)
- )
-
- def __init__(
- self,
- _original_value: Var,
- _var_data: VarData | None = None,
- ):
- """Initialize the boolean var.
-
- Args:
- _original_value: The original value.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(ToBooleanVarOperation, self).__init__(
- _var_name="",
- _var_type=bool,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "_original_value", _original_value)
- object.__delattr__(self, "_var_name")
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the var.
-
- Returns:
- The name of the var.
- """
- return str(self._original_value)
-
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
-
- Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(ToBooleanVarOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
-
- Returns:
- The VarData of the components and all of its children.
- """
- return ImmutableVarData.merge(
- self._original_value._get_all_var_data(), self._var_data
- )
-
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
diff --git a/reflex/experimental/vars/__init__.py b/reflex/ivars/__init__.py
similarity index 100%
rename from reflex/experimental/vars/__init__.py
rename to reflex/ivars/__init__.py
diff --git a/reflex/ivars/base.py b/reflex/ivars/base.py
new file mode 100644
index 00000000000..de970ff641f
--- /dev/null
+++ b/reflex/ivars/base.py
@@ -0,0 +1,1794 @@
+"""Collection of base classes."""
+
+from __future__ import annotations
+
+import contextlib
+import dataclasses
+import datetime
+import dis
+import functools
+import inspect
+import json
+import sys
+import warnings
+from types import CodeType, FunctionType
+from typing import (
+ TYPE_CHECKING,
+ Any,
+ Callable,
+ Dict,
+ Generic,
+ List,
+ Literal,
+ Optional,
+ Sequence,
+ Set,
+ Tuple,
+ Type,
+ TypeVar,
+ Union,
+ cast,
+ get_args,
+ overload,
+)
+
+from typing_extensions import ParamSpec, get_origin, get_type_hints, override
+
+from reflex import constants
+from reflex.base import Base
+from reflex.constants.colors import Color
+from reflex.utils import console, imports, serializers, types
+from reflex.utils.exceptions import VarDependencyError, VarTypeError, VarValueError
+from reflex.utils.format import format_state_name
+from reflex.vars import (
+ ComputedVar,
+ ImmutableVarData,
+ Var,
+ VarData,
+ _decode_var_immutable,
+ _extract_var_data,
+ _global_vars,
+)
+
+if TYPE_CHECKING:
+ from reflex.state import BaseState
+
+ from .function import FunctionVar, ToFunctionOperation
+ from .number import (
+ BooleanVar,
+ NumberVar,
+ ToBooleanVarOperation,
+ ToNumberVarOperation,
+ )
+ from .object import ObjectVar, ToObjectOperation
+ from .sequence import ArrayVar, StringVar, ToArrayOperation, ToStringOperation
+
+
+VAR_TYPE = TypeVar("VAR_TYPE")
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class ImmutableVar(Var, Generic[VAR_TYPE]):
+ """Base class for immutable vars."""
+
+ # The name of the var.
+ _var_name: str = dataclasses.field()
+
+ # The type of the var.
+ _var_type: types.GenericType = dataclasses.field(default=Any)
+
+ # Extra metadata associated with the Var
+ _var_data: Optional[ImmutableVarData] = dataclasses.field(default=None)
+
+ def __str__(self) -> str:
+ """String representation of the var. Guaranteed to be a valid Javascript expression.
+
+ Returns:
+ The name of the var.
+ """
+ return self._var_name
+
+ @property
+ def _var_is_local(self) -> bool:
+ """Whether this is a local javascript variable.
+
+ Returns:
+ False
+ """
+ return False
+
+ @property
+ def _var_is_string(self) -> bool:
+ """Whether the var is a string literal.
+
+ Returns:
+ False
+ """
+ return False
+
+ @property
+ def _var_full_name_needs_state_prefix(self) -> bool:
+ """Whether the full name of the var needs a _var_state prefix.
+
+ Returns:
+ False
+ """
+ return False
+
+ def __post_init__(self):
+ """Post-initialize the var."""
+ # Decode any inline Var markup and apply it to the instance
+ _var_data, _var_name = _decode_var_immutable(self._var_name)
+
+ if _var_data or _var_name != self._var_name:
+ self.__init__(
+ _var_name=_var_name,
+ _var_type=self._var_type,
+ _var_data=ImmutableVarData.merge(self._var_data, _var_data),
+ )
+
+ def __hash__(self) -> int:
+ """Define a hash function for the var.
+
+ Returns:
+ The hash of the var.
+ """
+ return hash((self._var_name, self._var_type, self._var_data))
+
+ def _get_all_var_data(self) -> ImmutableVarData | None:
+ """Get all VarData associated with the Var.
+
+ Returns:
+ The VarData of the components and all of its children.
+ """
+ return self._var_data
+
+ def _replace(self, merge_var_data=None, **kwargs: Any):
+ """Make a copy of this Var with updated fields.
+
+ Args:
+ merge_var_data: VarData to merge into the existing VarData.
+ **kwargs: Var fields to update.
+
+ Returns:
+ A new ImmutableVar with the updated fields overwriting the corresponding fields in this Var.
+
+ Raises:
+ TypeError: If _var_is_local, _var_is_string, or _var_full_name_needs_state_prefix is not None.
+ """
+ if kwargs.get("_var_is_local", False) is not False:
+ raise TypeError(
+ "The _var_is_local argument is not supported for ImmutableVar."
+ )
+
+ if kwargs.get("_var_is_string", False) is not False:
+ raise TypeError(
+ "The _var_is_string argument is not supported for ImmutableVar."
+ )
+
+ if kwargs.get("_var_full_name_needs_state_prefix", False) is not False:
+ raise TypeError(
+ "The _var_full_name_needs_state_prefix argument is not supported for ImmutableVar."
+ )
+
+ return dataclasses.replace(
+ self,
+ _var_data=ImmutableVarData.merge(
+ kwargs.get("_var_data", self._var_data), merge_var_data
+ ),
+ **kwargs,
+ )
+
+ @classmethod
+ def create(
+ cls,
+ value: Any,
+ _var_is_local: bool | None = None,
+ _var_is_string: bool | None = None,
+ _var_data: VarData | None = None,
+ ) -> ImmutableVar | Var | None:
+ """Create a var from a value.
+
+ Args:
+ value: The value to create the var from.
+ _var_is_local: Whether the var is local. Deprecated.
+ _var_is_string: Whether the var is a string literal. Deprecated.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The var.
+
+ Raises:
+ VarTypeError: If the value is JSON-unserializable.
+ TypeError: If _var_is_local or _var_is_string is not None.
+ """
+ if _var_is_local is not None:
+ raise TypeError(
+ "The _var_is_local argument is not supported for ImmutableVar."
+ )
+
+ if _var_is_string is not None:
+ raise TypeError(
+ "The _var_is_string argument is not supported for ImmutableVar."
+ )
+
+ from reflex.utils import format
+
+ # Check for none values.
+ if value is None:
+ return None
+
+ # If the value is already a var, do nothing.
+ if isinstance(value, Var):
+ return value
+
+ # Try to pull the imports and hooks from contained values.
+ if not isinstance(value, str):
+ _var_data = VarData.merge(*_extract_var_data(value), _var_data)
+
+ # Try to serialize the value.
+ type_ = type(value)
+ if type_ in types.JSONType:
+ name = value
+ else:
+ name, _serialized_type = serializers.serialize(value, get_type=True)
+ if name is None:
+ raise VarTypeError(
+ f"No JSON serializer found for var {value} of type {type_}."
+ )
+ name = name if isinstance(name, str) else format.json_dumps(name)
+
+ return cls(
+ _var_name=name,
+ _var_type=type_,
+ _var_data=(
+ ImmutableVarData(
+ state=_var_data.state,
+ imports=_var_data.imports,
+ hooks=_var_data.hooks,
+ )
+ if _var_data
+ else None
+ ),
+ )
+
+ @classmethod
+ def create_safe(
+ cls,
+ value: Any,
+ _var_is_local: bool | None = None,
+ _var_is_string: bool | None = None,
+ _var_data: VarData | None = None,
+ ) -> Var | ImmutableVar:
+ """Create a var from a value, asserting that it is not None.
+
+ Args:
+ value: The value to create the var from.
+ _var_is_local: Whether the var is local. Deprecated.
+ _var_is_string: Whether the var is a string literal. Deprecated.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The var.
+ """
+ var = cls.create(
+ value,
+ _var_is_local=_var_is_local,
+ _var_is_string=_var_is_string,
+ _var_data=_var_data,
+ )
+ assert var is not None
+ return var
+
+ def __format__(self, format_spec: str) -> str:
+ """Format the var into a Javascript equivalent to an f-string.
+
+ Args:
+ format_spec: The format specifier (Ignored for now).
+
+ Returns:
+ The formatted var.
+ """
+ hashed_var = hash(self)
+
+ _global_vars[hashed_var] = self
+
+ # Encode the _var_data into the formatted output for tracking purposes.
+ return f"{constants.REFLEX_VAR_OPENING_TAG}{hashed_var}{constants.REFLEX_VAR_CLOSING_TAG}{self._var_name}"
+
+ @overload
+ def to(
+ self, output: Type[NumberVar], var_type: type[int] | type[float] = float
+ ) -> ToNumberVarOperation: ...
+
+ @overload
+ def to(self, output: Type[BooleanVar]) -> ToBooleanVarOperation: ...
+
+ @overload
+ def to(
+ self,
+ output: Type[ArrayVar],
+ var_type: type[list] | type[tuple] | type[set] = list,
+ ) -> ToArrayOperation: ...
+
+ @overload
+ def to(self, output: Type[StringVar]) -> ToStringOperation: ...
+
+ @overload
+ def to(
+ self, output: Type[ObjectVar], var_type: types.GenericType = dict
+ ) -> ToObjectOperation: ...
+
+ @overload
+ def to(
+ self, output: Type[FunctionVar], var_type: Type[Callable] = Callable
+ ) -> ToFunctionOperation: ...
+
+ @overload
+ def to(
+ self,
+ output: Type[OUTPUT] | types.GenericType,
+ var_type: types.GenericType | None = None,
+ ) -> OUTPUT: ...
+
+ def to(
+ self,
+ output: Type[OUTPUT] | types.GenericType,
+ var_type: types.GenericType | None = None,
+ ) -> Var:
+ """Convert the var to a different type.
+
+ Args:
+ output: The output type.
+ var_type: The type of the var.
+
+ Raises:
+ TypeError: If the var_type is not a supported type for the output.
+
+ Returns:
+ The converted var.
+ """
+ from .function import FunctionVar, ToFunctionOperation
+ from .number import (
+ BooleanVar,
+ NumberVar,
+ ToBooleanVarOperation,
+ ToNumberVarOperation,
+ )
+ from .object import ObjectVar, ToObjectOperation
+ from .sequence import ArrayVar, StringVar, ToArrayOperation, ToStringOperation
+
+ fixed_type = get_origin(var_type) or var_type
+
+ fixed_output_type = get_origin(output) or output
+
+ # If the first argument is a python type, we map it to the corresponding Var type.
+ if fixed_output_type is dict:
+ return self.to(ObjectVar, output)
+ if fixed_output_type in (list, tuple, set):
+ return self.to(ArrayVar, output)
+ if fixed_output_type in (int, float):
+ return self.to(NumberVar, output)
+ if fixed_output_type is str:
+ return self.to(StringVar, output)
+ if fixed_output_type is bool:
+ return self.to(BooleanVar, output)
+
+ if issubclass(output, NumberVar):
+ if fixed_type is not None and not issubclass(fixed_type, (int, float)):
+ raise TypeError(
+ f"Unsupported type {var_type} for NumberVar. Must be int or float."
+ )
+ return ToNumberVarOperation.create(self, var_type or float)
+
+ if issubclass(output, BooleanVar):
+ return ToBooleanVarOperation.create(self)
+
+ if issubclass(output, ArrayVar):
+ if fixed_type is not None and not issubclass(
+ fixed_type, (list, tuple, set)
+ ):
+ raise TypeError(
+ f"Unsupported type {var_type} for ArrayVar. Must be list, tuple, or set."
+ )
+ return ToArrayOperation.create(self, var_type or list)
+
+ if issubclass(output, StringVar):
+ return ToStringOperation.create(self)
+
+ if issubclass(output, (ObjectVar, Base)):
+ return ToObjectOperation.create(self, var_type or dict)
+
+ if issubclass(output, FunctionVar):
+ # if fixed_type is not None and not issubclass(fixed_type, Callable):
+ # raise TypeError(
+ # f"Unsupported type {var_type} for FunctionVar. Must be Callable."
+ # )
+ return ToFunctionOperation.create(self, var_type or Callable)
+
+ # If we can't determine the first argument, we just replace the _var_type.
+ if not issubclass(output, Var) or var_type is None:
+ return dataclasses.replace(
+ self,
+ _var_type=output,
+ )
+
+ # We couldn't determine the output type to be any other Var type, so we replace the _var_type.
+ if var_type is not None:
+ return dataclasses.replace(
+ self,
+ _var_type=var_type,
+ )
+
+ return self
+
+ def guess_type(self) -> ImmutableVar:
+ """Guesses the type of the variable based on its `_var_type` attribute.
+
+ Returns:
+ ImmutableVar: The guessed type of the variable.
+
+ Raises:
+ TypeError: If the type is not supported for guessing.
+ """
+ from .number import NumberVar
+ from .object import ObjectVar
+ from .sequence import ArrayVar, StringVar
+
+ var_type = self._var_type
+ if types.is_optional(var_type):
+ var_type = types.get_args(var_type)[0]
+
+ if var_type is Any:
+ return self
+
+ fixed_type = get_origin(var_type) or var_type
+
+ if fixed_type is Union:
+ return self
+
+ if not inspect.isclass(fixed_type):
+ raise TypeError(f"Unsupported type {var_type} for guess_type.")
+
+ if issubclass(fixed_type, (int, float)):
+ return self.to(NumberVar, self._var_type)
+ if issubclass(fixed_type, dict):
+ return self.to(ObjectVar, self._var_type)
+ if issubclass(fixed_type, (list, tuple, set)):
+ return self.to(ArrayVar, self._var_type)
+ if issubclass(fixed_type, str):
+ return self.to(StringVar)
+ if issubclass(fixed_type, Base):
+ return self.to(ObjectVar, self._var_type)
+ return self
+
+ def get_default_value(self) -> Any:
+ """Get the default value of the var.
+
+ Returns:
+ The default value of the var.
+
+ Raises:
+ ImportError: If the var is a dataframe and pandas is not installed.
+ """
+ if types.is_optional(self._var_type):
+ return None
+
+ type_ = (
+ get_origin(self._var_type)
+ if types.is_generic_alias(self._var_type)
+ else self._var_type
+ )
+ if type_ is Literal:
+ args = get_args(self._var_type)
+ return args[0] if args else None
+ if issubclass(type_, str):
+ return ""
+ if issubclass(type_, types.get_args(Union[int, float])):
+ return 0
+ if issubclass(type_, bool):
+ return False
+ if issubclass(type_, list):
+ return []
+ if issubclass(type_, dict):
+ return {}
+ if issubclass(type_, tuple):
+ return ()
+ if types.is_dataframe(type_):
+ try:
+ import pandas as pd
+
+ return pd.DataFrame()
+ except ImportError as e:
+ raise ImportError(
+ "Please install pandas to use dataframes in your app."
+ ) from e
+ return set() if issubclass(type_, set) else None
+
+ def get_setter_name(self, include_state: bool = True) -> str:
+ """Get the name of the var's generated setter function.
+
+ Args:
+ include_state: Whether to include the state name in the setter name.
+
+ Returns:
+ The name of the setter function.
+ """
+ var_name_parts = self._var_name.split(".")
+ setter = constants.SETTER_PREFIX + var_name_parts[-1]
+ if self._var_data is None:
+ return setter
+ if not include_state or self._var_data.state == "":
+ return setter
+ return ".".join((self._var_data.state, setter))
+
+ def get_setter(self) -> Callable[[BaseState, Any], None]:
+ """Get the var's setter function.
+
+ Returns:
+ A function that that creates a setter for the var.
+ """
+ actual_name = self._var_name.split(".")[-1]
+
+ def setter(state: BaseState, value: Any):
+ """Get the setter for the var.
+
+ Args:
+ state: The state within which we add the setter function.
+ value: The value to set.
+ """
+ if self._var_type in [int, float]:
+ try:
+ value = self._var_type(value)
+ setattr(state, actual_name, value)
+ except ValueError:
+ console.debug(
+ f"{type(state).__name__}.{self._var_name}: Failed conversion of {value} to '{self._var_type.__name__}'. Value not set.",
+ )
+ else:
+ setattr(state, actual_name, value)
+
+ setter.__qualname__ = self.get_setter_name()
+
+ return setter
+
+ def __eq__(self, other: Var | Any) -> BooleanVar:
+ """Check if the current variable is equal to the given variable.
+
+ Args:
+ other (Var | Any): The variable to compare with.
+
+ Returns:
+ BooleanVar: A BooleanVar object representing the result of the equality check.
+ """
+ from .number import EqualOperation
+
+ return EqualOperation.create(self, other)
+
+ def __ne__(self, other: Var | Any) -> BooleanVar:
+ """Check if the current object is not equal to the given object.
+
+ Parameters:
+ other (Var | Any): The object to compare with.
+
+ Returns:
+ BooleanVar: A BooleanVar object representing the result of the comparison.
+ """
+ from .number import EqualOperation
+
+ return ~EqualOperation.create(self, other)
+
+ def __gt__(self, other: Var | Any) -> BooleanVar:
+ """Compare the current instance with another variable and return a BooleanVar representing the result of the greater than operation.
+
+ Args:
+ other (Var | Any): The variable to compare with.
+
+ Returns:
+ BooleanVar: A BooleanVar representing the result of the greater than operation.
+ """
+ from .number import GreaterThanOperation
+
+ return GreaterThanOperation.create(self, other)
+
+ def __ge__(self, other: Var | Any) -> BooleanVar:
+ """Check if the value of this variable is greater than or equal to the value of another variable or object.
+
+ Args:
+ other (Var | Any): The variable or object to compare with.
+
+ Returns:
+ BooleanVar: A BooleanVar object representing the result of the comparison.
+ """
+ from .number import GreaterThanOrEqualOperation
+
+ return GreaterThanOrEqualOperation.create(self, other)
+
+ def __lt__(self, other: Var | Any) -> BooleanVar:
+ """Compare the current instance with another variable using the less than (<) operator.
+
+ Args:
+ other: The variable to compare with.
+
+ Returns:
+ A `BooleanVar` object representing the result of the comparison.
+ """
+ from .number import LessThanOperation
+
+ return LessThanOperation.create(self, other)
+
+ def __le__(self, other: Var | Any) -> BooleanVar:
+ """Compare if the current instance is less than or equal to the given value.
+
+ Args:
+ other: The value to compare with.
+
+ Returns:
+ A BooleanVar object representing the result of the comparison.
+ """
+ from .number import LessThanOrEqualOperation
+
+ return LessThanOrEqualOperation.create(self, other)
+
+ def bool(self) -> BooleanVar:
+ """Convert the var to a boolean.
+
+ Returns:
+ The boolean var.
+ """
+ from .number import ToBooleanVarOperation
+
+ return ToBooleanVarOperation.create(self)
+
+ def __and__(self, other: Var | Any) -> ImmutableVar:
+ """Perform a logical AND operation on the current instance and another variable.
+
+ Args:
+ other: The variable to perform the logical AND operation with.
+
+ Returns:
+ A `BooleanVar` object representing the result of the logical AND operation.
+ """
+ return AndOperation.create(self, other)
+
+ def __rand__(self, other: Var | Any) -> ImmutableVar:
+ """Perform a logical AND operation on the current instance and another variable.
+
+ Args:
+ other: The variable to perform the logical AND operation with.
+
+ Returns:
+ A `BooleanVar` object representing the result of the logical AND operation.
+ """
+ return AndOperation.create(other, self)
+
+ def __or__(self, other: Var | Any) -> ImmutableVar:
+ """Perform a logical OR operation on the current instance and another variable.
+
+ Args:
+ other: The variable to perform the logical OR operation with.
+
+ Returns:
+ A `BooleanVar` object representing the result of the logical OR operation.
+ """
+ return OrOperation.create(self, other)
+
+ def __ror__(self, other: Var | Any) -> ImmutableVar:
+ """Perform a logical OR operation on the current instance and another variable.
+
+ Args:
+ other: The variable to perform the logical OR operation with.
+
+ Returns:
+ A `BooleanVar` object representing the result of the logical OR operation.
+ """
+ return OrOperation.create(other, self)
+
+ def __invert__(self) -> BooleanVar:
+ """Perform a logical NOT operation on the current instance.
+
+ Returns:
+ A `BooleanVar` object representing the result of the logical NOT operation.
+ """
+ from .number import BooleanNotOperation
+
+ return BooleanNotOperation.create(self.bool())
+
+ def to_string(self) -> ImmutableVar:
+ """Convert the var to a string.
+
+ Returns:
+ The string var.
+ """
+ from .function import JSON_STRINGIFY
+ from .sequence import StringVar
+
+ return JSON_STRINGIFY.call(self).to(StringVar)
+
+ def as_ref(self) -> ImmutableVar:
+ """Get a reference to the var.
+
+ Returns:
+ The reference to the var.
+ """
+ from .object import ObjectVar
+
+ refs = ImmutableVar(
+ _var_name="refs",
+ _var_data=ImmutableVarData(
+ imports={
+ f"/{constants.Dirs.STATE_PATH}": [imports.ImportVar(tag="refs")]
+ }
+ ),
+ ).to(ObjectVar)
+ return refs[LiteralVar.create(str(self))]
+
+ def _type(self) -> StringVar:
+ """Returns the type of the object.
+
+ This method uses the `typeof` function from the `FunctionStringVar` class
+ to determine the type of the object.
+
+ Returns:
+ StringVar: A string variable representing the type of the object.
+ """
+ from .function import FunctionStringVar
+ from .sequence import StringVar
+
+ type_of = FunctionStringVar("typeof")
+ return type_of.call(self).to(StringVar)
+
+
+OUTPUT = TypeVar("OUTPUT", bound=ImmutableVar)
+
+
+class LiteralVar(ImmutableVar):
+ """Base class for immutable literal vars."""
+
+ @classmethod
+ def create(
+ cls,
+ value: Any,
+ _var_data: VarData | None = None,
+ ) -> Var:
+ """Create a var from a value.
+
+ Args:
+ value: The value to create the var from.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The var.
+
+ Raises:
+ TypeError: If the value is not a supported type for LiteralVar.
+ """
+ from .number import LiteralBooleanVar, LiteralNumberVar
+ from .object import LiteralObjectVar
+ from .sequence import LiteralArrayVar, LiteralStringVar
+
+ if isinstance(value, Var):
+ if _var_data is None:
+ return value
+ return value._replace(merge_var_data=_var_data)
+
+ if isinstance(value, str):
+ return LiteralStringVar.create(value, _var_data=_var_data)
+
+ if isinstance(value, bool):
+ return LiteralBooleanVar.create(value, _var_data=_var_data)
+
+ if isinstance(value, (int, float)):
+ return LiteralNumberVar.create(value, _var_data=_var_data)
+
+ if isinstance(value, dict):
+ return LiteralObjectVar.create(value, _var_data=_var_data)
+
+ if isinstance(value, Color):
+ return LiteralStringVar.create(f"{value}", _var_data=_var_data)
+
+ if isinstance(value, (list, tuple, set)):
+ return LiteralArrayVar.create(value, _var_data=_var_data)
+
+ if value is None:
+ return ImmutableVar.create_safe("null", _var_data=_var_data)
+
+ from reflex.event import EventChain, EventSpec
+ from reflex.utils.format import get_event_handler_parts
+
+ from .function import ArgsFunctionOperation, FunctionStringVar
+ from .object import LiteralObjectVar
+
+ if isinstance(value, EventSpec):
+ event_name = LiteralVar.create(
+ ".".join(filter(None, get_event_handler_parts(value.handler)))
+ )
+ event_args = LiteralVar.create(
+ {str(name): value for name, value in value.args}
+ )
+ event_client_name = LiteralVar.create(value.client_handler_name)
+ return FunctionStringVar("Event").call(
+ event_name,
+ event_args,
+ *([event_client_name] if value.client_handler_name else []),
+ )
+
+ if isinstance(value, EventChain):
+ sig = inspect.signature(value.args_spec) # type: ignore
+ if sig.parameters:
+ arg_def = tuple((f"_{p}" for p in sig.parameters))
+ arg_def_expr = LiteralVar.create(
+ [ImmutableVar.create_safe(arg) for arg in arg_def]
+ )
+ else:
+ # add a default argument for addEvents if none were specified in value.args_spec
+ # used to trigger the preventDefault() on the event.
+ arg_def = ("...args",)
+ arg_def_expr = ImmutableVar.create_safe("args")
+
+ return ArgsFunctionOperation.create(
+ arg_def,
+ FunctionStringVar.create("addEvents").call(
+ LiteralVar.create(
+ [LiteralVar.create(event) for event in value.events]
+ ),
+ arg_def_expr,
+ LiteralVar.create(value.event_actions),
+ ),
+ )
+
+ try:
+ from plotly.graph_objects import Figure, layout
+ from plotly.io import to_json
+
+ if isinstance(value, Figure):
+ return LiteralObjectVar.create(
+ json.loads(str(to_json(value))),
+ _var_type=Figure,
+ _var_data=_var_data,
+ )
+
+ if isinstance(value, layout.Template):
+ return LiteralObjectVar.create(
+ {
+ "data": json.loads(str(to_json(value.data))),
+ "layout": json.loads(str(to_json(value.layout))),
+ },
+ _var_type=layout.Template,
+ _var_data=_var_data,
+ )
+ except ImportError:
+ pass
+
+ try:
+ import base64
+ import io
+
+ from PIL.Image import MIME
+ from PIL.Image import Image as Img
+
+ if isinstance(value, Img):
+ with io.BytesIO() as buffer:
+ image_format = getattr(value, "format", None) or "PNG"
+ value.save(buffer, format=image_format)
+ try:
+ # Newer method to get the mime type, but does not always work.
+ mimetype = value.get_format_mimetype() # type: ignore
+ except AttributeError:
+ try:
+ # Fallback method
+ mimetype = MIME[image_format]
+ except KeyError:
+ # Unknown mime_type: warn and return image/png and hope the browser can sort it out.
+ warnings.warn( # noqa: B028
+ f"Unknown mime type for {value} {image_format}. Defaulting to image/png"
+ )
+ mimetype = "image/png"
+ return LiteralStringVar.create(
+ f"data:{mimetype};base64,{base64.b64encode(buffer.getvalue()).decode()}",
+ _var_data=_var_data,
+ )
+ except ImportError:
+ pass
+
+ if isinstance(value, Base):
+ return LiteralObjectVar.create(
+ {k: (None if callable(v) else v) for k, v in value.dict().items()},
+ _var_type=type(value),
+ _var_data=_var_data,
+ )
+
+ raise TypeError(
+ f"Unsupported type {type(value)} for LiteralVar. Tried to create a LiteralVar from {value}."
+ )
+
+ def __post_init__(self):
+ """Post-initialize the var."""
+
+ def json(self) -> str:
+ """Serialize the var to a JSON string.
+
+ Raises:
+ NotImplementedError: If the method is not implemented.
+ """
+ raise NotImplementedError(
+ "LiteralVar subclasses must implement the json method."
+ )
+
+
+P = ParamSpec("P")
+T = TypeVar("T", bound=ImmutableVar)
+
+
+def var_operation(*, output: Type[T]) -> Callable[[Callable[P, str]], Callable[P, T]]:
+ """Decorator for creating a var operation.
+
+ Example:
+ ```python
+ @var_operation(output=NumberVar)
+ def add(a: NumberVar, b: NumberVar):
+ return f"({a} + {b})"
+ ```
+
+ Args:
+ output: The output type of the operation.
+
+ Returns:
+ The decorator.
+ """
+
+ def decorator(func: Callable[P, str], output=output):
+ @functools.wraps(func)
+ def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
+ args_vars = [
+ LiteralVar.create(arg) if not isinstance(arg, Var) else arg
+ for arg in args
+ ]
+ kwargs_vars = {
+ key: LiteralVar.create(value) if not isinstance(value, Var) else value
+ for key, value in kwargs.items()
+ }
+ return output(
+ _var_name=func(*args_vars, **kwargs_vars), # type: ignore
+ _var_data=VarData.merge(
+ *[arg._get_all_var_data() for arg in args if isinstance(arg, Var)],
+ *[
+ arg._get_all_var_data()
+ for arg in kwargs.values()
+ if isinstance(arg, Var)
+ ],
+ ),
+ )
+
+ return wrapper
+
+ return decorator
+
+
+def unionize(*args: Type) -> Type:
+ """Unionize the types.
+
+ Args:
+ args: The types to unionize.
+
+ Returns:
+ The unionized types.
+ """
+ if not args:
+ return Any
+ first, *rest = args
+ if not rest:
+ return first
+ return Union[first, unionize(*rest)]
+
+
+def figure_out_type(value: Any) -> types.GenericType:
+ """Figure out the type of the value.
+
+ Args:
+ value: The value to figure out the type of.
+
+ Returns:
+ The type of the value.
+ """
+ if isinstance(value, list):
+ return List[unionize(*(figure_out_type(v) for v in value))]
+ if isinstance(value, set):
+ return Set[unionize(*(figure_out_type(v) for v in value))]
+ if isinstance(value, tuple):
+ return Tuple[unionize(*(figure_out_type(v) for v in value)), ...]
+ if isinstance(value, dict):
+ return Dict[
+ unionize(*(figure_out_type(k) for k in value)),
+ unionize(*(figure_out_type(v) for v in value.values())),
+ ]
+ if isinstance(value, Var):
+ return value._var_type
+ return type(value)
+
+
+class cached_property_no_lock(functools.cached_property):
+ """A special version of functools.cached_property that does not use a lock."""
+
+ def __init__(self, func):
+ """Initialize the cached_property_no_lock.
+
+ Args:
+ func: The function to cache.
+ """
+ super().__init__(func)
+ self.lock = contextlib.nullcontext()
+
+
+class CachedVarOperation:
+ """Base class for cached var operations to lower boilerplate code."""
+
+ def __post_init__(self):
+ """Post-initialize the CachedVarOperation."""
+ object.__delattr__(self, "_var_name")
+
+ def __getattr__(self, name: str) -> Any:
+ """Get an attribute of the var.
+
+ Args:
+ name: The name of the attribute.
+
+ Returns:
+ The attribute.
+ """
+ if name == "_var_name":
+ return self._cached_var_name
+
+ parent_classes = inspect.getmro(self.__class__)
+
+ return parent_classes[parent_classes.index(CachedVarOperation) + 1].__getattr__( # type: ignore
+ self, name
+ )
+
+ def _get_all_var_data(self) -> ImmutableVarData | None:
+ """Get all VarData associated with the Var.
+
+ Returns:
+ The VarData of the components and all of its children.
+ """
+ return self._cached_get_all_var_data
+
+ @cached_property_no_lock
+ def _cached_get_all_var_data(self) -> ImmutableVarData | None:
+ """Get the cached VarData.
+
+ Returns:
+ The cached VarData.
+ """
+ return ImmutableVarData.merge(
+ *map(
+ lambda value: (
+ value._get_all_var_data() if isinstance(value, Var) else None
+ ),
+ map(
+ lambda field: getattr(self, field.name),
+ dataclasses.fields(self), # type: ignore
+ ),
+ ),
+ self._var_data,
+ )
+
+ def __hash__(self) -> int:
+ """Calculate the hash of the object.
+
+ Returns:
+ The hash of the object.
+ """
+ return hash(
+ (
+ self.__class__.__name__,
+ *[
+ getattr(self, field.name)
+ for field in dataclasses.fields(self) # type: ignore
+ if field.name not in ["_var_name", "_var_data", "_var_type"]
+ ],
+ )
+ )
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class AndOperation(CachedVarOperation, ImmutableVar):
+ """Class for the logical AND operation."""
+
+ # The first var.
+ _var1: Var = dataclasses.field(default_factory=lambda: LiteralVar.create(None))
+
+ # The second var.
+ _var2: Var = dataclasses.field(default_factory=lambda: LiteralVar.create(None))
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """Get the cached var name.
+
+ Returns:
+ The cached var name.
+ """
+ return f"({str(self._var1)} && {str(self._var2)})"
+
+ def __hash__(self) -> int:
+ """Calculates the hash value of the object.
+
+ Returns:
+ int: The hash value of the object.
+ """
+ return hash((self.__class__.__name__, self._var1, self._var2))
+
+ @classmethod
+ def create(
+ cls, var1: Var | Any, var2: Var | Any, _var_data: VarData | None = None
+ ) -> AndOperation:
+ """Create an AndOperation.
+
+ Args:
+ var1: The first var.
+ var2: The second var.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The AndOperation.
+ """
+ var1, var2 = map(LiteralVar.create, (var1, var2))
+ return AndOperation(
+ _var_name="",
+ _var_type=unionize(var1._var_type, var2._var_type),
+ _var_data=ImmutableVarData.merge(_var_data),
+ _var1=var1,
+ _var2=var2,
+ )
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class OrOperation(CachedVarOperation, ImmutableVar):
+ """Class for the logical OR operation."""
+
+ # The first var.
+ _var1: Var = dataclasses.field(default_factory=lambda: LiteralVar.create(None))
+
+ # The second var.
+ _var2: Var = dataclasses.field(default_factory=lambda: LiteralVar.create(None))
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """Get the cached var name.
+
+ Returns:
+ The cached var name.
+ """
+ return f"({str(self._var1)} || {str(self._var2)})"
+
+ def __hash__(self) -> int:
+ """Calculates the hash value for the object.
+
+ Returns:
+ int: The hash value of the object.
+ """
+ return hash((self.__class__.__name__, self._var1, self._var2))
+
+ @classmethod
+ def create(
+ cls, var1: Var | Any, var2: Var | Any, _var_data: VarData | None = None
+ ) -> OrOperation:
+ """Create an OrOperation.
+
+ Args:
+ var1: The first var.
+ var2: The second var.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The OrOperation.
+ """
+ var1, var2 = map(LiteralVar.create, (var1, var2))
+ return OrOperation(
+ _var_name="",
+ _var_type=unionize(var1._var_type, var2._var_type),
+ _var_data=ImmutableVarData.merge(_var_data),
+ _var1=var1,
+ _var2=var2,
+ )
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class ImmutableCallableVar(ImmutableVar):
+ """Decorate a Var-returning function to act as both a Var and a function.
+
+ This is used as a compatibility shim for replacing Var objects in the
+ API with functions that return a family of Var.
+ """
+
+ fn: Callable[..., Var] = dataclasses.field(
+ default_factory=lambda: lambda: ImmutableVar(_var_name="undefined")
+ )
+ original_var: Var = dataclasses.field(
+ default_factory=lambda: ImmutableVar(_var_name="undefined")
+ )
+
+ def __init__(self, fn: Callable[..., Var]):
+ """Initialize a CallableVar.
+
+ Args:
+ fn: The function to decorate (must return Var)
+ """
+ original_var = fn()
+ super(ImmutableCallableVar, self).__init__(
+ _var_name=original_var._var_name,
+ _var_type=original_var._var_type,
+ _var_data=ImmutableVarData.merge(original_var._get_all_var_data()),
+ )
+ object.__setattr__(self, "fn", fn)
+ object.__setattr__(self, "original_var", original_var)
+
+ def __call__(self, *args, **kwargs) -> Var:
+ """Call the decorated function.
+
+ Args:
+ *args: The args to pass to the function.
+ **kwargs: The kwargs to pass to the function.
+
+ Returns:
+ The Var returned from calling the function.
+ """
+ return self.fn(*args, **kwargs)
+
+ def __hash__(self) -> int:
+ """Calculate the hash of the object.
+
+ Returns:
+ The hash of the object.
+ """
+ return hash((self.__class__.__name__, self.original_var))
+
+
+RETURN_TYPE = TypeVar("RETURN_TYPE")
+
+DICT_KEY = TypeVar("DICT_KEY")
+DICT_VAL = TypeVar("DICT_VAL")
+
+LIST_INSIDE = TypeVar("LIST_INSIDE")
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class ImmutableComputedVar(ImmutableVar[RETURN_TYPE]):
+ """A field with computed getters."""
+
+ # Whether to track dependencies and cache computed values
+ _cache: bool = dataclasses.field(default=False)
+
+ # Whether the computed var is a backend var
+ _backend: bool = dataclasses.field(default=False)
+
+ # The initial value of the computed var
+ _initial_value: RETURN_TYPE | types.Unset = dataclasses.field(default=types.Unset())
+
+ # Explicit var dependencies to track
+ _static_deps: set[str] = dataclasses.field(default_factory=set)
+
+ # Whether var dependencies should be auto-determined
+ _auto_deps: bool = dataclasses.field(default=True)
+
+ # Interval at which the computed var should be updated
+ _update_interval: Optional[datetime.timedelta] = dataclasses.field(default=None)
+
+ _fget: Callable[[BaseState], RETURN_TYPE] = dataclasses.field(
+ default_factory=lambda: lambda _: None
+ ) # type: ignore
+
+ def __init__(
+ self,
+ fget: Callable[[BASE_STATE], RETURN_TYPE],
+ initial_value: RETURN_TYPE | types.Unset = types.Unset(),
+ cache: bool = False,
+ deps: Optional[List[Union[str, Var]]] = None,
+ auto_deps: bool = True,
+ interval: Optional[Union[int, datetime.timedelta]] = None,
+ backend: bool | None = None,
+ **kwargs,
+ ):
+ """Initialize a ComputedVar.
+
+ Args:
+ fget: The getter function.
+ initial_value: The initial value of the computed var.
+ cache: Whether to cache the computed value.
+ deps: Explicit var dependencies to track.
+ auto_deps: Whether var dependencies should be auto-determined.
+ interval: Interval at which the computed var should be updated.
+ backend: Whether the computed var is a backend var.
+ **kwargs: additional attributes to set on the instance
+
+ Raises:
+ TypeError: If the computed var dependencies are not Var instances or var names.
+ """
+ hints = get_type_hints(fget)
+ hint = hints.get("return", Any)
+
+ kwargs["_var_name"] = kwargs.pop("_var_name", fget.__name__)
+ kwargs["_var_type"] = kwargs.pop("_var_type", hint)
+
+ super(ImmutableComputedVar, self).__init__(
+ _var_name=kwargs.pop("_var_name"),
+ _var_type=kwargs.pop("_var_type"),
+ _var_data=ImmutableVarData.merge(kwargs.pop("_var_data", None)),
+ )
+
+ if backend is None:
+ backend = fget.__name__.startswith("_")
+
+ object.__setattr__(self, "_backend", backend)
+ object.__setattr__(self, "_initial_value", initial_value)
+ object.__setattr__(self, "_cache", cache)
+
+ if isinstance(interval, int):
+ interval = datetime.timedelta(seconds=interval)
+
+ object.__setattr__(self, "_update_interval", interval)
+
+ if deps is None:
+ deps = []
+ else:
+ for dep in deps:
+ if isinstance(dep, Var):
+ continue
+ if isinstance(dep, str) and dep != "":
+ continue
+ raise TypeError(
+ "ComputedVar dependencies must be Var instances or var names (non-empty strings)."
+ )
+ object.__setattr__(
+ self,
+ "_static_deps",
+ {dep._var_name if isinstance(dep, Var) else dep for dep in deps},
+ )
+ object.__setattr__(self, "_auto_deps", auto_deps)
+
+ object.__setattr__(self, "_fget", fget)
+
+ @override
+ def _replace(self, merge_var_data=None, **kwargs: Any) -> ImmutableComputedVar:
+ """Replace the attributes of the ComputedVar.
+
+ Args:
+ merge_var_data: VarData to merge into the existing VarData.
+ **kwargs: Var fields to update.
+
+ Returns:
+ The new ComputedVar instance.
+
+ Raises:
+ TypeError: If kwargs contains keys that are not allowed.
+ """
+ field_values = dict(
+ fget=kwargs.pop("fget", self._fget),
+ initial_value=kwargs.pop("initial_value", self._initial_value),
+ cache=kwargs.pop("cache", self._cache),
+ deps=kwargs.pop("deps", self._static_deps),
+ auto_deps=kwargs.pop("auto_deps", self._auto_deps),
+ interval=kwargs.pop("interval", self._update_interval),
+ backend=kwargs.pop("backend", self._backend),
+ _var_name=kwargs.pop("_var_name", self._var_name),
+ _var_type=kwargs.pop("_var_type", self._var_type),
+ _var_data=kwargs.pop(
+ "_var_data", VarData.merge(self._var_data, merge_var_data)
+ ),
+ )
+
+ if kwargs:
+ unexpected_kwargs = ", ".join(kwargs.keys())
+ raise TypeError(f"Unexpected keyword arguments: {unexpected_kwargs}")
+
+ return ImmutableComputedVar(**field_values)
+
+ @property
+ def _cache_attr(self) -> str:
+ """Get the attribute used to cache the value on the instance.
+
+ Returns:
+ An attribute name.
+ """
+ return f"__cached_{self._var_name}"
+
+ @property
+ def _last_updated_attr(self) -> str:
+ """Get the attribute used to store the last updated timestamp.
+
+ Returns:
+ An attribute name.
+ """
+ return f"__last_updated_{self._var_name}"
+
+ def needs_update(self, instance: BaseState) -> bool:
+ """Check if the computed var needs to be updated.
+
+ Args:
+ instance: The state instance that the computed var is attached to.
+
+ Returns:
+ True if the computed var needs to be updated, False otherwise.
+ """
+ if self._update_interval is None:
+ return False
+ last_updated = getattr(instance, self._last_updated_attr, None)
+ if last_updated is None:
+ return True
+ return datetime.datetime.now() - last_updated > self._update_interval
+
+ @overload
+ def __get__(
+ self: ImmutableComputedVar[int] | ImmutableComputedVar[float],
+ instance: None,
+ owner: Type,
+ ) -> NumberVar: ...
+
+ @overload
+ def __get__(
+ self: ImmutableComputedVar[str],
+ instance: None,
+ owner: Type,
+ ) -> StringVar: ...
+
+ @overload
+ def __get__(
+ self: ImmutableComputedVar[dict[DICT_KEY, DICT_VAL]],
+ instance: None,
+ owner: Type,
+ ) -> ObjectVar[dict[DICT_KEY, DICT_VAL]]: ...
+
+ @overload
+ def __get__(
+ self: ImmutableComputedVar[list[LIST_INSIDE]],
+ instance: None,
+ owner: Type,
+ ) -> ArrayVar[list[LIST_INSIDE]]: ...
+
+ @overload
+ def __get__(
+ self: ImmutableComputedVar[set[LIST_INSIDE]],
+ instance: None,
+ owner: Type,
+ ) -> ArrayVar[set[LIST_INSIDE]]: ...
+
+ @overload
+ def __get__(
+ self: ImmutableComputedVar[tuple[LIST_INSIDE, ...]],
+ instance: None,
+ owner: Type,
+ ) -> ArrayVar[tuple[LIST_INSIDE, ...]]: ...
+
+ @overload
+ def __get__(
+ self, instance: None, owner: Type
+ ) -> ImmutableComputedVar[RETURN_TYPE]: ...
+
+ @overload
+ def __get__(self, instance: BaseState, owner: Type) -> RETURN_TYPE: ...
+
+ def __get__(self, instance: BaseState | None, owner):
+ """Get the ComputedVar value.
+
+ If the value is already cached on the instance, return the cached value.
+
+ Args:
+ instance: the instance of the class accessing this computed var.
+ owner: the class that this descriptor is attached to.
+
+ Returns:
+ The value of the var for the given instance.
+ """
+ if instance is None:
+ from reflex.state import BaseState
+
+ path_to_function = self.fget.__qualname__.split(".")
+ class_name_where_defined = (
+ path_to_function[-2] if len(path_to_function) > 1 else owner.__name__
+ )
+
+ def contains_class_name(states: Sequence[Type]) -> bool:
+ return any(c.__name__ == class_name_where_defined for c in states)
+
+ def is_not_mixin(state: Type[BaseState]) -> bool:
+ return not state._mixin
+
+ def length_of_state(state: Type[BaseState]) -> int:
+ return len(inspect.getmro(state))
+
+ class_where_defined = cast(
+ Type[BaseState],
+ min(
+ filter(
+ lambda state: state.__module__ == self.fget.__module__,
+ filter(
+ is_not_mixin,
+ filter(
+ lambda state: contains_class_name(
+ inspect.getmro(state)
+ ),
+ inspect.getmro(owner),
+ ),
+ ),
+ ),
+ default=owner,
+ key=length_of_state,
+ ),
+ )
+
+ return self._replace(
+ _var_name=format_state_name(class_where_defined.get_full_name())
+ + "."
+ + self._var_name,
+ merge_var_data=ImmutableVarData.from_state(class_where_defined),
+ ).guess_type()
+
+ if not self._cache:
+ return self.fget(instance)
+
+ # handle caching
+ if not hasattr(instance, self._cache_attr) or self.needs_update(instance):
+ # Set cache attr on state instance.
+ setattr(instance, self._cache_attr, self.fget(instance))
+ # Ensure the computed var gets serialized to redis.
+ instance._was_touched = True
+ # Set the last updated timestamp on the state instance.
+ setattr(instance, self._last_updated_attr, datetime.datetime.now())
+ return getattr(instance, self._cache_attr)
+
+ def _deps(
+ self,
+ objclass: Type,
+ obj: FunctionType | CodeType | None = None,
+ self_name: Optional[str] = None,
+ ) -> set[str]:
+ """Determine var dependencies of this ComputedVar.
+
+ Save references to attributes accessed on "self". Recursively called
+ when the function makes a method call on "self" or define comprehensions
+ or nested functions that may reference "self".
+
+ Args:
+ objclass: the class obj this ComputedVar is attached to.
+ obj: the object to disassemble (defaults to the fget function).
+ self_name: if specified, look for this name in LOAD_FAST and LOAD_DEREF instructions.
+
+ Returns:
+ A set of variable names accessed by the given obj.
+
+ Raises:
+ VarValueError: if the function references the get_state, parent_state, or substates attributes
+ (cannot track deps in a related state, only implicitly via parent state).
+ """
+ if not self._auto_deps:
+ return self._static_deps
+ d = self._static_deps.copy()
+ if obj is None:
+ fget = self._fget
+ if fget is not None:
+ obj = cast(FunctionType, fget)
+ else:
+ return set()
+ with contextlib.suppress(AttributeError):
+ # unbox functools.partial
+ obj = cast(FunctionType, obj.func) # type: ignore
+ with contextlib.suppress(AttributeError):
+ # unbox EventHandler
+ obj = cast(FunctionType, obj.fn) # type: ignore
+
+ if self_name is None and isinstance(obj, FunctionType):
+ try:
+ # the first argument to the function is the name of "self" arg
+ self_name = obj.__code__.co_varnames[0]
+ except (AttributeError, IndexError):
+ self_name = None
+ if self_name is None:
+ # cannot reference attributes on self if method takes no args
+ return set()
+
+ invalid_names = ["get_state", "parent_state", "substates", "get_substate"]
+ self_is_top_of_stack = False
+ for instruction in dis.get_instructions(obj):
+ if (
+ instruction.opname in ("LOAD_FAST", "LOAD_DEREF")
+ and instruction.argval == self_name
+ ):
+ # bytecode loaded the class instance to the top of stack, next load instruction
+ # is referencing an attribute on self
+ self_is_top_of_stack = True
+ continue
+ if self_is_top_of_stack and instruction.opname in (
+ "LOAD_ATTR",
+ "LOAD_METHOD",
+ ):
+ try:
+ ref_obj = getattr(objclass, instruction.argval)
+ except Exception:
+ ref_obj = None
+ if instruction.argval in invalid_names:
+ raise VarValueError(
+ f"Cached var {self._var_full_name} cannot access arbitrary state via `{instruction.argval}`."
+ )
+ if callable(ref_obj):
+ # recurse into callable attributes
+ d.update(
+ self._deps(
+ objclass=objclass,
+ obj=ref_obj,
+ )
+ )
+ # recurse into property fget functions
+ elif isinstance(ref_obj, property) and not isinstance(
+ ref_obj, ImmutableComputedVar
+ ):
+ d.update(
+ self._deps(
+ objclass=objclass,
+ obj=ref_obj.fget, # type: ignore
+ )
+ )
+ elif (
+ instruction.argval in objclass.backend_vars
+ or instruction.argval in objclass.vars
+ ):
+ # var access
+ d.add(instruction.argval)
+ elif instruction.opname == "LOAD_CONST" and isinstance(
+ instruction.argval, CodeType
+ ):
+ # recurse into nested functions / comprehensions, which can reference
+ # instance attributes from the outer scope
+ d.update(
+ self._deps(
+ objclass=objclass,
+ obj=instruction.argval,
+ self_name=self_name,
+ )
+ )
+ self_is_top_of_stack = False
+ return d
+
+ def mark_dirty(self, instance) -> None:
+ """Mark this ComputedVar as dirty.
+
+ Args:
+ instance: the state instance that needs to recompute the value.
+ """
+ with contextlib.suppress(AttributeError):
+ delattr(instance, self._cache_attr)
+
+ def _determine_var_type(self) -> Type:
+ """Get the type of the var.
+
+ Returns:
+ The type of the var.
+ """
+ hints = get_type_hints(self._fget)
+ if "return" in hints:
+ return hints["return"]
+ return Any
+
+ @property
+ def __class__(self) -> Type:
+ """Get the class of the var.
+
+ Returns:
+ The class of the var.
+ """
+ return ComputedVar
+
+ @property
+ def fget(self) -> Callable[[BaseState], RETURN_TYPE]:
+ """Get the getter function.
+
+ Returns:
+ The getter function.
+ """
+ return self._fget
+
+
+if TYPE_CHECKING:
+ BASE_STATE = TypeVar("BASE_STATE", bound=BaseState)
+
+
+@overload
+def immutable_computed_var(
+ fget: None = None,
+ initial_value: Any | types.Unset = types.Unset(),
+ cache: bool = False,
+ deps: Optional[List[Union[str, Var]]] = None,
+ auto_deps: bool = True,
+ interval: Optional[Union[datetime.timedelta, int]] = None,
+ backend: bool | None = None,
+ **kwargs,
+) -> Callable[
+ [Callable[[BASE_STATE], RETURN_TYPE]], ImmutableComputedVar[RETURN_TYPE]
+]: ...
+
+
+@overload
+def immutable_computed_var(
+ fget: Callable[[BASE_STATE], RETURN_TYPE],
+ initial_value: RETURN_TYPE | types.Unset = types.Unset(),
+ cache: bool = False,
+ deps: Optional[List[Union[str, Var]]] = None,
+ auto_deps: bool = True,
+ interval: Optional[Union[datetime.timedelta, int]] = None,
+ backend: bool | None = None,
+ **kwargs,
+) -> ImmutableComputedVar[RETURN_TYPE]: ...
+
+
+def immutable_computed_var(
+ fget: Callable[[BASE_STATE], Any] | None = None,
+ initial_value: Any | types.Unset = types.Unset(),
+ cache: bool = False,
+ deps: Optional[List[Union[str, Var]]] = None,
+ auto_deps: bool = True,
+ interval: Optional[Union[datetime.timedelta, int]] = None,
+ backend: bool | None = None,
+ **kwargs,
+) -> (
+ ImmutableComputedVar | Callable[[Callable[[BASE_STATE], Any]], ImmutableComputedVar]
+):
+ """A ComputedVar decorator with or without kwargs.
+
+ Args:
+ fget: The getter function.
+ initial_value: The initial value of the computed var.
+ cache: Whether to cache the computed value.
+ deps: Explicit var dependencies to track.
+ auto_deps: Whether var dependencies should be auto-determined.
+ interval: Interval at which the computed var should be updated.
+ backend: Whether the computed var is a backend var.
+ **kwargs: additional attributes to set on the instance
+
+ Returns:
+ A ComputedVar instance.
+
+ Raises:
+ ValueError: If caching is disabled and an update interval is set.
+ VarDependencyError: If user supplies dependencies without caching.
+ """
+ if cache is False and interval is not None:
+ raise ValueError("Cannot set update interval without caching.")
+
+ if cache is False and (deps is not None or auto_deps is False):
+ raise VarDependencyError("Cannot track dependencies without caching.")
+
+ if fget is not None:
+ return ImmutableComputedVar(fget, cache=cache)
+
+ def wrapper(fget: Callable[[BASE_STATE], Any]) -> ImmutableComputedVar:
+ return ImmutableComputedVar(
+ fget,
+ initial_value=initial_value,
+ cache=cache,
+ deps=deps,
+ auto_deps=auto_deps,
+ interval=interval,
+ backend=backend,
+ **kwargs,
+ )
+
+ return wrapper
diff --git a/reflex/ivars/function.py b/reflex/ivars/function.py
new file mode 100644
index 00000000000..1a987b1cfdc
--- /dev/null
+++ b/reflex/ivars/function.py
@@ -0,0 +1,223 @@
+"""Immutable function vars."""
+
+from __future__ import annotations
+
+import dataclasses
+import sys
+from typing import Any, Callable, Optional, Tuple, Type, Union
+
+from reflex.utils.types import GenericType
+from reflex.vars import ImmutableVarData, Var, VarData
+
+from .base import CachedVarOperation, ImmutableVar, LiteralVar, cached_property_no_lock
+
+
+class FunctionVar(ImmutableVar[Callable]):
+ """Base class for immutable function vars."""
+
+ def __call__(self, *args: Var | Any) -> ArgsFunctionOperation:
+ """Call the function with the given arguments.
+
+ Args:
+ *args: The arguments to call the function with.
+
+ Returns:
+ The function call operation.
+ """
+ return ArgsFunctionOperation.create(
+ ("...args",),
+ VarOperationCall.create(self, *args, ImmutableVar.create_safe("...args")),
+ )
+
+ def call(self, *args: Var | Any) -> VarOperationCall:
+ """Call the function with the given arguments.
+
+ Args:
+ *args: The arguments to call the function with.
+
+ Returns:
+ The function call operation.
+ """
+ return VarOperationCall.create(self, *args)
+
+
+class FunctionStringVar(FunctionVar):
+ """Base class for immutable function vars from a string."""
+
+ @classmethod
+ def create(
+ cls,
+ func: str,
+ _var_type: Type[Callable] = Callable,
+ _var_data: VarData | None = None,
+ ) -> FunctionStringVar:
+ """Create a new function var from a string.
+
+ Args:
+ func: The function to call.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The function var.
+ """
+ return cls(
+ _var_name=func,
+ _var_type=_var_type,
+ _var_data=ImmutableVarData.merge(_var_data),
+ )
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class VarOperationCall(CachedVarOperation, ImmutableVar):
+ """Base class for immutable vars that are the result of a function call."""
+
+ _func: Optional[FunctionVar] = dataclasses.field(default=None)
+ _args: Tuple[Union[Var, Any], ...] = dataclasses.field(default_factory=tuple)
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"({str(self._func)}({', '.join([str(LiteralVar.create(arg)) for arg in self._args])}))"
+
+ @cached_property_no_lock
+ def _cached_get_all_var_data(self) -> ImmutableVarData | None:
+ """Get all the var data associated with the var.
+
+ Returns:
+ All the var data associated with the var.
+ """
+ return ImmutableVarData.merge(
+ self._func._get_all_var_data() if self._func is not None else None,
+ *[LiteralVar.create(arg)._get_all_var_data() for arg in self._args],
+ self._var_data,
+ )
+
+ @classmethod
+ def create(
+ cls,
+ func: FunctionVar,
+ *args: Var | Any,
+ _var_type: GenericType = Any,
+ _var_data: VarData | None = None,
+ ) -> VarOperationCall:
+ """Create a new function call var.
+
+ Args:
+ func: The function to call.
+ *args: The arguments to call the function with.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The function call var.
+ """
+ return cls(
+ _var_name="",
+ _var_type=_var_type,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _func=func,
+ _args=args,
+ )
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class ArgsFunctionOperation(CachedVarOperation, FunctionVar):
+ """Base class for immutable function defined via arguments and return expression."""
+
+ _args_names: Tuple[str, ...] = dataclasses.field(default_factory=tuple)
+ _return_expr: Union[Var, Any] = dataclasses.field(default=None)
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"(({', '.join(self._args_names)}) => ({str(LiteralVar.create(self._return_expr))}))"
+
+ @classmethod
+ def create(
+ cls,
+ args_names: Tuple[str, ...],
+ return_expr: Var | Any,
+ _var_type: GenericType = Callable,
+ _var_data: VarData | None = None,
+ ) -> ArgsFunctionOperation:
+ """Create a new function var.
+
+ Args:
+ args_names: The names of the arguments.
+ return_expr: The return expression of the function.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The function var.
+ """
+ return cls(
+ _var_name="",
+ _var_type=_var_type,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _args_names=args_names,
+ _return_expr=return_expr,
+ )
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class ToFunctionOperation(CachedVarOperation, FunctionVar):
+ """Base class of converting a var to a function."""
+
+ _original_var: Var = dataclasses.field(
+ default_factory=lambda: LiteralVar.create(None)
+ )
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return str(self._original_var)
+
+ @classmethod
+ def create(
+ cls,
+ original_var: Var,
+ _var_type: GenericType = Callable,
+ _var_data: VarData | None = None,
+ ) -> ToFunctionOperation:
+ """Create a new function var.
+
+ Args:
+ original_var: The original var to convert to a function.
+ _var_type: The type of the function.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The function var.
+ """
+ return cls(
+ _var_name="",
+ _var_type=_var_type,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _original_var=original_var,
+ )
+
+
+JSON_STRINGIFY = FunctionStringVar.create("JSON.stringify")
diff --git a/reflex/ivars/number.py b/reflex/ivars/number.py
new file mode 100644
index 00000000000..241a1b59537
--- /dev/null
+++ b/reflex/ivars/number.py
@@ -0,0 +1,1203 @@
+"""Immutable number vars."""
+
+from __future__ import annotations
+
+import dataclasses
+import json
+import sys
+from typing import Any, Union
+
+from reflex.vars import ImmutableVarData, Var, VarData
+
+from .base import (
+ CachedVarOperation,
+ ImmutableVar,
+ LiteralVar,
+ cached_property_no_lock,
+ unionize,
+)
+
+
+class NumberVar(ImmutableVar[Union[int, float]]):
+ """Base class for immutable number vars."""
+
+ def __add__(self, other: number_types | boolean_types) -> NumberAddOperation:
+ """Add two numbers.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The number addition operation.
+ """
+ return NumberAddOperation.create(self, +other)
+
+ def __radd__(self, other: number_types | boolean_types) -> NumberAddOperation:
+ """Add two numbers.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The number addition operation.
+ """
+ return NumberAddOperation.create(+other, self)
+
+ def __sub__(self, other: number_types | boolean_types) -> NumberSubtractOperation:
+ """Subtract two numbers.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The number subtraction operation.
+ """
+ return NumberSubtractOperation.create(self, +other)
+
+ def __rsub__(self, other: number_types | boolean_types) -> NumberSubtractOperation:
+ """Subtract two numbers.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The number subtraction operation.
+ """
+ return NumberSubtractOperation.create(+other, self)
+
+ def __abs__(self) -> NumberAbsoluteOperation:
+ """Get the absolute value of the number.
+
+ Returns:
+ The number absolute operation.
+ """
+ return NumberAbsoluteOperation.create(self)
+
+ def __mul__(self, other: number_types | boolean_types) -> NumberMultiplyOperation:
+ """Multiply two numbers.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The number multiplication operation.
+ """
+ return NumberMultiplyOperation.create(self, +other)
+
+ def __rmul__(self, other: number_types | boolean_types) -> NumberMultiplyOperation:
+ """Multiply two numbers.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The number multiplication operation.
+ """
+ return NumberMultiplyOperation.create(+other, self)
+
+ def __truediv__(self, other: number_types | boolean_types) -> NumberTrueDivision:
+ """Divide two numbers.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The number true division operation.
+ """
+ return NumberTrueDivision.create(self, +other)
+
+ def __rtruediv__(self, other: number_types | boolean_types) -> NumberTrueDivision:
+ """Divide two numbers.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The number true division operation.
+ """
+ return NumberTrueDivision.create(+other, self)
+
+ def __floordiv__(self, other: number_types | boolean_types) -> NumberFloorDivision:
+ """Floor divide two numbers.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The number floor division operation.
+ """
+ return NumberFloorDivision.create(self, +other)
+
+ def __rfloordiv__(self, other: number_types | boolean_types) -> NumberFloorDivision:
+ """Floor divide two numbers.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The number floor division operation.
+ """
+ return NumberFloorDivision.create(+other, self)
+
+ def __mod__(self, other: number_types | boolean_types) -> NumberModuloOperation:
+ """Modulo two numbers.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The number modulo operation.
+ """
+ return NumberModuloOperation.create(self, +other)
+
+ def __rmod__(self, other: number_types | boolean_types) -> NumberModuloOperation:
+ """Modulo two numbers.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The number modulo operation.
+ """
+ return NumberModuloOperation.create(+other, self)
+
+ def __pow__(self, other: number_types | boolean_types) -> NumberExponentOperation:
+ """Exponentiate two numbers.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The number exponent operation.
+ """
+ return NumberExponentOperation.create(self, +other)
+
+ def __rpow__(self, other: number_types | boolean_types) -> NumberExponentOperation:
+ """Exponentiate two numbers.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The number exponent operation.
+ """
+ return NumberExponentOperation.create(+other, self)
+
+ def __neg__(self) -> NumberNegateOperation:
+ """Negate the number.
+
+ Returns:
+ The number negation operation.
+ """
+ return NumberNegateOperation.create(self)
+
+ def __invert__(self) -> BooleanNotOperation:
+ """Boolean NOT the number.
+
+ Returns:
+ The boolean NOT operation.
+ """
+ return BooleanNotOperation.create(self.bool())
+
+ def __pos__(self) -> NumberVar:
+ """Positive the number.
+
+ Returns:
+ The number.
+ """
+ return self
+
+ def __round__(self) -> NumberRoundOperation:
+ """Round the number.
+
+ Returns:
+ The number round operation.
+ """
+ return NumberRoundOperation.create(self)
+
+ def __ceil__(self) -> NumberCeilOperation:
+ """Ceil the number.
+
+ Returns:
+ The number ceil operation.
+ """
+ return NumberCeilOperation.create(self)
+
+ def __floor__(self) -> NumberFloorOperation:
+ """Floor the number.
+
+ Returns:
+ The number floor operation.
+ """
+ return NumberFloorOperation.create(self)
+
+ def __trunc__(self) -> NumberTruncOperation:
+ """Trunc the number.
+
+ Returns:
+ The number trunc operation.
+ """
+ return NumberTruncOperation.create(self)
+
+ def __lt__(self, other: Any) -> LessThanOperation:
+ """Less than comparison.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The result of the comparison.
+ """
+ if isinstance(other, (NumberVar, BooleanVar, int, float, bool)):
+ return LessThanOperation.create(self, +other)
+ return LessThanOperation.create(self, other)
+
+ def __le__(self, other: Any) -> LessThanOrEqualOperation:
+ """Less than or equal comparison.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The result of the comparison.
+ """
+ if isinstance(other, (NumberVar, BooleanVar, int, float, bool)):
+ return LessThanOrEqualOperation.create(self, +other)
+ return LessThanOrEqualOperation.create(self, other)
+
+ def __eq__(self, other: Any) -> EqualOperation:
+ """Equal comparison.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The result of the comparison.
+ """
+ if isinstance(other, (NumberVar, BooleanVar, int, float, bool)):
+ return EqualOperation.create(self, +other)
+ return EqualOperation.create(self, other)
+
+ def __ne__(self, other: Any) -> NotEqualOperation:
+ """Not equal comparison.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The result of the comparison.
+ """
+ if isinstance(other, (NumberVar, BooleanVar, int, float, bool)):
+ return NotEqualOperation.create(self, +other)
+ return NotEqualOperation.create(self, other)
+
+ def __gt__(self, other: Any) -> GreaterThanOperation:
+ """Greater than comparison.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The result of the comparison.
+ """
+ if isinstance(other, (NumberVar, BooleanVar, int, float, bool)):
+ return GreaterThanOperation.create(self, +other)
+ return GreaterThanOperation.create(self, other)
+
+ def __ge__(self, other: Any) -> GreaterThanOrEqualOperation:
+ """Greater than or equal comparison.
+
+ Args:
+ other: The other number.
+
+ Returns:
+ The result of the comparison.
+ """
+ if isinstance(other, (NumberVar, BooleanVar, int, float, bool)):
+ return GreaterThanOrEqualOperation.create(self, +other)
+ return GreaterThanOrEqualOperation.create(self, other)
+
+ def bool(self) -> NotEqualOperation:
+ """Boolean conversion.
+
+ Returns:
+ The boolean value of the number.
+ """
+ return NotEqualOperation.create(self, 0)
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class BinaryNumberOperation(CachedVarOperation, NumberVar):
+ """Base class for immutable number vars that are the result of a binary operation."""
+
+ _lhs: NumberVar = dataclasses.field(
+ default_factory=lambda: LiteralNumberVar.create(0)
+ )
+ _rhs: NumberVar = dataclasses.field(
+ default_factory=lambda: LiteralNumberVar.create(0)
+ )
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Raises:
+ NotImplementedError: Must be implemented by subclasses
+ """
+ raise NotImplementedError(
+ "BinaryNumberOperation must implement _cached_var_name"
+ )
+
+ @classmethod
+ def create(
+ cls, lhs: number_types, rhs: number_types, _var_data: VarData | None = None
+ ):
+ """Create the binary number operation var.
+
+ Args:
+ lhs: The first number.
+ rhs: The second number.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The binary number operation var.
+ """
+ _lhs, _rhs = map(
+ lambda v: LiteralNumberVar.create(v) if not isinstance(v, NumberVar) else v,
+ (lhs, rhs),
+ )
+ return cls(
+ _var_name="",
+ _var_type=unionize(_lhs._var_type, _rhs._var_type),
+ _var_data=ImmutableVarData.merge(_var_data),
+ _lhs=_lhs,
+ _rhs=_rhs,
+ )
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class UnaryNumberOperation(CachedVarOperation, NumberVar):
+ """Base class for immutable number vars that are the result of a unary operation."""
+
+ _value: NumberVar = dataclasses.field(
+ default_factory=lambda: LiteralNumberVar.create(0)
+ )
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Raises:
+ NotImplementedError: Must be implemented by subclasses.
+ """
+ raise NotImplementedError(
+ "UnaryNumberOperation must implement _cached_var_name"
+ )
+
+ @classmethod
+ def create(cls, value: NumberVar, _var_data: VarData | None = None):
+ """Create the unary number operation var.
+
+ Args:
+ value: The number.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The unary number operation var.
+ """
+ return cls(
+ _var_name="",
+ _var_type=value._var_type,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _value=value,
+ )
+
+
+class NumberAddOperation(BinaryNumberOperation):
+ """Base class for immutable number vars that are the result of an addition operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"({str(self._lhs)} + {str(self._rhs)})"
+
+
+class NumberSubtractOperation(BinaryNumberOperation):
+ """Base class for immutable number vars that are the result of a subtraction operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"({str(self._lhs)} - {str(self._rhs)})"
+
+
+class NumberAbsoluteOperation(UnaryNumberOperation):
+ """Base class for immutable number vars that are the result of an absolute operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"Math.abs({str(self._value)})"
+
+
+class NumberMultiplyOperation(BinaryNumberOperation):
+ """Base class for immutable number vars that are the result of a multiplication operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"({str(self._lhs)} * {str(self._rhs)})"
+
+
+class NumberNegateOperation(UnaryNumberOperation):
+ """Base class for immutable number vars that are the result of a negation operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"-({str(self._value)})"
+
+
+class NumberTrueDivision(BinaryNumberOperation):
+ """Base class for immutable number vars that are the result of a true division operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"({str(self._lhs)} / {str(self._rhs)})"
+
+
+class NumberFloorDivision(BinaryNumberOperation):
+ """Base class for immutable number vars that are the result of a floor division operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"Math.floor({str(self._lhs)} / {str(self._rhs)})"
+
+
+class NumberModuloOperation(BinaryNumberOperation):
+ """Base class for immutable number vars that are the result of a modulo operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"({str(self._lhs)} % {str(self._rhs)})"
+
+
+class NumberExponentOperation(BinaryNumberOperation):
+ """Base class for immutable number vars that are the result of an exponent operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"({str(self._lhs)} ** {str(self._rhs)})"
+
+
+class NumberRoundOperation(UnaryNumberOperation):
+ """Base class for immutable number vars that are the result of a round operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"Math.round({str(self._value)})"
+
+
+class NumberCeilOperation(UnaryNumberOperation):
+ """Base class for immutable number vars that are the result of a ceil operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"Math.ceil({str(self._value)})"
+
+
+class NumberFloorOperation(UnaryNumberOperation):
+ """Base class for immutable number vars that are the result of a floor operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"Math.floor({str(self._value)})"
+
+
+class NumberTruncOperation(UnaryNumberOperation):
+ """Base class for immutable number vars that are the result of a trunc operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"Math.trunc({str(self._value)})"
+
+
+class BooleanVar(ImmutableVar[bool]):
+ """Base class for immutable boolean vars."""
+
+ def __invert__(self) -> BooleanNotOperation:
+ """NOT the boolean.
+
+ Returns:
+ The boolean NOT operation.
+ """
+ return BooleanNotOperation.create(self)
+
+ def __int__(self) -> BooleanToIntOperation:
+ """Convert the boolean to an int.
+
+ Returns:
+ The boolean to int operation.
+ """
+ return BooleanToIntOperation.create(self)
+
+ def __pos__(self) -> BooleanToIntOperation:
+ """Convert the boolean to an int.
+
+ Returns:
+ The boolean to int operation.
+ """
+ return BooleanToIntOperation.create(self)
+
+ def bool(self) -> BooleanVar:
+ """Boolean conversion.
+
+ Returns:
+ The boolean value of the boolean.
+ """
+ return self
+
+ def __lt__(self, other: boolean_types | number_types) -> LessThanOperation:
+ """Less than comparison.
+
+ Args:
+ other: The other boolean.
+
+ Returns:
+ The result of the comparison.
+ """
+ return LessThanOperation.create(+self, +other)
+
+ def __le__(self, other: boolean_types | number_types) -> LessThanOrEqualOperation:
+ """Less than or equal comparison.
+
+ Args:
+ other: The other boolean.
+
+ Returns:
+ The result of the comparison.
+ """
+ return LessThanOrEqualOperation.create(+self, +other)
+
+ def __eq__(self, other: boolean_types | number_types) -> EqualOperation:
+ """Equal comparison.
+
+ Args:
+ other: The other boolean.
+
+ Returns:
+ The result of the comparison.
+ """
+ return EqualOperation.create(+self, +other)
+
+ def __ne__(self, other: boolean_types | number_types) -> NotEqualOperation:
+ """Not equal comparison.
+
+ Args:
+ other: The other boolean.
+
+ Returns:
+ The result of the comparison.
+ """
+ return NotEqualOperation.create(+self, +other)
+
+ def __gt__(self, other: boolean_types | number_types) -> GreaterThanOperation:
+ """Greater than comparison.
+
+ Args:
+ other: The other boolean.
+
+ Returns:
+ The result of the comparison.
+ """
+ return GreaterThanOperation.create(+self, +other)
+
+ def __ge__(
+ self, other: boolean_types | number_types
+ ) -> GreaterThanOrEqualOperation:
+ """Greater than or equal comparison.
+
+ Args:
+ other: The other boolean.
+
+ Returns:
+ The result of the comparison.
+ """
+ return GreaterThanOrEqualOperation.create(+self, +other)
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class BooleanToIntOperation(CachedVarOperation, NumberVar):
+ """Base class for immutable number vars that are the result of a boolean to int operation."""
+
+ _value: BooleanVar = dataclasses.field(
+ default_factory=lambda: LiteralBooleanVar.create(False)
+ )
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"({str(self._value)} ? 1 : 0)"
+
+ @classmethod
+ def create(cls, value: BooleanVar, _var_data: VarData | None = None):
+ """Create the boolean to int operation var.
+
+ Args:
+ value: The boolean.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The boolean to int operation var.
+ """
+ return cls(
+ _var_name="",
+ _var_type=int,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _value=value,
+ )
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class ComparisonOperation(CachedVarOperation, BooleanVar):
+ """Base class for immutable boolean vars that are the result of a comparison operation."""
+
+ _lhs: Var = dataclasses.field(
+ default_factory=lambda: LiteralBooleanVar.create(False)
+ )
+ _rhs: Var = dataclasses.field(
+ default_factory=lambda: LiteralBooleanVar.create(False)
+ )
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Raises:
+ NotImplementedError: Must be implemented by subclasses.
+ """
+ raise NotImplementedError("ComparisonOperation must implement _cached_var_name")
+
+ @classmethod
+ def create(cls, lhs: Var | Any, rhs: Var | Any, _var_data: VarData | None = None):
+ """Create the comparison operation var.
+
+ Args:
+ lhs: The first value.
+ rhs: The second value.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The comparison operation var.
+ """
+ lhs, rhs = map(LiteralVar.create, (lhs, rhs))
+ return cls(
+ _var_name="",
+ _var_type=bool,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _lhs=lhs,
+ _rhs=rhs,
+ )
+
+
+class GreaterThanOperation(ComparisonOperation):
+ """Base class for immutable boolean vars that are the result of a greater than operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"({str(self._lhs)} > {str(self._rhs)})"
+
+
+class GreaterThanOrEqualOperation(ComparisonOperation):
+ """Base class for immutable boolean vars that are the result of a greater than or equal operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"({str(self._lhs)} >= {str(self._rhs)})"
+
+
+class LessThanOperation(ComparisonOperation):
+ """Base class for immutable boolean vars that are the result of a less than operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"({str(self._lhs)} < {str(self._rhs)})"
+
+
+class LessThanOrEqualOperation(ComparisonOperation):
+ """Base class for immutable boolean vars that are the result of a less than or equal operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"({str(self._lhs)} <= {str(self._rhs)})"
+
+
+class EqualOperation(ComparisonOperation):
+ """Base class for immutable boolean vars that are the result of an equal operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"({str(self._lhs)} === {str(self._rhs)})"
+
+
+class NotEqualOperation(ComparisonOperation):
+ """Base class for immutable boolean vars that are the result of a not equal operation."""
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"({str(self._lhs)} !== {str(self._rhs)})"
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class LogicalOperation(CachedVarOperation, BooleanVar):
+ """Base class for immutable boolean vars that are the result of a logical operation."""
+
+ _lhs: BooleanVar = dataclasses.field(
+ default_factory=lambda: LiteralBooleanVar.create(False)
+ )
+ _rhs: BooleanVar = dataclasses.field(
+ default_factory=lambda: LiteralBooleanVar.create(False)
+ )
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Raises:
+ NotImplementedError: Must be implemented by subclasses.
+ """
+ raise NotImplementedError("LogicalOperation must implement _cached_var_name")
+
+ @classmethod
+ def create(
+ cls, lhs: boolean_types, rhs: boolean_types, _var_data: VarData | None = None
+ ):
+ """Create the logical operation var.
+
+ Args:
+ lhs: The first boolean.
+ rhs: The second boolean.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The logical operation var.
+ """
+ lhs, rhs = map(
+ lambda v: (
+ LiteralBooleanVar.create(v) if not isinstance(v, BooleanVar) else v
+ ),
+ (lhs, rhs),
+ )
+ return cls(
+ _var_name="",
+ _var_type=bool,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _lhs=lhs,
+ _rhs=rhs,
+ )
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class BooleanNotOperation(CachedVarOperation, BooleanVar):
+ """Base class for immutable boolean vars that are the result of a logical NOT operation."""
+
+ _value: BooleanVar = dataclasses.field(
+ default_factory=lambda: LiteralBooleanVar.create(False)
+ )
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"!({str(self._value)})"
+
+ @classmethod
+ def create(cls, value: boolean_types, _var_data: VarData | None = None):
+ """Create the logical NOT operation var.
+
+ Args:
+ value: The value.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The logical NOT operation var.
+ """
+ value = value if isinstance(value, Var) else LiteralBooleanVar.create(value)
+ return cls(
+ _var_name="",
+ _var_type=bool,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _value=value,
+ )
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class LiteralBooleanVar(LiteralVar, BooleanVar):
+ """Base class for immutable literal boolean vars."""
+
+ _var_value: bool = dataclasses.field(default=False)
+
+ def json(self) -> str:
+ """Get the JSON representation of the var.
+
+ Returns:
+ The JSON representation of the var.
+ """
+ return "true" if self._var_value else "false"
+
+ def __hash__(self) -> int:
+ """Calculate the hash value of the object.
+
+ Returns:
+ int: The hash value of the object.
+ """
+ return hash((self.__class__.__name__, self._var_value))
+
+ @classmethod
+ def create(cls, value: bool, _var_data: VarData | None = None):
+ """Create the boolean var.
+
+ Args:
+ value: The value of the var.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The boolean var.
+ """
+ return cls(
+ _var_name="true" if value else "false",
+ _var_type=bool,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _var_value=value,
+ )
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class LiteralNumberVar(LiteralVar, NumberVar):
+ """Base class for immutable literal number vars."""
+
+ _var_value: float | int = dataclasses.field(default=0)
+
+ def json(self) -> str:
+ """Get the JSON representation of the var.
+
+ Returns:
+ The JSON representation of the var.
+ """
+ return json.dumps(self._var_value)
+
+ def __hash__(self) -> int:
+ """Calculate the hash value of the object.
+
+ Returns:
+ int: The hash value of the object.
+ """
+ return hash((self.__class__.__name__, self._var_value))
+
+ @classmethod
+ def create(cls, value: float | int, _var_data: VarData | None = None):
+ """Create the number var.
+
+ Args:
+ value: The value of the var.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The number var.
+ """
+ return cls(
+ _var_name=str(value),
+ _var_type=type(value),
+ _var_data=ImmutableVarData.merge(_var_data),
+ _var_value=value,
+ )
+
+
+number_types = Union[NumberVar, int, float]
+boolean_types = Union[BooleanVar, bool]
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class ToNumberVarOperation(CachedVarOperation, NumberVar):
+ """Base class for immutable number vars that are the result of a number operation."""
+
+ _original_value: Var = dataclasses.field(
+ default_factory=lambda: LiteralNumberVar.create(0)
+ )
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return str(self._original_value)
+
+ @classmethod
+ def create(
+ cls,
+ value: Var,
+ _var_type: type[int] | type[float] = float,
+ _var_data: VarData | None = None,
+ ):
+ """Create the number var.
+
+ Args:
+ value: The value of the var.
+ _var_type: The type of the Var.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The number var.
+ """
+ return cls(
+ _var_name="",
+ _var_type=_var_type,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _original_value=value,
+ )
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class ToBooleanVarOperation(CachedVarOperation, BooleanVar):
+ """Base class for immutable boolean vars that are the result of a boolean operation."""
+
+ _original_value: Var = dataclasses.field(
+ default_factory=lambda: LiteralBooleanVar.create(False)
+ )
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"Boolean({str(self._original_value)})"
+
+ @classmethod
+ def create(
+ cls,
+ value: Var,
+ _var_data: VarData | None = None,
+ ):
+ """Create the boolean var.
+
+ Args:
+ value: The value of the var.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The boolean var.
+ """
+ return cls(
+ _var_name="",
+ _var_type=bool,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _original_value=value,
+ )
+
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class TernaryOperator(CachedVarOperation, ImmutableVar):
+ """Base class for immutable vars that are the result of a ternary operation."""
+
+ _condition: BooleanVar = dataclasses.field(
+ default_factory=lambda: LiteralBooleanVar.create(False)
+ )
+ _if_true: Var = dataclasses.field(
+ default_factory=lambda: LiteralNumberVar.create(0)
+ )
+ _if_false: Var = dataclasses.field(
+ default_factory=lambda: LiteralNumberVar.create(0)
+ )
+
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return (
+ f"({str(self._condition)} ? {str(self._if_true)} : {str(self._if_false)})"
+ )
+
+ @classmethod
+ def create(
+ cls,
+ condition: boolean_types,
+ if_true: Var | Any,
+ if_false: Var | Any,
+ _var_data: VarData | None = None,
+ ):
+ """Create the ternary operation var.
+
+ Args:
+ condition: The condition.
+ if_true: The value if the condition is true.
+ if_false: The value if the condition is false.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The ternary operation var.
+ """
+ condition = (
+ condition
+ if isinstance(condition, Var)
+ else LiteralBooleanVar.create(condition)
+ )
+ _if_true, _if_false = map(
+ lambda v: (LiteralVar.create(v) if not isinstance(v, Var) else v),
+ (if_true, if_false),
+ )
+ return TernaryOperator(
+ _var_name="",
+ _var_type=unionize(_if_true._var_type, _if_false._var_type),
+ _var_data=ImmutableVarData.merge(_var_data),
+ _condition=condition,
+ _if_true=_if_true,
+ _if_false=_if_false,
+ )
diff --git a/reflex/experimental/vars/object.py b/reflex/ivars/object.py
similarity index 55%
rename from reflex/experimental/vars/object.py
rename to reflex/ivars/object.py
index a227f0d7cb5..4586ffa0a65 100644
--- a/reflex/experimental/vars/object.py
+++ b/reflex/ivars/object.py
@@ -5,7 +5,6 @@
import dataclasses
import sys
import typing
-from functools import cached_property
from inspect import isclass
from typing import (
Any,
@@ -22,18 +21,22 @@
from typing_extensions import get_origin
-from reflex.experimental.vars.base import (
+from reflex.utils import types
+from reflex.utils.exceptions import VarAttributeError
+from reflex.utils.types import GenericType, get_attribute_access_type
+from reflex.vars import ImmutableVarData, Var, VarData
+
+from .base import (
+ CachedVarOperation,
ImmutableVar,
LiteralVar,
+ cached_property_no_lock,
figure_out_type,
)
-from reflex.experimental.vars.number import NumberVar
-from reflex.experimental.vars.sequence import ArrayVar, StringVar
-from reflex.utils.exceptions import VarAttributeError
-from reflex.utils.types import GenericType, get_attribute_access_type
-from reflex.vars import ImmutableVarData, Var, VarData
+from .number import BooleanVar, NumberVar
+from .sequence import ArrayVar, StringVar
-OBJECT_TYPE = TypeVar("OBJECT_TYPE")
+OBJECT_TYPE = TypeVar("OBJECT_TYPE", bound=Dict)
KEY_TYPE = TypeVar("KEY_TYPE")
VALUE_TYPE = TypeVar("VALUE_TYPE")
@@ -46,23 +49,13 @@
class ObjectVar(ImmutableVar[OBJECT_TYPE]):
"""Base class for immutable object vars."""
- @overload
- def _key_type(self: ObjectVar[Dict[KEY_TYPE, VALUE_TYPE]]) -> KEY_TYPE: ...
-
- @overload
- def _key_type(self) -> Type: ...
-
def _key_type(self) -> Type:
"""Get the type of the keys of the object.
Returns:
The type of the keys of the object.
"""
- fixed_type = (
- self._var_type if isclass(self._var_type) else get_origin(self._var_type)
- )
- args = get_args(self._var_type) if issubclass(fixed_type, dict) else ()
- return args[0] if args else Any
+ return str
@overload
def _value_type(self: ObjectVar[Dict[KEY_TYPE, VALUE_TYPE]]) -> VALUE_TYPE: ...
@@ -76,27 +69,19 @@ def _value_type(self) -> Type:
Returns:
The type of the values of the object.
"""
- fixed_type = (
- self._var_type if isclass(self._var_type) else get_origin(self._var_type)
- )
+ fixed_type = get_origin(self._var_type) or self._var_type
+ if not isclass(fixed_type):
+ return Any
args = get_args(self._var_type) if issubclass(fixed_type, dict) else ()
return args[1] if args else Any
- @overload
- def keys(
- self: ObjectVar[Dict[KEY_TYPE, VALUE_TYPE]],
- ) -> ArrayVar[List[KEY_TYPE]]: ...
-
- @overload
- def keys(self) -> ArrayVar: ...
-
- def keys(self) -> ArrayVar:
+ def keys(self) -> ArrayVar[List[str]]:
"""Get the keys of the object.
Returns:
The keys of the object.
"""
- return ObjectKeysOperation(self)
+ return ObjectKeysOperation.create(self)
@overload
def values(
@@ -112,12 +97,12 @@ def values(self) -> ArrayVar:
Returns:
The values of the object.
"""
- return ObjectValuesOperation(self)
+ return ObjectValuesOperation.create(self)
@overload
def entries(
self: ObjectVar[Dict[KEY_TYPE, VALUE_TYPE]],
- ) -> ArrayVar[List[Tuple[KEY_TYPE, VALUE_TYPE]]]: ...
+ ) -> ArrayVar[List[Tuple[str, VALUE_TYPE]]]: ...
@overload
def entries(self) -> ArrayVar: ...
@@ -128,7 +113,7 @@ def entries(self) -> ArrayVar:
Returns:
The entries of the object.
"""
- return ObjectEntriesOperation(self)
+ return ObjectEntriesOperation.create(self)
def merge(self, other: ObjectVar) -> ObjectMergeOperation:
"""Merge two objects.
@@ -139,7 +124,7 @@ def merge(self, other: ObjectVar) -> ObjectMergeOperation:
Returns:
The merged object.
"""
- return ObjectMergeOperation(self, other)
+ return ObjectMergeOperation.create(self, other)
# NoReturn is used here to catch when key value is Any
@overload
@@ -197,7 +182,7 @@ def __getitem__(self, key: Var | Any) -> ImmutableVar:
Returns:
The item from the object.
"""
- return ObjectItemOperation(self, key).guess_type()
+ return ObjectItemOperation.create(self, key).guess_type()
# NoReturn is used here to catch when key value is Any
@overload
@@ -258,19 +243,36 @@ def __getattr__(self, name) -> ImmutableVar:
Returns:
The attribute of the var.
"""
- fixed_type = (
- self._var_type if isclass(self._var_type) else get_origin(self._var_type)
- )
- if not issubclass(fixed_type, dict):
- attribute_type = get_attribute_access_type(self._var_type, name)
+ if name.startswith("__") and name.endswith("__"):
+ return getattr(super(type(self), self), name)
+
+ var_type = self._var_type
+
+ if types.is_optional(var_type):
+ var_type = get_args(var_type)[0]
+
+ fixed_type = var_type if isclass(var_type) else get_origin(var_type)
+ if isclass(fixed_type) and not issubclass(fixed_type, dict):
+ attribute_type = get_attribute_access_type(var_type, name)
if attribute_type is None:
raise VarAttributeError(
- f"The State var `{self._var_name}` has no attribute '{name}' or may have been annotated "
+ f"The State var `{str(self)}` has no attribute '{name}' or may have been annotated "
f"wrongly."
)
- return ObjectItemOperation(self, name, attribute_type).guess_type()
+ return ObjectItemOperation.create(self, name, attribute_type).guess_type()
else:
- return ObjectItemOperation(self, name).guess_type()
+ return ObjectItemOperation.create(self, name).guess_type()
+
+ def contains(self, key: Var | Any) -> BooleanVar:
+ """Check if the object contains a key.
+
+ Args:
+ key: The key to check.
+
+ Returns:
+ The result of the check.
+ """
+ return ObjectHasOwnProperty.create(self, key)
@dataclasses.dataclass(
@@ -278,38 +280,13 @@ def __getattr__(self, name) -> ImmutableVar:
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class LiteralObjectVar(LiteralVar, ObjectVar[OBJECT_TYPE]):
+class LiteralObjectVar(CachedVarOperation, ObjectVar[OBJECT_TYPE], LiteralVar):
"""Base class for immutable literal object vars."""
_var_value: Dict[Union[Var, Any], Union[Var, Any]] = dataclasses.field(
default_factory=dict
)
- def __init__(
- self: LiteralObjectVar[OBJECT_TYPE],
- _var_value: OBJECT_TYPE,
- _var_type: Type[OBJECT_TYPE] | None = None,
- _var_data: VarData | None = None,
- ):
- """Initialize the object var.
-
- Args:
- _var_value: The value of the var.
- _var_type: The type of the var.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(LiteralObjectVar, self).__init__(
- _var_name="",
- _var_type=(figure_out_type(_var_value) if _var_type is None else _var_type),
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(
- self,
- "_var_value",
- _var_value,
- )
- object.__delattr__(self, "_var_name")
-
def _key_type(self) -> Type:
"""Get the type of the keys of the object.
@@ -328,20 +305,7 @@ def _value_type(self) -> Type:
args_list = typing.get_args(self._var_type)
return args_list[1] if args_list else Any
- def __getattr__(self, name):
- """Get an attribute of the var.
-
- Args:
- name: The name of the attribute.
-
- Returns:
- The attribute of the var.
- """
- if name == "_var_name":
- return self._cached_var_name
- return super(type(self), self).__getattr__(name)
-
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
@@ -359,35 +323,6 @@ def _cached_var_name(self) -> str:
+ " })"
)
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
-
- Returns:
- The VarData of the components and all of its children.
- """
- return ImmutableVarData.merge(
- *[
- value._get_all_var_data()
- for key, value in self._var_value
- if isinstance(value, Var)
- ],
- *[
- key._get_all_var_data()
- for key, value in self._var_value
- if isinstance(key, Var)
- ],
- self._var_data,
- )
-
- def _get_all_var_data(self) -> ImmutableVarData | None:
- """Wrapper method for cached property.
-
- Returns:
- The VarData of the components and all of its children.
- """
- return self._cached_get_all_var_data
-
def json(self) -> str:
"""Get the JSON representation of the object.
@@ -413,38 +348,60 @@ def __hash__(self) -> int:
"""
return hash((self.__class__.__name__, self._var_name))
+ @cached_property_no_lock
+ def _cached_get_all_var_data(self) -> ImmutableVarData | None:
+ """Get all the var data.
-@dataclasses.dataclass(
- eq=False,
- frozen=True,
- **{"slots": True} if sys.version_info >= (3, 10) else {},
-)
-class ObjectToArrayOperation(ArrayVar):
- """Base class for object to array operations."""
-
- value: ObjectVar = dataclasses.field(default_factory=lambda: LiteralObjectVar({}))
+ Returns:
+ The var data.
+ """
+ return ImmutableVarData.merge(
+ *[LiteralVar.create(var)._get_all_var_data() for var in self._var_value],
+ *[
+ LiteralVar.create(var)._get_all_var_data()
+ for var in self._var_value.values()
+ ],
+ self._var_data,
+ )
- def __init__(
- self,
- _var_value: ObjectVar,
- _var_type: Type = list,
+ @classmethod
+ def create(
+ cls,
+ _var_value: OBJECT_TYPE,
+ _var_type: GenericType | None = None,
_var_data: VarData | None = None,
- ):
- """Initialize the object to array operation.
+ ) -> LiteralObjectVar[OBJECT_TYPE]:
+ """Create the literal object var.
Args:
- _var_value: The value of the operation.
- _var_data: Additional hooks and imports associated with the operation.
+ _var_value: The value of the var.
+ _var_type: The type of the var.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The literal object var.
"""
- super(ObjectToArrayOperation, self).__init__(
+ return LiteralObjectVar(
_var_name="",
- _var_type=_var_type,
+ _var_type=(figure_out_type(_var_value) if _var_type is None else _var_type),
_var_data=ImmutableVarData.merge(_var_data),
+ _var_value=_var_value,
)
- object.__setattr__(self, "value", _var_value)
- object.__delattr__(self, "_var_name")
- @cached_property
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class ObjectToArrayOperation(CachedVarOperation, ArrayVar):
+ """Base class for object to array operations."""
+
+ _value: ObjectVar = dataclasses.field(
+ default_factory=lambda: LiteralObjectVar.create({})
+ )
+
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the operation.
@@ -455,122 +412,133 @@ def _cached_var_name(self) -> str:
"ObjectToArrayOperation must implement _cached_var_name"
)
- def __getattr__(self, name):
- """Get an attribute of the operation.
+ @classmethod
+ def create(
+ cls,
+ value: ObjectVar,
+ _var_type: GenericType | None = None,
+ _var_data: VarData | None = None,
+ ) -> ObjectToArrayOperation:
+ """Create the object to array operation.
Args:
- name: The name of the attribute.
+ value: The value of the operation.
+ _var_data: Additional hooks and imports associated with the operation.
Returns:
- The attribute of the operation.
+ The object to array operation.
"""
- if name == "_var_name":
- return self._cached_var_name
- return super(type(self), self).__getattr__(name)
+ return cls(
+ _var_name="",
+ _var_type=list if _var_type is None else _var_type,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _value=value,
+ )
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the operation.
- Returns:
- The VarData of the components and all of its children.
- """
- return ImmutableVarData.merge(
- self.value._get_all_var_data(),
- self._var_data,
- )
+class ObjectKeysOperation(ObjectToArrayOperation):
+ """Operation to get the keys of an object."""
- def _get_all_var_data(self) -> ImmutableVarData | None:
- """Wrapper method for cached property.
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the operation.
Returns:
- The VarData of the components and all of its children.
+ The name of the operation.
"""
- return self._cached_get_all_var_data
-
-
-class ObjectKeysOperation(ObjectToArrayOperation):
- """Operation to get the keys of an object."""
+ return f"Object.keys({str(self._value)})"
- def __init__(
- self,
+ @classmethod
+ def create(
+ cls,
value: ObjectVar,
_var_data: VarData | None = None,
- ):
- """Initialize the object keys operation.
+ ) -> ObjectKeysOperation:
+ """Create the object keys operation.
Args:
value: The value of the operation.
_var_data: Additional hooks and imports associated with the operation.
+
+ Returns:
+ The object keys operation.
"""
- super(ObjectKeysOperation, self).__init__(
- value, List[value._key_type()], _var_data
+ return cls(
+ _var_name="",
+ _var_type=List[str],
+ _var_data=ImmutableVarData.merge(_var_data),
+ _value=value,
)
- @cached_property
+
+class ObjectValuesOperation(ObjectToArrayOperation):
+ """Operation to get the values of an object."""
+
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the operation.
Returns:
The name of the operation.
"""
- return f"Object.keys({self.value._var_name})"
-
-
-class ObjectValuesOperation(ObjectToArrayOperation):
- """Operation to get the values of an object."""
+ return f"Object.values({str(self._value)})"
- def __init__(
- self,
+ @classmethod
+ def create(
+ cls,
value: ObjectVar,
_var_data: VarData | None = None,
- ):
- """Initialize the object values operation.
+ ) -> ObjectValuesOperation:
+ """Create the object values operation.
Args:
value: The value of the operation.
_var_data: Additional hooks and imports associated with the operation.
+
+ Returns:
+ The object values operation.
"""
- super(ObjectValuesOperation, self).__init__(
- value, List[value._value_type()], _var_data
+ return cls(
+ _var_name="",
+ _var_type=List[value._value_type()],
+ _var_data=ImmutableVarData.merge(_var_data),
+ _value=value,
)
- @cached_property
+
+class ObjectEntriesOperation(ObjectToArrayOperation):
+ """Operation to get the entries of an object."""
+
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the operation.
Returns:
The name of the operation.
"""
- return f"Object.values({self.value._var_name})"
+ return f"Object.entries({str(self._value)})"
-
-class ObjectEntriesOperation(ObjectToArrayOperation):
- """Operation to get the entries of an object."""
-
- def __init__(
- self,
+ @classmethod
+ def create(
+ cls,
value: ObjectVar,
_var_data: VarData | None = None,
- ):
- """Initialize the object entries operation.
+ ) -> ObjectEntriesOperation:
+ """Create the object entries operation.
Args:
value: The value of the operation.
_var_data: Additional hooks and imports associated with the operation.
- """
- super(ObjectEntriesOperation, self).__init__(
- value, List[Tuple[value._key_type(), value._value_type()]], _var_data
- )
-
- @cached_property
- def _cached_var_name(self) -> str:
- """The name of the operation.
Returns:
- The name of the operation.
+ The object entries operation.
"""
- return f"Object.entries({self.value._var_name})"
+ return cls(
+ _var_name="",
+ _var_type=List[Tuple[str, value._value_type()]],
+ _var_data=ImmutableVarData.merge(_var_data),
+ _value=value,
+ )
@dataclasses.dataclass(
@@ -578,227 +546,193 @@ def _cached_var_name(self) -> str:
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class ObjectMergeOperation(ObjectVar):
+class ObjectMergeOperation(CachedVarOperation, ObjectVar):
"""Operation to merge two objects."""
- left: ObjectVar = dataclasses.field(default_factory=lambda: LiteralObjectVar({}))
- right: ObjectVar = dataclasses.field(default_factory=lambda: LiteralObjectVar({}))
-
- def __init__(
- self,
- left: ObjectVar,
- right: ObjectVar,
- _var_data: VarData | None = None,
- ):
- """Initialize the object merge operation.
-
- Args:
- left: The left object to merge.
- right: The right object to merge.
- _var_data: Additional hooks and imports associated with the operation.
- """
- super(ObjectMergeOperation, self).__init__(
- _var_name="",
- _var_type=left._var_type,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "left", left)
- object.__setattr__(self, "right", right)
- object.__delattr__(self, "_var_name")
+ _lhs: ObjectVar = dataclasses.field(
+ default_factory=lambda: LiteralObjectVar.create({})
+ )
+ _rhs: ObjectVar = dataclasses.field(
+ default_factory=lambda: LiteralObjectVar.create({})
+ )
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the operation.
Returns:
The name of the operation.
"""
- return f"Object.assign({self.left._var_name}, {self.right._var_name})"
+ return f"({{...{str(self._lhs)}, ...{str(self._rhs)}}})"
- def __getattr__(self, name):
- """Get an attribute of the operation.
+ @classmethod
+ def create(
+ cls,
+ lhs: ObjectVar,
+ rhs: ObjectVar,
+ _var_data: VarData | None = None,
+ ) -> ObjectMergeOperation:
+ """Create the object merge operation.
Args:
- name: The name of the attribute.
-
- Returns:
- The attribute of the operation.
- """
- if name == "_var_name":
- return self._cached_var_name
- return super(type(self), self).__getattr__(name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the operation.
+ lhs: The left object to merge.
+ rhs: The right object to merge.
+ _var_data: Additional hooks and imports associated with the operation.
Returns:
- The VarData of the components and all of its children.
+ The object merge operation.
"""
- return ImmutableVarData.merge(
- self.left._get_all_var_data(),
- self.right._get_all_var_data(),
- self._var_data,
+ # TODO: Figure out how to merge the types
+ return cls(
+ _var_name="",
+ _var_type=lhs._var_type,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _lhs=lhs,
+ _rhs=rhs,
)
- def _get_all_var_data(self) -> ImmutableVarData | None:
- """Wrapper method for cached property.
-
- Returns:
- The VarData of the components and all of its children.
- """
- return self._cached_get_all_var_data
-
@dataclasses.dataclass(
eq=False,
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class ObjectItemOperation(ImmutableVar):
+class ObjectItemOperation(CachedVarOperation, ImmutableVar):
"""Operation to get an item from an object."""
- value: ObjectVar = dataclasses.field(default_factory=lambda: LiteralObjectVar({}))
- key: Var | Any = dataclasses.field(default_factory=lambda: LiteralVar.create(None))
+ _object: ObjectVar = dataclasses.field(
+ default_factory=lambda: LiteralObjectVar.create({})
+ )
+ _key: Var | Any = dataclasses.field(default_factory=lambda: LiteralVar.create(None))
- def __init__(
- self,
- value: ObjectVar,
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the operation.
+
+ Returns:
+ The name of the operation.
+ """
+ if types.is_optional(self._object._var_type):
+ return f"{str(self._object)}?.[{str(self._key)}]"
+ return f"{str(self._object)}[{str(self._key)}]"
+
+ @classmethod
+ def create(
+ cls,
+ object: ObjectVar,
key: Var | Any,
_var_type: GenericType | None = None,
_var_data: VarData | None = None,
- ):
- """Initialize the object item operation.
+ ) -> ObjectItemOperation:
+ """Create the object item operation.
Args:
- value: The value of the operation.
+ object: The object to get the item from.
key: The key to get from the object.
+ _var_type: The type of the item.
_var_data: Additional hooks and imports associated with the operation.
+
+ Returns:
+ The object item operation.
"""
- super(ObjectItemOperation, self).__init__(
+ return cls(
_var_name="",
- _var_type=value._value_type() if _var_type is None else _var_type,
+ _var_type=object._value_type() if _var_type is None else _var_type,
_var_data=ImmutableVarData.merge(_var_data),
+ _object=object,
+ _key=key if isinstance(key, Var) else LiteralVar.create(key),
)
- object.__setattr__(self, "value", value)
- object.__setattr__(
- self, "key", key if isinstance(key, Var) else LiteralVar.create(key)
- )
- object.__delattr__(self, "_var_name")
- @cached_property
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class ToObjectOperation(CachedVarOperation, ObjectVar):
+ """Operation to convert a var to an object."""
+
+ _original_var: Var = dataclasses.field(
+ default_factory=lambda: LiteralObjectVar.create({})
+ )
+
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the operation.
Returns:
The name of the operation.
"""
- return f"{str(self.value)}[{str(self.key)}]"
+ return str(self._original_var)
- def __getattr__(self, name):
- """Get an attribute of the operation.
+ @classmethod
+ def create(
+ cls,
+ original_var: Var,
+ _var_type: GenericType | None = None,
+ _var_data: VarData | None = None,
+ ) -> ToObjectOperation:
+ """Create the to object operation.
Args:
- name: The name of the attribute.
-
- Returns:
- The attribute of the operation.
- """
- if name == "_var_name":
- return self._cached_var_name
- return super(type(self), self).__getattr__(name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the operation.
+ original_var: The original var to convert.
+ _var_type: The type of the var.
+ _var_data: Additional hooks and imports associated with the operation.
Returns:
- The VarData of the components and all of its children.
+ The to object operation.
"""
- return ImmutableVarData.merge(
- self.value._get_all_var_data(),
- self.key._get_all_var_data(),
- self._var_data,
+ return cls(
+ _var_name="",
+ _var_type=dict if _var_type is None else _var_type,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _original_var=original_var,
)
- def _get_all_var_data(self) -> ImmutableVarData | None:
- """Wrapper method for cached property.
-
- Returns:
- The VarData of the components and all of its children.
- """
- return self._cached_get_all_var_data
-
@dataclasses.dataclass(
eq=False,
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class ToObjectOperation(ObjectVar):
- """Operation to convert a var to an object."""
-
- _original_var: Var = dataclasses.field(default_factory=lambda: LiteralObjectVar({}))
+class ObjectHasOwnProperty(CachedVarOperation, BooleanVar):
+ """Operation to check if an object has a property."""
- def __init__(
- self,
- _original_var: Var,
- _var_type: Type = dict,
- _var_data: VarData | None = None,
- ):
- """Initialize the to object operation.
-
- Args:
- _original_var: The original var to convert.
- _var_type: The type of the var.
- _var_data: Additional hooks and imports associated with the operation.
- """
- super(ToObjectOperation, self).__init__(
- _var_name="",
- _var_type=_var_type,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "_original_var", _original_var)
- object.__delattr__(self, "_var_name")
+ _object: ObjectVar = dataclasses.field(
+ default_factory=lambda: LiteralObjectVar.create({})
+ )
+ _key: Var | Any = dataclasses.field(default_factory=lambda: LiteralVar.create(None))
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the operation.
Returns:
The name of the operation.
"""
- return str(self._original_var)
+ return f"{str(self._object)}.hasOwnProperty({str(self._key)})"
- def __getattr__(self, name):
- """Get an attribute of the operation.
+ @classmethod
+ def create(
+ cls,
+ object: ObjectVar,
+ key: Var | Any,
+ _var_data: VarData | None = None,
+ ) -> ObjectHasOwnProperty:
+ """Create the object has own property operation.
Args:
- name: The name of the attribute.
-
- Returns:
- The attribute of the operation.
- """
- if name == "_var_name":
- return self._cached_var_name
- return super(type(self), self).__getattr__(name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the operation.
+ object: The object to check.
+ key: The key to check.
+ _var_data: Additional hooks and imports associated with the operation.
Returns:
- The VarData of the components and all of its children.
+ The object has own property operation.
"""
- return ImmutableVarData.merge(
- self._original_var._get_all_var_data(),
- self._var_data,
+ return cls(
+ _var_name="",
+ _var_type=bool,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _object=object,
+ _key=key if isinstance(key, Var) else LiteralVar.create(key),
)
-
- def _get_all_var_data(self) -> ImmutableVarData | None:
- """Wrapper method for cached property.
-
- Returns:
- The VarData of the components and all of its children.
- """
- return self._cached_get_all_var_data
diff --git a/reflex/experimental/vars/sequence.py b/reflex/ivars/sequence.py
similarity index 50%
rename from reflex/experimental/vars/sequence.py
rename to reflex/ivars/sequence.py
index f622159a624..d05ec5aad6d 100644
--- a/reflex/experimental/vars/sequence.py
+++ b/reflex/ivars/sequence.py
@@ -3,13 +3,11 @@
from __future__ import annotations
import dataclasses
-import functools
import inspect
import json
import re
import sys
import typing
-from functools import cached_property
from typing import (
TYPE_CHECKING,
Any,
@@ -18,6 +16,7 @@
Literal,
Set,
Tuple,
+ Type,
TypeVar,
Union,
overload,
@@ -27,20 +26,28 @@
from reflex import constants
from reflex.constants.base import REFLEX_VAR_OPENING_TAG
-from reflex.experimental.vars.base import (
+from reflex.utils.types import GenericType
+from reflex.vars import (
+ ImmutableVarData,
+ Var,
+ VarData,
+ _global_vars,
+)
+
+from .base import (
+ CachedVarOperation,
ImmutableVar,
LiteralVar,
+ cached_property_no_lock,
figure_out_type,
unionize,
)
-from reflex.experimental.vars.number import (
+from .number import (
BooleanVar,
LiteralNumberVar,
NotEqualOperation,
NumberVar,
)
-from reflex.utils.types import GenericType
-from reflex.vars import ImmutableVarData, Var, VarData, _global_vars
if TYPE_CHECKING:
from .object import ObjectVar
@@ -58,7 +65,7 @@ def __add__(self, other: StringVar | str) -> ConcatVarOperation:
Returns:
The string concatenation operation.
"""
- return ConcatVarOperation(self, other)
+ return ConcatVarOperation.create(self, other)
def __radd__(self, other: StringVar | str) -> ConcatVarOperation:
"""Concatenate two strings.
@@ -69,29 +76,29 @@ def __radd__(self, other: StringVar | str) -> ConcatVarOperation:
Returns:
The string concatenation operation.
"""
- return ConcatVarOperation(other, self)
+ return ConcatVarOperation.create(other, self)
- def __mul__(self, other: int) -> ConcatVarOperation:
- """Concatenate two strings.
+ def __mul__(self, other: NumberVar | int) -> StringVar:
+ """Multiply the sequence by a number or an integer.
Args:
- other: The other string.
+ other (NumberVar | int): The number or integer to multiply the sequence by.
Returns:
- The string concatenation operation.
+ StringVar: The resulting sequence after multiplication.
"""
- return ConcatVarOperation(*[self for _ in range(other)])
+ return (self.split() * other).join()
- def __rmul__(self, other: int) -> ConcatVarOperation:
- """Concatenate two strings.
+ def __rmul__(self, other: NumberVar | int) -> StringVar:
+ """Multiply the sequence by a number or an integer.
Args:
- other: The other string.
+ other (NumberVar | int): The number or integer to multiply the sequence by.
Returns:
- The string concatenation operation.
+ StringVar: The resulting sequence after multiplication.
"""
- return ConcatVarOperation(*[self for _ in range(other)])
+ return (self.split() * other).join()
@overload
def __getitem__(self, i: slice) -> ArrayJoinOperation: ...
@@ -112,7 +119,7 @@ def __getitem__(
"""
if isinstance(i, slice):
return self.split()[i].join()
- return StringItemOperation(self, i)
+ return StringItemOperation.create(self, i)
def length(self) -> NumberVar:
"""Get the length of the string.
@@ -122,29 +129,29 @@ def length(self) -> NumberVar:
"""
return self.split().length()
- def lower(self) -> StringLowerOperation:
+ def lower(self) -> StringVar:
"""Convert the string to lowercase.
Returns:
The string lower operation.
"""
- return StringLowerOperation(self)
+ return StringLowerOperation.create(self)
- def upper(self) -> StringUpperOperation:
+ def upper(self) -> StringVar:
"""Convert the string to uppercase.
Returns:
The string upper operation.
"""
- return StringUpperOperation(self)
+ return StringUpperOperation.create(self)
- def strip(self) -> StringStripOperation:
+ def strip(self) -> StringVar:
"""Strip the string.
Returns:
The string strip operation.
"""
- return StringStripOperation(self)
+ return StringStripOperation.create(self)
def bool(self) -> NotEqualOperation:
"""Boolean conversion.
@@ -152,7 +159,7 @@ def bool(self) -> NotEqualOperation:
Returns:
The boolean value of the string.
"""
- return NotEqualOperation(self.length(), 0)
+ return NotEqualOperation.create(self.length(), 0)
def reversed(self) -> ArrayJoinOperation:
"""Reverse the string.
@@ -171,7 +178,7 @@ def contains(self, other: StringVar | str) -> StringContainsOperation:
Returns:
The string contains operation.
"""
- return StringContainsOperation(self, other)
+ return StringContainsOperation.create(self, other)
def split(self, separator: StringVar | str = "") -> StringSplitOperation:
"""Split the string.
@@ -182,7 +189,18 @@ def split(self, separator: StringVar | str = "") -> StringSplitOperation:
Returns:
The string split operation.
"""
- return StringSplitOperation(self, separator)
+ return StringSplitOperation.create(self, separator)
+
+ def startswith(self, prefix: StringVar | str) -> StringStartsWithOperation:
+ """Check if the string starts with a prefix.
+
+ Args:
+ prefix: The prefix.
+
+ Returns:
+ The string starts with operation.
+ """
+ return StringStartsWithOperation.create(self, prefix)
@dataclasses.dataclass(
@@ -190,31 +208,14 @@ def split(self, separator: StringVar | str = "") -> StringSplitOperation:
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class StringToStringOperation(StringVar):
+class StringToStringOperation(CachedVarOperation, StringVar):
"""Base class for immutable string vars that are the result of a string to string operation."""
- a: StringVar = dataclasses.field(
+ _value: StringVar = dataclasses.field(
default_factory=lambda: LiteralStringVar.create("")
)
- def __init__(self, a: StringVar | str, _var_data: VarData | None = None):
- """Initialize the string to string operation var.
-
- Args:
- a: The string.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(StringToStringOperation, self).__init__(
- _var_name="",
- _var_type=str,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(
- self, "a", a if isinstance(a, Var) else LiteralStringVar.create(a)
- )
- object.__delattr__(self, "_var_name")
-
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
@@ -225,72 +226,66 @@ def _cached_var_name(self) -> str:
"StringToStringOperation must implement _cached_var_name"
)
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
+ @classmethod
+ def create(
+ cls,
+ value: StringVar,
+ _var_data: VarData | None = None,
+ ) -> StringVar:
+ """Create a var from a string value.
Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(StringToStringOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
+ value: The value to create the var from.
+ _var_data: Additional hooks and imports associated with the Var.
Returns:
- The VarData of the components and all of its children.
+ The var.
"""
- return ImmutableVarData.merge(
- self.a._get_all_var_data() if isinstance(self.a, Var) else None,
- self._var_data,
+ return cls(
+ _var_name="",
+ _var_type=str,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _value=value,
)
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
class StringLowerOperation(StringToStringOperation):
"""Base class for immutable string vars that are the result of a string lower operation."""
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
Returns:
The name of the var.
"""
- return f"{str(self.a)}.toLowerCase()"
+ return f"{str(self._value)}.toLowerCase()"
class StringUpperOperation(StringToStringOperation):
"""Base class for immutable string vars that are the result of a string upper operation."""
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
Returns:
The name of the var.
"""
- return f"{str(self.a)}.toUpperCase()"
+ return f"{str(self._value)}.toUpperCase()"
class StringStripOperation(StringToStringOperation):
"""Base class for immutable string vars that are the result of a string strip operation."""
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
Returns:
The name of the var.
"""
- return f"{str(self.a)}.trim()"
+ return f"{str(self._value)}.trim()"
@dataclasses.dataclass(
@@ -298,212 +293,216 @@ def _cached_var_name(self) -> str:
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class StringContainsOperation(BooleanVar):
+class StringContainsOperation(CachedVarOperation, BooleanVar):
"""Base class for immutable boolean vars that are the result of a string contains operation."""
- a: StringVar = dataclasses.field(
+ _haystack: StringVar = dataclasses.field(
default_factory=lambda: LiteralStringVar.create("")
)
- b: StringVar = dataclasses.field(
+ _needle: StringVar = dataclasses.field(
default_factory=lambda: LiteralStringVar.create("")
)
- def __init__(
- self, a: StringVar | str, b: StringVar | str, _var_data: VarData | None = None
- ):
- """Initialize the string contains operation var.
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"{str(self._haystack)}.includes({str(self._needle)})"
+
+ @classmethod
+ def create(
+ cls,
+ haystack: StringVar | str,
+ needle: StringVar | str,
+ _var_data: VarData | None = None,
+ ) -> StringContainsOperation:
+ """Create a var from a string value.
Args:
- a: The first string.
- b: The second string.
+ haystack: The haystack.
+ needle: The needle.
_var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The var.
"""
- super(StringContainsOperation, self).__init__(
+ return cls(
_var_name="",
_var_type=bool,
_var_data=ImmutableVarData.merge(_var_data),
+ _haystack=(
+ haystack
+ if isinstance(haystack, Var)
+ else LiteralStringVar.create(haystack)
+ ),
+ _needle=(
+ needle if isinstance(needle, Var) else LiteralStringVar.create(needle)
+ ),
)
- object.__setattr__(
- self, "a", a if isinstance(a, Var) else LiteralStringVar.create(a)
- )
- object.__setattr__(
- self, "b", b if isinstance(b, Var) else LiteralStringVar.create(b)
- )
- object.__delattr__(self, "_var_name")
- @cached_property
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class StringStartsWithOperation(CachedVarOperation, BooleanVar):
+ """Base class for immutable boolean vars that are the result of a string starts with operation."""
+
+ _full_string: StringVar = dataclasses.field(
+ default_factory=lambda: LiteralStringVar.create("")
+ )
+ _prefix: StringVar = dataclasses.field(
+ default_factory=lambda: LiteralStringVar.create("")
+ )
+
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
Returns:
The name of the var.
"""
- return f"{str(self.a)}.includes({str(self.b)})"
+ return f"{str(self._full_string)}.startsWith({str(self._prefix)})"
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
+ @classmethod
+ def create(
+ cls,
+ full_string: StringVar | str,
+ prefix: StringVar | str,
+ _var_data: VarData | None = None,
+ ) -> StringStartsWithOperation:
+ """Create a var from a string value.
Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(StringContainsOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
+ full_string: The full string.
+ prefix: The prefix.
+ _var_data: Additional hooks and imports associated with the Var.
Returns:
- The VarData of the components and all of its children.
+ The var.
"""
- return ImmutableVarData.merge(
- self.a._get_all_var_data(), self.b._get_all_var_data(), self._var_data
+ return cls(
+ _var_name="",
+ _var_type=bool,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _full_string=(
+ full_string
+ if isinstance(full_string, Var)
+ else LiteralStringVar.create(full_string)
+ ),
+ _prefix=(
+ prefix if isinstance(prefix, Var) else LiteralStringVar.create(prefix)
+ ),
)
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
@dataclasses.dataclass(
eq=False,
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class StringItemOperation(StringVar):
+class StringItemOperation(CachedVarOperation, StringVar):
"""Base class for immutable string vars that are the result of a string item operation."""
- a: StringVar = dataclasses.field(
+ _string: StringVar = dataclasses.field(
default_factory=lambda: LiteralStringVar.create("")
)
- i: NumberVar = dataclasses.field(default_factory=lambda: LiteralNumberVar(0))
-
- def __init__(
- self, a: StringVar | str, i: int | NumberVar, _var_data: VarData | None = None
- ):
- """Initialize the string item operation var.
-
- Args:
- a: The string.
- i: The index.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(StringItemOperation, self).__init__(
- _var_name="",
- _var_type=str,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(
- self, "a", a if isinstance(a, Var) else LiteralStringVar.create(a)
- )
- object.__setattr__(self, "i", i if isinstance(i, Var) else LiteralNumberVar(i))
- object.__delattr__(self, "_var_name")
+ _index: NumberVar = dataclasses.field(
+ default_factory=lambda: LiteralNumberVar.create(0)
+ )
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
Returns:
The name of the var.
"""
- return f"{str(self.a)}.at({str(self.i)})"
+ return f"{str(self._string)}.at({str(self._index)})"
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
+ @classmethod
+ def create(
+ cls,
+ string: StringVar | str,
+ index: NumberVar | int,
+ _var_data: VarData | None = None,
+ ) -> StringItemOperation:
+ """Create a var from a string value.
Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(StringItemOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
+ string: The string.
+ index: The index.
+ _var_data: Additional hooks and imports associated with the Var.
Returns:
- The VarData of the components and all of its children.
+ The var.
"""
- return ImmutableVarData.merge(
- self.a._get_all_var_data(), self.i._get_all_var_data(), self._var_data
+ return cls(
+ _var_name="",
+ _var_type=str,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _string=(
+ string if isinstance(string, Var) else LiteralStringVar.create(string)
+ ),
+ _index=(
+ index if isinstance(index, Var) else LiteralNumberVar.create(index)
+ ),
)
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
-class ArrayJoinOperation(StringVar):
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class ArrayJoinOperation(CachedVarOperation, StringVar):
"""Base class for immutable string vars that are the result of an array join operation."""
- a: ArrayVar = dataclasses.field(default_factory=lambda: LiteralArrayVar([]))
- b: StringVar = dataclasses.field(
+ _array: ArrayVar = dataclasses.field(
+ default_factory=lambda: LiteralArrayVar.create([])
+ )
+ _sep: StringVar = dataclasses.field(
default_factory=lambda: LiteralStringVar.create("")
)
- def __init__(
- self, a: ArrayVar, b: StringVar | str, _var_data: VarData | None = None
- ):
- """Initialize the array join operation var.
-
- Args:
- a: The array.
- b: The separator.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(ArrayJoinOperation, self).__init__(
- _var_name="",
- _var_type=str,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "a", a)
- object.__setattr__(
- self, "b", b if isinstance(b, Var) else LiteralStringVar.create(b)
- )
- object.__delattr__(self, "_var_name")
-
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
Returns:
The name of the var.
"""
- return f"{str(self.a)}.join({str(self.b)})"
+ return f"{str(self._array)}.join({str(self._sep)})"
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
+ @classmethod
+ def create(
+ cls,
+ array: ArrayVar,
+ sep: StringVar | str = "",
+ _var_data: VarData | None = None,
+ ) -> ArrayJoinOperation:
+ """Create a var from a string value.
Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(ArrayJoinOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
+ array: The array.
+ sep: The separator.
+ _var_data: Additional hooks and imports associated with the Var.
Returns:
- The VarData of the components and all of its children.
+ The var.
"""
- return ImmutableVarData.merge(
- self.a._get_all_var_data(), self.b._get_all_var_data(), self._var_data
+ return cls(
+ _var_name="",
+ _var_type=str,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _array=array,
+ _sep=sep if isinstance(sep, Var) else LiteralStringVar.create(sep),
)
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
# Compile regex for finding reflex var tags.
_decode_var_pattern_re = (
@@ -522,24 +521,6 @@ class LiteralStringVar(LiteralVar, StringVar):
_var_value: str = dataclasses.field(default="")
- def __init__(
- self,
- _var_value: str,
- _var_data: VarData | None = None,
- ):
- """Initialize the string var.
-
- Args:
- _var_value: The value of the var.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(LiteralStringVar, self).__init__(
- _var_name=f'"{_var_value}"',
- _var_type=str,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "_var_value", _var_value)
-
@classmethod
def create(
cls,
@@ -573,8 +554,8 @@ def json_loads(s):
# Find all tags
while m := _decode_var_pattern.search(value):
start, end = m.span()
- if start > 0:
- strings_and_vals.append(value[:start])
+
+ strings_and_vals.append(value[:start])
serialized_data = m.group(1)
@@ -596,23 +577,41 @@ def json_loads(s):
var_data.interpolations = [
(realstart, realstart + string_length)
]
+ var_content = value[end : (end + string_length)]
+ if (
+ var_content[0] == "{"
+ and var_content[-1] == "}"
+ and strings_and_vals
+ and strings_and_vals[-1][-1] == "$"
+ ):
+ strings_and_vals[-1] = strings_and_vals[-1][:-1]
+ var_content = "(" + var_content[1:-1] + ")"
strings_and_vals.append(
- ImmutableVar.create_safe(
- value[end : (end + string_length)], _var_data=var_data
- )
+ ImmutableVar.create_safe(var_content, _var_data=var_data)
)
value = value[(end + string_length) :]
offset += end - start
- if value:
- strings_and_vals.append(value)
+ strings_and_vals.append(value)
+
+ filtered_strings_and_vals = [
+ s for s in strings_and_vals if isinstance(s, Var) or s
+ ]
- return ConcatVarOperation(*strings_and_vals, _var_data=_var_data)
+ if len(filtered_strings_and_vals) == 1:
+ return filtered_strings_and_vals[0].to(StringVar) # type: ignore
+
+ return ConcatVarOperation.create(
+ *filtered_strings_and_vals,
+ _var_data=_var_data,
+ )
return LiteralStringVar(
- value,
- _var_data=_var_data,
+ _var_name=json.dumps(value),
+ _var_type=str,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _var_value=value,
)
def __hash__(self) -> int:
@@ -637,61 +636,47 @@ def json(self) -> str:
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class ConcatVarOperation(StringVar):
+class ConcatVarOperation(CachedVarOperation, StringVar):
"""Representing a concatenation of literal string vars."""
- _var_value: Tuple[Union[Var, str], ...] = dataclasses.field(default_factory=tuple)
-
- def __init__(self, *value: Var | str, _var_data: VarData | None = None):
- """Initialize the operation of concatenating literal string vars.
-
- Args:
- value: The values to concatenate.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(ConcatVarOperation, self).__init__(
- _var_name="", _var_data=ImmutableVarData.merge(_var_data), _var_type=str
- )
- object.__setattr__(self, "_var_value", value)
- object.__delattr__(self, "_var_name")
-
- def __getattr__(self, name):
- """Get an attribute of the var.
+ _var_value: Tuple[Var, ...] = dataclasses.field(default_factory=tuple)
- Args:
- name: The name of the attribute.
-
- Returns:
- The attribute of the var.
- """
- if name == "_var_name":
- return self._cached_var_name
- return super(type(self), self).__getattr__(name)
-
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
Returns:
The name of the var.
"""
- return (
- "("
- + "+".join(
- [
- str(element) if isinstance(element, Var) else f'"{element}"'
- for element in self._var_value
- ]
- )
- + ")"
- )
+ list_of_strs: List[Union[str, Var]] = []
+ last_string = ""
+ for var in self._var_value:
+ if isinstance(var, LiteralStringVar):
+ last_string += var._var_value
+ else:
+ if last_string:
+ list_of_strs.append(last_string)
+ last_string = ""
+ list_of_strs.append(var)
- @cached_property
+ if last_string:
+ list_of_strs.append(last_string)
+
+ list_of_strs_filtered = [
+ str(LiteralVar.create(s)) for s in list_of_strs if isinstance(s, Var) or s
+ ]
+
+ if len(list_of_strs_filtered) == 1:
+ return list_of_strs_filtered[0]
+
+ return "(" + "+".join(list_of_strs_filtered) + ")"
+
+ @cached_property_no_lock
def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
+ """Get all the VarData associated with the Var.
Returns:
- The VarData of the components and all of its children.
+ The VarData associated with the Var.
"""
return ImmutableVarData.merge(
*[
@@ -702,17 +687,27 @@ def _cached_get_all_var_data(self) -> ImmutableVarData | None:
self._var_data,
)
- def _get_all_var_data(self) -> ImmutableVarData | None:
- """Wrapper method for cached property.
+ @classmethod
+ def create(
+ cls,
+ *value: Var | str,
+ _var_data: VarData | None = None,
+ ) -> ConcatVarOperation:
+ """Create a var from a string value.
+
+ Args:
+ value: The values to concatenate.
+ _var_data: Additional hooks and imports associated with the Var.
Returns:
- The VarData of the components and all of its children.
+ The var.
"""
- return self._cached_get_all_var_data
-
- def __post_init__(self):
- """Post-initialize the var."""
- pass
+ return cls(
+ _var_name="",
+ _var_type=str,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _var_value=tuple(map(LiteralVar.create, value)),
+ )
ARRAY_VAR_TYPE = TypeVar("ARRAY_VAR_TYPE", bound=Union[List, Tuple, Set])
@@ -728,8 +723,6 @@ def __post_init__(self):
class ArrayVar(ImmutableVar[ARRAY_VAR_TYPE]):
"""Base class for immutable array vars."""
- from reflex.experimental.vars.sequence import StringVar
-
def join(self, sep: StringVar | str = "") -> ArrayJoinOperation:
"""Join the elements of the array.
@@ -739,9 +732,7 @@ def join(self, sep: StringVar | str = "") -> ArrayJoinOperation:
Returns:
The joined elements.
"""
- from reflex.experimental.vars.sequence import ArrayJoinOperation
-
- return ArrayJoinOperation(self, sep)
+ return ArrayJoinOperation.create(self, sep)
def reverse(self) -> ArrayVar[ARRAY_VAR_TYPE]:
"""Reverse the array.
@@ -749,7 +740,18 @@ def reverse(self) -> ArrayVar[ARRAY_VAR_TYPE]:
Returns:
The reversed array.
"""
- return ArrayReverseOperation(self)
+ return ArrayReverseOperation.create(self)
+
+ def __add__(self, other: ArrayVar[ARRAY_VAR_TYPE]) -> ArrayConcatOperation:
+ """Concatenate two arrays.
+
+ Parameters:
+ other (ArrayVar[ARRAY_VAR_TYPE]): The other array to concatenate.
+
+ Returns:
+ ArrayConcatOperation: The concatenation of the two arrays.
+ """
+ return ArrayConcatOperation.create(self, other)
@overload
def __getitem__(self, i: slice) -> ArrayVar[ARRAY_VAR_TYPE]: ...
@@ -853,8 +855,8 @@ def __getitem__(
The array slice operation.
"""
if isinstance(i, slice):
- return ArraySliceOperation(self, i)
- return ArrayItemOperation(self, i).guess_type()
+ return ArraySliceOperation.create(self, i)
+ return ArrayItemOperation.create(self, i).guess_type()
def length(self) -> NumberVar:
"""Get the length of the array.
@@ -862,7 +864,7 @@ def length(self) -> NumberVar:
Returns:
The length of the array.
"""
- return ArrayLengthOperation(self)
+ return ArrayLengthOperation.create(self)
@overload
@classmethod
@@ -902,7 +904,7 @@ def range(
start = first_endpoint
end = second_endpoint
- return RangeOperation(start, end, step or 1)
+ return RangeOperation.create(start, end, step or 1)
def contains(self, other: Any) -> BooleanVar:
"""Check if the array contains an element.
@@ -913,7 +915,20 @@ def contains(self, other: Any) -> BooleanVar:
Returns:
The array contains operation.
"""
- return ArrayContainsOperation(self, other)
+ return ArrayContainsOperation.create(self, other)
+
+ def __mul__(self, other: NumberVar | int) -> ArrayVar[ARRAY_VAR_TYPE]:
+ """Multiply the sequence by a number or integer.
+
+ Parameters:
+ other (NumberVar | int): The number or integer to multiply the sequence by.
+
+ Returns:
+ ArrayVar[ARRAY_VAR_TYPE]: The result of multiplying the sequence by the given number or integer.
+ """
+ return ArrayRepeatOperation.create(self, other)
+
+ __rmul__ = __mul__ # type: ignore
LIST_ELEMENT = TypeVar("LIST_ELEMENT")
@@ -930,48 +945,14 @@ def contains(self, other: Any) -> BooleanVar:
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class LiteralArrayVar(LiteralVar, ArrayVar[ARRAY_VAR_TYPE]):
+class LiteralArrayVar(CachedVarOperation, LiteralVar, ArrayVar[ARRAY_VAR_TYPE]):
"""Base class for immutable literal array vars."""
_var_value: Union[
List[Union[Var, Any]], Set[Union[Var, Any]], Tuple[Union[Var, Any], ...]
] = dataclasses.field(default_factory=list)
- def __init__(
- self: LiteralArrayVar[ARRAY_VAR_TYPE],
- _var_value: ARRAY_VAR_TYPE,
- _var_type: type[ARRAY_VAR_TYPE] | None = None,
- _var_data: VarData | None = None,
- ):
- """Initialize the array var.
-
- Args:
- _var_value: The value of the var.
- _var_type: The type of the var.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(LiteralArrayVar, self).__init__(
- _var_name="",
- _var_data=ImmutableVarData.merge(_var_data),
- _var_type=(figure_out_type(_var_value) if _var_type is None else _var_type),
- )
- object.__setattr__(self, "_var_value", _var_value)
- object.__delattr__(self, "_var_name")
-
- def __getattr__(self, name):
- """Get an attribute of the var.
-
- Args:
- name: The name of the attribute.
-
- Returns:
- The attribute of the var.
- """
- if name == "_var_name":
- return self._cached_var_name
- return super(type(self), self).__getattr__(name)
-
- @functools.cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
@@ -986,30 +967,21 @@ def _cached_var_name(self) -> str:
+ "]"
)
- @functools.cached_property
+ @cached_property_no_lock
def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
+ """Get all the VarData associated with the Var.
Returns:
- The VarData of the components and all of its children.
+ The VarData associated with the Var.
"""
return ImmutableVarData.merge(
*[
- var._get_all_var_data()
- for var in self._var_value
- if isinstance(var, Var)
+ LiteralVar.create(element)._get_all_var_data()
+ for element in self._var_value
],
self._var_data,
)
- def _get_all_var_data(self) -> ImmutableVarData | None:
- """Wrapper method for cached property.
-
- Returns:
- The VarData of the components and all of its children.
- """
- return self._cached_get_all_var_data
-
def __hash__(self) -> int:
"""Get the hash of the var.
@@ -1032,108 +1004,95 @@ def json(self) -> str:
+ "]"
)
+ @classmethod
+ def create(
+ cls,
+ value: ARRAY_VAR_TYPE,
+ _var_type: Type[ARRAY_VAR_TYPE] | None = None,
+ _var_data: VarData | None = None,
+ ) -> LiteralArrayVar[ARRAY_VAR_TYPE]:
+ """Create a var from a string value.
+
+ Args:
+ value: The value to create the var from.
+ _var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The var.
+ """
+ return cls(
+ _var_name="",
+ _var_type=figure_out_type(value) if _var_type is None else _var_type,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _var_value=value,
+ )
+
@dataclasses.dataclass(
eq=False,
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class StringSplitOperation(ArrayVar):
+class StringSplitOperation(CachedVarOperation, ArrayVar):
"""Base class for immutable array vars that are the result of a string split operation."""
- a: StringVar = dataclasses.field(
+ _string: StringVar = dataclasses.field(
default_factory=lambda: LiteralStringVar.create("")
)
- b: StringVar = dataclasses.field(
+ _sep: StringVar = dataclasses.field(
default_factory=lambda: LiteralStringVar.create("")
)
- def __init__(
- self, a: StringVar | str, b: StringVar | str, _var_data: VarData | None = None
- ):
- """Initialize the string split operation var.
-
- Args:
- a: The string.
- b: The separator.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(StringSplitOperation, self).__init__(
- _var_name="",
- _var_type=List[str],
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(
- self, "a", a if isinstance(a, Var) else LiteralStringVar.create(a)
- )
- object.__setattr__(
- self, "b", b if isinstance(b, Var) else LiteralStringVar.create(b)
- )
- object.__delattr__(self, "_var_name")
-
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
Returns:
The name of the var.
"""
- return f"{str(self.a)}.split({str(self.b)})"
+ return f"{str(self._string)}.split({str(self._sep)})"
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
+ @classmethod
+ def create(
+ cls,
+ string: StringVar | str,
+ sep: StringVar | str,
+ _var_data: VarData | None = None,
+ ) -> StringSplitOperation:
+ """Create a var from a string value.
Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(StringSplitOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
+ string: The string.
+ sep: The separator.
+ _var_data: Additional hooks and imports associated with the Var.
Returns:
- The VarData of the components and all of its children.
+ The var.
"""
- return ImmutableVarData.merge(
- self.a._get_all_var_data(), self.b._get_all_var_data(), self._var_data
+ return cls(
+ _var_name="",
+ _var_type=List[str],
+ _var_data=ImmutableVarData.merge(_var_data),
+ _string=(
+ string if isinstance(string, Var) else LiteralStringVar.create(string)
+ ),
+ _sep=(sep if isinstance(sep, Var) else LiteralStringVar.create(sep)),
)
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
@dataclasses.dataclass(
eq=False,
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class ArrayToArrayOperation(ArrayVar):
+class ArrayToArrayOperation(CachedVarOperation, ArrayVar):
"""Base class for immutable array vars that are the result of an array to array operation."""
- a: ArrayVar = dataclasses.field(default_factory=lambda: LiteralArrayVar([]))
-
- def __init__(self, a: ArrayVar, _var_data: VarData | None = None):
- """Initialize the array to array operation var.
-
- Args:
- a: The string.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(ArrayToArrayOperation, self).__init__(
- _var_name="",
- _var_type=a._var_type,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "a", a)
- object.__delattr__(self, "_var_name")
+ _value: ArrayVar = dataclasses.field(
+ default_factory=lambda: LiteralArrayVar.create([])
+ )
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
@@ -1144,64 +1103,43 @@ def _cached_var_name(self) -> str:
"ArrayToArrayOperation must implement _cached_var_name"
)
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
+ @classmethod
+ def create(
+ cls,
+ value: ArrayVar,
+ _var_data: VarData | None = None,
+ ) -> ArrayToArrayOperation:
+ """Create a var from a string value.
Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(ArrayToArrayOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
+ value: The value to create the var from.
+ _var_data: Additional hooks and imports associated with the Var.
Returns:
- The VarData of the components and all of its children.
+ The var.
"""
- return ImmutableVarData.merge(
- self.a._get_all_var_data() if isinstance(self.a, Var) else None,
- self._var_data,
+ return cls(
+ _var_name="",
+ _var_type=value._var_type,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _value=value,
)
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
@dataclasses.dataclass(
eq=False,
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class ArraySliceOperation(ArrayVar):
+class ArraySliceOperation(CachedVarOperation, ArrayVar):
"""Base class for immutable string vars that are the result of a string slice operation."""
- a: ArrayVar = dataclasses.field(default_factory=lambda: LiteralArrayVar([]))
+ _array: ArrayVar = dataclasses.field(
+ default_factory=lambda: LiteralArrayVar.create([])
+ )
_slice: slice = dataclasses.field(default_factory=lambda: slice(None, None, None))
- def __init__(self, a: ArrayVar, _slice: slice, _var_data: VarData | None = None):
- """Initialize the string slice operation var.
-
- Args:
- a: The string.
- _slice: The slice.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(ArraySliceOperation, self).__init__(
- _var_name="",
- _var_type=a._var_type,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "a", a)
- object.__setattr__(self, "_slice", _slice)
- object.__delattr__(self, "_var_name")
-
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
@@ -1224,79 +1162,67 @@ def _cached_var_name(self) -> str:
else ImmutableVar.create_safe("undefined")
)
if step is None:
- return (
- f"{str(self.a)}.slice({str(normalized_start)}, {str(normalized_end)})"
- )
+ return f"{str(self._array)}.slice({str(normalized_start)}, {str(normalized_end)})"
if not isinstance(step, Var):
if step < 0:
actual_start = end + 1 if end is not None else 0
- actual_end = start + 1 if start is not None else self.a.length()
+ actual_end = start + 1 if start is not None else self._array.length()
return str(
- ArraySliceOperation(
- ArrayReverseOperation(
- ArraySliceOperation(self.a, slice(actual_start, actual_end))
+ ArraySliceOperation.create(
+ ArrayReverseOperation.create(
+ ArraySliceOperation.create(
+ self._array, slice(actual_start, actual_end)
+ )
),
slice(None, None, -step),
)
)
if step == 0:
raise ValueError("slice step cannot be zero")
- return f"{str(self.a)}.slice({str(normalized_start)}, {str(normalized_end)}).filter((_, i) => i % {str(step)} === 0)"
+ return f"{str(self._array)}.slice({str(normalized_start)}, {str(normalized_end)}).filter((_, i) => i % {str(step)} === 0)"
actual_start_reverse = end + 1 if end is not None else 0
- actual_end_reverse = start + 1 if start is not None else self.a.length()
+ actual_end_reverse = start + 1 if start is not None else self._array.length()
- return f"{str(self.step)} > 0 ? {str(self.a)}.slice({str(normalized_start)}, {str(normalized_end)}).filter((_, i) => i % {str(step)} === 0) : {str(self.a)}.slice({str(actual_start_reverse)}, {str(actual_end_reverse)}).reverse().filter((_, i) => i % {str(-step)} === 0)"
+ return f"{str(self.step)} > 0 ? {str(self._array)}.slice({str(normalized_start)}, {str(normalized_end)}).filter((_, i) => i % {str(step)} === 0) : {str(self._array)}.slice({str(actual_start_reverse)}, {str(actual_end_reverse)}).reverse().filter((_, i) => i % {str(-step)} === 0)"
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
+ @classmethod
+ def create(
+ cls,
+ array: ArrayVar,
+ slice: slice,
+ _var_data: VarData | None = None,
+ ) -> ArraySliceOperation:
+ """Create a var from a string value.
Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(ArraySliceOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
+ array: The array.
+ slice: The slice.
+ _var_data: Additional hooks and imports associated with the Var.
Returns:
- The VarData of the components and all of its children.
+ The var.
"""
- return ImmutableVarData.merge(
- self.a._get_all_var_data(),
- *[
- slice_value._get_all_var_data()
- for slice_value in (
- self._slice.start,
- self._slice.stop,
- self._slice.step,
- )
- if slice_value is not None and isinstance(slice_value, Var)
- ],
- self._var_data,
+ return cls(
+ _var_name="",
+ _var_type=array._var_type,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _array=array,
+ _slice=slice,
)
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
class ArrayReverseOperation(ArrayToArrayOperation):
"""Base class for immutable string vars that are the result of a string reverse operation."""
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
Returns:
The name of the var.
"""
- return f"{str(self.a)}.reverse()"
+ return f"{str(self._value)}.slice().reverse()"
@dataclasses.dataclass(
@@ -1304,29 +1230,14 @@ def _cached_var_name(self) -> str:
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class ArrayToNumberOperation(NumberVar):
+class ArrayToNumberOperation(CachedVarOperation, NumberVar):
"""Base class for immutable number vars that are the result of an array to number operation."""
- a: ArrayVar = dataclasses.field(
- default_factory=lambda: LiteralArrayVar([]),
+ _array: ArrayVar = dataclasses.field(
+ default_factory=lambda: LiteralArrayVar.create([]),
)
- def __init__(self, a: ArrayVar, _var_data: VarData | None = None):
- """Initialize the string to number operation var.
-
- Args:
- a: The array.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(ArrayToNumberOperation, self).__init__(
- _var_name="",
- _var_type=int,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "a", a if isinstance(a, Var) else LiteralArrayVar(a))
- object.__delattr__(self, "_var_name")
-
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
@@ -1337,43 +1248,40 @@ def _cached_var_name(self) -> str:
"StringToNumberOperation must implement _cached_var_name"
)
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
+ @classmethod
+ def create(
+ cls,
+ array: ArrayVar,
+ _var_data: VarData | None = None,
+ ) -> ArrayToNumberOperation:
+ """Create a var from a string value.
Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(ArrayToNumberOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
+ array: The array.
+ _var_data: Additional hooks and imports associated with the Var.
Returns:
- The VarData of the components and all of its children.
+ The var.
"""
- return ImmutableVarData.merge(self.a._get_all_var_data(), self._var_data)
-
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
+ return cls(
+ _var_name="",
+ _var_type=int,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _array=array,
+ )
class ArrayLengthOperation(ArrayToNumberOperation):
"""Base class for immutable number vars that are the result of an array length operation."""
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
Returns:
The name of the var.
"""
- return f"{str(self.a)}.length"
+ return f"{str(self._array)}.length"
def is_tuple_type(t: GenericType) -> bool:
@@ -1395,370 +1303,348 @@ def is_tuple_type(t: GenericType) -> bool:
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class ArrayItemOperation(ImmutableVar):
+class ArrayItemOperation(CachedVarOperation, ImmutableVar):
"""Base class for immutable array vars that are the result of an array item operation."""
- a: ArrayVar = dataclasses.field(default_factory=lambda: LiteralArrayVar([]))
- i: NumberVar = dataclasses.field(default_factory=lambda: LiteralNumberVar(0))
-
- def __init__(
- self,
- a: ArrayVar,
- i: NumberVar | int,
- _var_data: VarData | None = None,
- ):
- """Initialize the array item operation var.
-
- Args:
- a: The array.
- i: The index.
- _var_data: Additional hooks and imports associated with the Var.
- """
- args = typing.get_args(a._var_type)
- if args and isinstance(i, int) and is_tuple_type(a._var_type):
- element_type = args[i % len(args)]
- else:
- element_type = unionize(*args)
- super(ArrayItemOperation, self).__init__(
- _var_name="",
- _var_type=element_type,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "a", a if isinstance(a, Var) else LiteralArrayVar(a))
- object.__setattr__(
- self,
- "i",
- i if isinstance(i, Var) else LiteralNumberVar(i),
- )
- object.__delattr__(self, "_var_name")
+ _array: ArrayVar = dataclasses.field(
+ default_factory=lambda: LiteralArrayVar.create([])
+ )
+ _index: NumberVar = dataclasses.field(
+ default_factory=lambda: LiteralNumberVar.create(0)
+ )
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
Returns:
The name of the var.
"""
- return f"{str(self.a)}.at({str(self.i)})"
+ return f"{str(self._array)}.at({str(self._index)})"
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
+ @classmethod
+ def create(
+ cls,
+ array: ArrayVar,
+ index: NumberVar | int,
+ _var_type: GenericType | None = None,
+ _var_data: VarData | None = None,
+ ) -> ArrayItemOperation:
+ """Create a var from a string value.
Args:
- name: The name of the attribute.
+ array: The array.
+ index: The index.
+ _var_data: Additional hooks and imports associated with the Var.
Returns:
- The attribute value.
+ The var.
"""
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(ArrayItemOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
+ args = typing.get_args(array._var_type)
+ if args and isinstance(index, int) and is_tuple_type(array._var_type):
+ element_type = args[index % len(args)]
+ else:
+ element_type = unionize(*args)
- Returns:
- The VarData of the components and all of its children.
- """
- return ImmutableVarData.merge(
- self.a._get_all_var_data(), self.i._get_all_var_data(), self._var_data
+ return cls(
+ _var_name="",
+ _var_type=element_type if _var_type is None else _var_type,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _array=array,
+ _index=index if isinstance(index, Var) else LiteralNumberVar.create(index),
)
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
@dataclasses.dataclass(
eq=False,
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class RangeOperation(ArrayVar):
+class RangeOperation(CachedVarOperation, ArrayVar):
"""Base class for immutable array vars that are the result of a range operation."""
- start: NumberVar = dataclasses.field(default_factory=lambda: LiteralNumberVar(0))
- end: NumberVar = dataclasses.field(default_factory=lambda: LiteralNumberVar(0))
- step: NumberVar = dataclasses.field(default_factory=lambda: LiteralNumberVar(1))
-
- def __init__(
- self,
- start: NumberVar | int,
- end: NumberVar | int,
- step: NumberVar | int,
- _var_data: VarData | None = None,
- ):
- """Initialize the range operation var.
-
- Args:
- start: The start of the range.
- end: The end of the range.
- step: The step of the range.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(RangeOperation, self).__init__(
- _var_name="",
- _var_type=List[int],
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(
- self,
- "start",
- start if isinstance(start, Var) else LiteralNumberVar(start),
- )
- object.__setattr__(
- self,
- "end",
- end if isinstance(end, Var) else LiteralNumberVar(end),
- )
- object.__setattr__(
- self,
- "step",
- step if isinstance(step, Var) else LiteralNumberVar(step),
- )
- object.__delattr__(self, "_var_name")
+ _start: NumberVar = dataclasses.field(
+ default_factory=lambda: LiteralNumberVar.create(0)
+ )
+ _stop: NumberVar = dataclasses.field(
+ default_factory=lambda: LiteralNumberVar.create(0)
+ )
+ _step: NumberVar = dataclasses.field(
+ default_factory=lambda: LiteralNumberVar.create(1)
+ )
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
Returns:
The name of the var.
"""
- start, end, step = self.start, self.end, self.step
+ start, end, step = self._start, self._stop, self._step
return f"Array.from({{ length: ({str(end)} - {str(start)}) / {str(step)} }}, (_, i) => {str(start)} + i * {str(step)})"
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
+ @classmethod
+ def create(
+ cls,
+ start: NumberVar | int,
+ stop: NumberVar | int,
+ step: NumberVar | int,
+ _var_data: VarData | None = None,
+ ) -> RangeOperation:
+ """Create a var from a string value.
Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(RangeOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
+ start: The start of the range.
+ stop: The end of the range.
+ step: The step of the range.
+ _var_data: Additional hooks and imports associated with the Var.
Returns:
- The VarData of the components and all of its children.
+ The var.
"""
- return ImmutableVarData.merge(
- self.start._get_all_var_data(),
- self.end._get_all_var_data(),
- self.step._get_all_var_data(),
- self._var_data,
+ return cls(
+ _var_name="",
+ _var_type=List[int],
+ _var_data=ImmutableVarData.merge(_var_data),
+ _start=start if isinstance(start, Var) else LiteralNumberVar.create(start),
+ _stop=stop if isinstance(stop, Var) else LiteralNumberVar.create(stop),
+ _step=step if isinstance(step, Var) else LiteralNumberVar.create(step),
)
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
@dataclasses.dataclass(
eq=False,
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class ArrayContainsOperation(BooleanVar):
+class ArrayContainsOperation(CachedVarOperation, BooleanVar):
"""Base class for immutable boolean vars that are the result of an array contains operation."""
- a: ArrayVar = dataclasses.field(default_factory=lambda: LiteralArrayVar([]))
- b: Var = dataclasses.field(default_factory=lambda: LiteralVar.create(None))
-
- def __init__(self, a: ArrayVar, b: Any | Var, _var_data: VarData | None = None):
- """Initialize the array contains operation var.
-
- Args:
- a: The array.
- b: The element to check for.
- _var_data: Additional hooks and imports associated with the Var.
- """
- super(ArrayContainsOperation, self).__init__(
- _var_name="",
- _var_type=bool,
- _var_data=ImmutableVarData.merge(_var_data),
- )
- object.__setattr__(self, "a", a)
- object.__setattr__(self, "b", b if isinstance(b, Var) else LiteralVar.create(b))
- object.__delattr__(self, "_var_name")
+ _haystack: ArrayVar = dataclasses.field(
+ default_factory=lambda: LiteralArrayVar.create([])
+ )
+ _needle: Var = dataclasses.field(default_factory=lambda: LiteralVar.create(None))
- @cached_property
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
Returns:
The name of the var.
"""
- return f"{str(self.a)}.includes({str(self.b)})"
+ return f"{str(self._haystack)}.includes({str(self._needle)})"
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
+ @classmethod
+ def create(
+ cls,
+ haystack: ArrayVar,
+ needle: Any | Var,
+ _var_data: VarData | None = None,
+ ) -> ArrayContainsOperation:
+ """Create a var from a string value.
Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(ArrayContainsOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
+ haystack: The array.
+ needle: The element to check for.
+ _var_data: Additional hooks and imports associated with the Var.
Returns:
- The VarData of the components and all of its children.
+ The var.
"""
- return ImmutableVarData.merge(
- self.a._get_all_var_data(), self.b._get_all_var_data(), self._var_data
+ return cls(
+ _var_name="",
+ _var_type=bool,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _haystack=haystack,
+ _needle=needle if isinstance(needle, Var) else LiteralVar.create(needle),
)
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
@dataclasses.dataclass(
eq=False,
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class ToStringOperation(StringVar):
+class ToStringOperation(CachedVarOperation, StringVar):
"""Base class for immutable string vars that are the result of a to string operation."""
- original_var: Var = dataclasses.field(
+ _original_var: Var = dataclasses.field(
default_factory=lambda: LiteralStringVar.create("")
)
- def __init__(self, original_var: Var, _var_data: VarData | None = None):
- """Initialize the to string operation var.
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return str(self._original_var)
+
+ @classmethod
+ def create(
+ cls,
+ original_var: Var,
+ _var_data: VarData | None = None,
+ ) -> ToStringOperation:
+ """Create a var from a string value.
Args:
original_var: The original var.
_var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The var.
"""
- super(ToStringOperation, self).__init__(
+ return cls(
_var_name="",
_var_type=str,
_var_data=ImmutableVarData.merge(_var_data),
+ _original_var=original_var,
)
- object.__setattr__(
- self,
- "original_var",
- original_var,
- )
- object.__delattr__(self, "_var_name")
- @cached_property
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class ToArrayOperation(CachedVarOperation, ArrayVar):
+ """Base class for immutable array vars that are the result of a to array operation."""
+
+ _original_var: Var = dataclasses.field(
+ default_factory=lambda: LiteralArrayVar.create([])
+ )
+
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
Returns:
The name of the var.
"""
- return str(self.original_var)
+ return str(self._original_var)
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
+ @classmethod
+ def create(
+ cls,
+ original_var: Var,
+ _var_type: type[list] | type[set] | type[tuple] | None = None,
+ _var_data: VarData | None = None,
+ ) -> ToArrayOperation:
+ """Create a var from a string value.
Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(ToStringOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
+ original_var: The original var.
+ _var_data: Additional hooks and imports associated with the Var.
Returns:
- The VarData of the components and all of its children.
+ The var.
"""
- return ImmutableVarData.merge(
- self.original_var._get_all_var_data(), self._var_data
+ return cls(
+ _var_name="",
+ _var_type=list if _var_type is None else _var_type,
+ _var_data=ImmutableVarData.merge(_var_data),
+ _original_var=original_var,
)
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
-
@dataclasses.dataclass(
eq=False,
frozen=True,
**{"slots": True} if sys.version_info >= (3, 10) else {},
)
-class ToArrayOperation(ArrayVar):
- """Base class for immutable array vars that are the result of a to array operation."""
+class ArrayRepeatOperation(CachedVarOperation, ArrayVar):
+ """Base class for immutable array vars that are the result of an array repeat operation."""
- original_var: Var = dataclasses.field(default_factory=lambda: LiteralArrayVar([]))
+ _array: ArrayVar = dataclasses.field(
+ default_factory=lambda: LiteralArrayVar.create([])
+ )
+ _count: NumberVar = dataclasses.field(
+ default_factory=lambda: LiteralNumberVar.create(0)
+ )
- def __init__(
- self,
- original_var: Var,
- _var_type: type[list] | type[set] | type[tuple] = list,
+ @cached_property_no_lock
+ def _cached_var_name(self) -> str:
+ """The name of the var.
+
+ Returns:
+ The name of the var.
+ """
+ return f"Array.from({{ length: {str(self._count)} }}).flatMap(() => {str(self._array)})"
+
+ @classmethod
+ def create(
+ cls,
+ array: ArrayVar,
+ count: NumberVar | int,
_var_data: VarData | None = None,
- ):
- """Initialize the to array operation var.
+ ) -> ArrayRepeatOperation:
+ """Create a var from a string value.
Args:
- original_var: The original var.
- _var_type: The type of the array.
+ array: The array.
+ count: The number of times to repeat the array.
_var_data: Additional hooks and imports associated with the Var.
+
+ Returns:
+ The var.
"""
- super(ToArrayOperation, self).__init__(
+ return cls(
_var_name="",
- _var_type=_var_type,
+ _var_type=array._var_type,
_var_data=ImmutableVarData.merge(_var_data),
+ _array=array,
+ _count=count if isinstance(count, Var) else LiteralNumberVar.create(count),
)
- object.__setattr__(
- self,
- "original_var",
- original_var,
- )
- object.__delattr__(self, "_var_name")
- @cached_property
+
+@dataclasses.dataclass(
+ eq=False,
+ frozen=True,
+ **{"slots": True} if sys.version_info >= (3, 10) else {},
+)
+class ArrayConcatOperation(CachedVarOperation, ArrayVar):
+ """Base class for immutable array vars that are the result of an array concat operation."""
+
+ _lhs: ArrayVar = dataclasses.field(
+ default_factory=lambda: LiteralArrayVar.create([])
+ )
+ _rhs: ArrayVar = dataclasses.field(
+ default_factory=lambda: LiteralArrayVar.create([])
+ )
+
+ @cached_property_no_lock
def _cached_var_name(self) -> str:
"""The name of the var.
Returns:
The name of the var.
"""
- return str(self.original_var)
+ return f"[...{str(self._lhs)}, ...{str(self._rhs)}]"
- def __getattr__(self, name: str) -> Any:
- """Get an attribute of the var.
+ @classmethod
+ def create(
+ cls,
+ lhs: ArrayVar,
+ rhs: ArrayVar,
+ _var_data: VarData | None = None,
+ ) -> ArrayConcatOperation:
+ """Create a var from a string value.
Args:
- name: The name of the attribute.
-
- Returns:
- The attribute value.
- """
- if name == "_var_name":
- return self._cached_var_name
- getattr(super(ToArrayOperation, self), name)
-
- @cached_property
- def _cached_get_all_var_data(self) -> ImmutableVarData | None:
- """Get all VarData associated with the Var.
+ lhs: The left-hand side array.
+ rhs: The right-hand side array.
+ _var_data: Additional hooks and imports associated with the Var.
Returns:
- The VarData of the components and all of its children.
+ The var.
"""
- return ImmutableVarData.merge(
- self.original_var._get_all_var_data(), self._var_data
+ # TODO: Figure out how to merge the types of a and b
+ return cls(
+ _var_name="",
+ _var_type=Union[lhs._var_type, rhs._var_type],
+ _var_data=ImmutableVarData.merge(_var_data),
+ _lhs=lhs,
+ _rhs=rhs,
)
-
- def _get_all_var_data(self) -> ImmutableVarData | None:
- return self._cached_get_all_var_data
diff --git a/reflex/state.py b/reflex/state.py
index 228530fdace..6712edd81b5 100644
--- a/reflex/state.py
+++ b/reflex/state.py
@@ -32,6 +32,7 @@
from sqlalchemy.orm import DeclarativeBase
from reflex.config import get_config
+from reflex.ivars.base import ImmutableComputedVar, ImmutableVar, immutable_computed_var
try:
import pydantic.v1 as pydantic
@@ -56,14 +57,18 @@
from reflex.utils.exec import is_testing_env
from reflex.utils.serializers import SerializedType, serialize, serializer
from reflex.utils.types import override
-from reflex.vars import BaseVar, ComputedVar, Var, computed_var
+from reflex.vars import (
+ ComputedVar,
+ ImmutableVarData,
+ Var,
+)
if TYPE_CHECKING:
from reflex.components.component import Component
Delta = Dict[str, Any]
-var = computed_var
+var = immutable_computed_var
# If the state is this large, it's considered a performance issue.
@@ -299,10 +304,10 @@ class BaseState(Base, ABC, extra=pydantic.Extra.allow):
vars: ClassVar[Dict[str, Var]] = {}
# The base vars of the class.
- base_vars: ClassVar[Dict[str, BaseVar]] = {}
+ base_vars: ClassVar[Dict[str, ImmutableVar]] = {}
# The computed vars of the class.
- computed_vars: ClassVar[Dict[str, ComputedVar]] = {}
+ computed_vars: ClassVar[Dict[str, Union[ComputedVar, ImmutableComputedVar]]] = {}
# Vars inherited by the parent state.
inherited_vars: ClassVar[Dict[str, Var]] = {}
@@ -415,7 +420,7 @@ def __repr__(self) -> str:
return f"{self.__class__.__name__}({self.dict()})"
@classmethod
- def _get_computed_vars(cls) -> list[ComputedVar]:
+ def _get_computed_vars(cls) -> list[Union[ComputedVar, ImmutableComputedVar]]:
"""Helper function to get all computed vars of a instance.
Returns:
@@ -425,7 +430,7 @@ def _get_computed_vars(cls) -> list[ComputedVar]:
v
for mixin in cls._mixins() + [cls]
for v in mixin.__dict__.values()
- if isinstance(v, ComputedVar)
+ if isinstance(v, (ComputedVar, ImmutableComputedVar))
]
@classmethod
@@ -521,13 +526,18 @@ def __init_subclass__(cls, mixin: bool = False, **kwargs):
# Set the base and computed vars.
cls.base_vars = {
- f.name: BaseVar(_var_name=f.name, _var_type=f.outer_type_)._var_set_state(
- cls
- )
+ f.name: ImmutableVar(
+ _var_name=format.format_state_name(cls.get_full_name()) + "." + f.name,
+ _var_type=f.outer_type_,
+ _var_data=ImmutableVarData.from_state(cls),
+ ).guess_type()
for f in cls.get_fields().values()
if f.name not in cls.get_skip_vars()
}
- cls.computed_vars = {v._var_name: v._var_set_state(cls) for v in computed_vars}
+ cls.computed_vars = {
+ v._var_name: v._replace(merge_var_data=ImmutableVarData.from_state(cls))
+ for v in computed_vars
+ }
cls.vars = {
**cls.inherited_vars,
**cls.base_vars,
@@ -548,12 +558,12 @@ def __init_subclass__(cls, mixin: bool = False, **kwargs):
for mixin in cls._mixins():
for name, value in mixin.__dict__.items():
- if isinstance(value, ComputedVar):
+ if isinstance(value, (ComputedVar, ImmutableComputedVar)):
fget = cls._copy_fn(value.fget)
- newcv = value._replace(fget=fget)
+ newcv = value._replace(
+ fget=fget, _var_data=ImmutableVarData.from_state(cls)
+ )
# cleanup refs to mixin cls in var_data
- newcv._var_data = None
- newcv._var_set_state(cls)
setattr(cls, name, newcv)
cls.computed_vars[newcv._var_name] = newcv
cls.vars[newcv._var_name] = newcv
@@ -847,7 +857,7 @@ def get_class_var(cls, path: Sequence[str]) -> Any:
return getattr(substate, name)
@classmethod
- def _init_var(cls, prop: BaseVar):
+ def _init_var(cls, prop: ImmutableVar):
"""Initialize a variable.
Args:
@@ -890,8 +900,11 @@ def add_var(cls, name: str, type_: Any, default_value: Any = None):
)
# create the variable based on name and type
- var = BaseVar(_var_name=name, _var_type=type_)
- var._var_set_state(cls)
+ var = ImmutableVar(
+ _var_name=format.format_state_name(cls.get_full_name()) + "." + name,
+ _var_type=type_,
+ _var_data=ImmutableVarData.from_state(cls),
+ ).guess_type()
# add the pydantic field dynamically (must be done before _init_var)
cls.add_field(var, default_value)
@@ -910,13 +923,18 @@ def add_var(cls, name: str, type_: Any, default_value: Any = None):
cls._init_var_dependency_dicts()
@classmethod
- def _set_var(cls, prop: BaseVar):
+ def _set_var(cls, prop: ImmutableVar):
"""Set the var as a class member.
Args:
prop: The var instance to set.
"""
- setattr(cls, prop._var_name, prop)
+ acutal_var_name = (
+ prop._var_name
+ if "." not in prop._var_name
+ else prop._var_name.split(".")[-1]
+ )
+ setattr(cls, acutal_var_name, prop)
@classmethod
def _create_event_handler(cls, fn):
@@ -936,7 +954,7 @@ def _create_setvar(cls):
cls.setvar = cls.event_handlers["setvar"] = EventHandlerSetVar(state_cls=cls)
@classmethod
- def _create_setter(cls, prop: BaseVar):
+ def _create_setter(cls, prop: ImmutableVar):
"""Create a setter for the var.
Args:
@@ -949,14 +967,17 @@ def _create_setter(cls, prop: BaseVar):
setattr(cls, setter_name, event_handler)
@classmethod
- def _set_default_value(cls, prop: BaseVar):
+ def _set_default_value(cls, prop: ImmutableVar):
"""Set the default value for the var.
Args:
prop: The var to set the default value for.
"""
# Get the pydantic field for the var.
- field = cls.get_fields()[prop._var_name]
+ if "." in prop._var_name:
+ field = cls.get_fields()[prop._var_name.split(".")[-1]]
+ else:
+ field = cls.get_fields()[prop._var_name]
if field.required:
default_value = prop.get_default_value()
if default_value is not None:
@@ -968,7 +989,7 @@ def _set_default_value(cls, prop: BaseVar):
and not types.is_optional(prop._var_type)
):
# Ensure frontend uses null coalescing when accessing.
- prop._var_type = Optional[prop._var_type]
+ object.__setattr__(prop, "_var_type", Optional[prop._var_type])
@staticmethod
def _get_base_functions() -> dict[str, FunctionType]:
@@ -1774,7 +1795,7 @@ def dict(
# Include initial computed vars.
prop_name: (
cv._initial_value
- if isinstance(cv, ComputedVar)
+ if isinstance(cv, (ComputedVar, ImmutableComputedVar))
and not isinstance(cv._initial_value, types.Unset)
else self.get_value(getattr(self, prop_name))
)
diff --git a/reflex/style.py b/reflex/style.py
index 69e93ed398e..a2083f6344d 100644
--- a/reflex/style.py
+++ b/reflex/style.py
@@ -7,9 +7,11 @@
from reflex import constants
from reflex.components.core.breakpoints import Breakpoints, breakpoints_values
from reflex.event import EventChain
+from reflex.ivars.base import ImmutableCallableVar, ImmutableVar, LiteralVar
+from reflex.ivars.function import FunctionVar
from reflex.utils import format
from reflex.utils.imports import ImportVar
-from reflex.vars import BaseVar, CallableVar, Var, VarData
+from reflex.vars import ImmutableVarData, Var, VarData
VarData.update_forward_refs() # Ensure all type definitions are resolved
@@ -25,7 +27,7 @@
}
-def _color_mode_var(_var_name: str, _var_type: Type = str) -> BaseVar:
+def _color_mode_var(_var_name: str, _var_type: Type = str) -> ImmutableVar:
"""Create a Var that destructs the _var_name from ColorModeContext.
Args:
@@ -33,24 +35,22 @@ def _color_mode_var(_var_name: str, _var_type: Type = str) -> BaseVar:
_var_type: The type of the Var.
Returns:
- The BaseVar for accessing _var_name from ColorModeContext.
+ The Var that resolves to the color mode.
"""
- return BaseVar(
+ return ImmutableVar(
_var_name=_var_name,
_var_type=_var_type,
- _var_is_local=False,
- _var_is_string=False,
- _var_data=VarData(
+ _var_data=ImmutableVarData(
imports=color_mode_imports,
hooks={f"const {{ {_var_name} }} = useContext(ColorModeContext)": None},
),
- )
+ ).guess_type()
-@CallableVar
+@ImmutableCallableVar
def set_color_mode(
new_color_mode: LiteralColorMode | Var[LiteralColorMode] | None = None,
-) -> BaseVar[EventChain]:
+) -> Var[EventChain]:
"""Create an EventChain Var that sets the color mode to a specific value.
Note: `set_color_mode` is not a real event and cannot be triggered from a
@@ -70,11 +70,14 @@ def set_color_mode(
return base_setter
if not isinstance(new_color_mode, Var):
- new_color_mode = Var.create_safe(new_color_mode, _var_is_string=True)
- return base_setter._replace(
- _var_name=f"() => {base_setter._var_name}({new_color_mode._var_name_unwrapped})",
- merge_var_data=new_color_mode._var_data,
- )
+ new_color_mode = LiteralVar.create(new_color_mode)
+
+ return ImmutableVar(
+ f"() => {str(base_setter)}({str(new_color_mode)})",
+ _var_data=ImmutableVarData.merge(
+ base_setter._get_all_var_data(), new_color_mode._get_all_var_data()
+ ),
+ ).to(FunctionVar, EventChain)
# Var resolves to the current color mode for the app ("light", "dark" or "system")
@@ -111,7 +114,9 @@ def media_query(breakpoint_expr: str):
return f"@media screen and (min-width: {breakpoint_expr})"
-def convert_item(style_item: str | Var) -> tuple[str, VarData | None]:
+def convert_item(
+ style_item: int | str | Var,
+) -> tuple[str | Var, VarData | ImmutableVarData | None]:
"""Format a single value in a style dictionary.
Args:
@@ -121,21 +126,20 @@ def convert_item(style_item: str | Var) -> tuple[str, VarData | None]:
The formatted style item and any associated VarData.
"""
if isinstance(style_item, Var):
- # If the value is a Var, extract the var_data and cast as str.
- return str(style_item), style_item._var_data
+ return style_item, style_item._get_all_var_data()
- # Otherwise, convert to Var to collapse VarData encoded in f-string.
- new_var = Var.create(style_item, _var_is_string=False)
- if new_var is not None and new_var._var_data:
- # The wrapped backtick is used to identify the Var for interpolation.
- return f"`{str(new_var)}`", new_var._var_data
+ # if isinstance(style_item, str) and REFLEX_VAR_OPENING_TAG not in style_item:
+ # return style_item, None
- return style_item, None
+ # Otherwise, convert to Var to collapse VarData encoded in f-string.
+ new_var = LiteralVar.create(style_item)
+ var_data = new_var._get_all_var_data() if new_var is not None else None
+ return new_var, var_data
def convert_list(
responsive_list: list[str | dict | Var],
-) -> tuple[list[str | dict], VarData | None]:
+) -> tuple[list[str | dict[str, Var | list | dict]], VarData | None]:
"""Format a responsive value list.
Args:
@@ -157,7 +161,9 @@ def convert_list(
return converted_value, VarData.merge(*item_var_datas)
-def convert(style_dict):
+def convert(
+ style_dict: dict[str, Var | dict | list | str],
+) -> tuple[dict[str, str | list | dict], VarData | None]:
"""Format a style dictionary.
Args:
@@ -175,7 +181,11 @@ def update_out_dict(return_value, keys_to_update):
for key, value in style_dict.items():
keys = format_style_key(key)
- if isinstance(value, dict):
+ if isinstance(value, Var):
+ return_val = value
+ new_var_data = value._get_all_var_data()
+ update_out_dict(return_val, keys)
+ elif isinstance(value, dict):
# Recursively format nested style dictionaries.
return_val, new_var_data = convert(value)
update_out_dict(return_val, keys)
@@ -254,10 +264,10 @@ def __setitem__(self, key: str, value: Any):
value: The value to set.
"""
# Create a Var to collapse VarData encoded in f-string.
- _var = Var.create(value, _var_is_string=False)
+ _var = LiteralVar.create(value)
if _var is not None:
# Carry the imports/hooks when setting a Var as a value.
- self._var_data = VarData.merge(self._var_data, _var._var_data)
+ self._var_data = VarData.merge(self._var_data, _var._get_all_var_data())
super().__setitem__(key, value)
diff --git a/reflex/utils/format.py b/reflex/utils/format.py
index 59bbbd91cfe..e7d85a93e82 100644
--- a/reflex/utils/format.py
+++ b/reflex/utils/format.py
@@ -272,8 +272,10 @@ def format_f_string_prop(prop: BaseVar) -> str:
Returns:
The formatted string.
"""
+ from reflex.ivars.base import VarData
+
s = prop._var_full_name
- var_data = prop._var_data
+ var_data = VarData.merge(prop._get_all_var_data())
interps = var_data.interpolations if var_data else []
parts: List[str] = []
@@ -421,6 +423,7 @@ def format_prop(
# import here to avoid circular import.
from reflex.event import EventChain
from reflex.utils import serializers
+ from reflex.vars import VarData
try:
# Handle var props.
@@ -428,7 +431,8 @@ def format_prop(
if not prop._var_is_local or prop._var_is_string:
return str(prop)
if isinstance(prop, BaseVar) and types._issubclass(prop._var_type, str):
- if prop._var_data and prop._var_data.interpolations:
+ var_data = VarData.merge(prop._get_all_var_data())
+ if var_data and var_data.interpolations:
return format_f_string_prop(prop)
return format_string(prop._var_full_name)
prop = prop._var_full_name
@@ -483,11 +487,26 @@ def format_props(*single_props, **key_value_props) -> list[str]:
The formatted props list.
"""
# Format all the props.
+ from reflex.ivars.base import ImmutableVar, LiteralVar
+
return [
- f"{name}={format_prop(prop)}"
+ (
+ f"{name}={format_prop(prop)}"
+ if isinstance(prop, Var) and not isinstance(prop, ImmutableVar)
+ else (
+ f"{name}={{{format_prop(prop if isinstance(prop, Var) else LiteralVar.create(prop))}}}"
+ )
+ )
for name, prop in sorted(key_value_props.items())
if prop is not None
- ] + [str(prop) for prop in single_props]
+ ] + [
+ (
+ str(prop)
+ if isinstance(prop, Var) and not isinstance(prop, ImmutableVar)
+ else f"{{{str(LiteralVar.create(prop))}}}"
+ )
+ for prop in single_props
+ ]
def get_event_handler_parts(handler: EventHandler) -> tuple[str, str]:
@@ -502,13 +521,13 @@ def get_event_handler_parts(handler: EventHandler) -> tuple[str, str]:
# Get the class that defines the event handler.
parts = handler.fn.__qualname__.split(".")
- # If there's no enclosing class, just return the function name.
- if len(parts) == 1:
- return ("", parts[-1])
-
# Get the state full name
state_full_name = handler.state_full_name
+ # If there's no enclosing class, just return the function name.
+ if not state_full_name:
+ return ("", parts[-1])
+
# Get the function name
name = parts[-1]
@@ -613,11 +632,13 @@ def format_event_chain(
def format_queue_events(
- events: EventSpec
- | EventHandler
- | Callable
- | List[EventSpec | EventHandler | Callable]
- | None = None,
+ events: (
+ EventSpec
+ | EventHandler
+ | Callable
+ | List[EventSpec | EventHandler | Callable]
+ | None
+ ) = None,
args_spec: Optional[ArgsSpec] = None,
) -> Var[EventChain]:
"""Format a list of event handler / event spec as a javascript callback.
@@ -645,11 +666,10 @@ def format_queue_events(
call_event_fn,
call_event_handler,
)
+ from reflex.ivars import FunctionVar, ImmutableVar
if not events:
- return Var.create_safe(
- "() => null", _var_is_string=False, _var_is_local=False
- ).to(EventChain)
+ return ImmutableVar("(() => null)").to(FunctionVar, EventChain)
# If no spec is provided, the function will take no arguments.
def _default_args_spec():
@@ -682,12 +702,10 @@ def _default_args_spec():
# Return the final code snippet, expecting queueEvents, processEvent, and socket to be in scope.
# Typically this snippet will _only_ run from within an rx.call_script eval context.
- return Var.create_safe(
+ return ImmutableVar(
f"{arg_def} => {{queueEvents([{','.join(payloads)}], {constants.CompileVars.SOCKET}); "
f"processEvent({constants.CompileVars.SOCKET})}}",
- _var_is_string=False,
- _var_is_local=False,
- ).to(EventChain)
+ ).to(FunctionVar, EventChain)
def format_query_params(router_data: dict[str, Any]) -> dict[str, str]:
@@ -786,8 +804,8 @@ def format_array_ref(refs: str, idx: Var | None) -> str:
"""
clean_ref = re.sub(r"[^\w]+", "_", refs)
if idx is not None:
- idx._var_is_local = True
- return f"refs_{clean_ref}[{idx}]"
+ # idx._var_is_local = True
+ return f"refs_{clean_ref}[{str(idx)}]"
return f"refs_{clean_ref}"
@@ -938,7 +956,9 @@ def format_data_editor_cell(cell: Any):
Returns:
The formatted cell.
"""
+ from reflex.ivars.base import ImmutableVar
+
return {
- "kind": Var.create(value="GridCellKind.Text", _var_is_string=False),
+ "kind": ImmutableVar.create("GridCellKind.Text"),
"data": cell,
}
diff --git a/reflex/utils/pyi_generator.py b/reflex/utils/pyi_generator.py
index d279e3910c7..f96a4c04679 100644
--- a/reflex/utils/pyi_generator.py
+++ b/reflex/utils/pyi_generator.py
@@ -433,7 +433,7 @@ def _generate_component_create_functiondef(
ast.arg(
arg=trigger,
annotation=ast.Name(
- id="Optional[Union[EventHandler, EventSpec, list, Callable, BaseVar]]"
+ id="Optional[Union[EventHandler, EventSpec, list, Callable, Var]]"
),
),
ast.Constant(value=None),
diff --git a/reflex/utils/types.py b/reflex/utils/types.py
index 32438b9e684..c164bb93e93 100644
--- a/reflex/utils/types.py
+++ b/reflex/utils/types.py
@@ -491,10 +491,18 @@ def is_backend_base_variable(name: str, cls: Type) -> bool:
return False
if callable(value):
return False
+ from reflex.ivars.base import ImmutableComputedVar
from reflex.vars import ComputedVar
if isinstance(
- value, (types.FunctionType, property, cached_property, ComputedVar)
+ value,
+ (
+ types.FunctionType,
+ property,
+ cached_property,
+ ComputedVar,
+ ImmutableComputedVar,
+ ),
):
return False
diff --git a/reflex/vars.py b/reflex/vars.py
index 795ab4759ba..a3d40722d55 100644
--- a/reflex/vars.py
+++ b/reflex/vars.py
@@ -345,6 +345,33 @@ def __eq__(self, other: Any) -> bool:
== imports.collapse_imports(other.imports)
)
+ @classmethod
+ def from_state(cls, state: Type[BaseState] | str) -> ImmutableVarData:
+ """Set the state of the var.
+
+ Args:
+ state: The state to set or the full name of the state.
+
+ Returns:
+ The var with the set state.
+ """
+ from reflex.utils import format
+
+ state_name = state if isinstance(state, str) else state.get_full_name()
+ new_var_data = ImmutableVarData(
+ state=state_name,
+ hooks={
+ "const {0} = useContext(StateContexts.{0})".format(
+ format.format_state_name(state_name)
+ ): None
+ },
+ imports={
+ f"/{constants.Dirs.CONTEXTS_PATH}": [ImportVar(tag="StateContexts")],
+ "react": [ImportVar(tag="useContext")],
+ },
+ )
+ return new_var_data
+
def _decode_var_immutable(value: str) -> tuple[ImmutableVarData | None, str]:
"""Decode the state name from a formatted var.
@@ -384,7 +411,7 @@ def json_loads(s):
):
# This is a global immutable var.
var = _global_vars[int(serialized_data)]
- var_data = var._var_data
+ var_data = var._get_all_var_data()
if var_data is not None:
realstart = start + offset
@@ -727,7 +754,10 @@ def _decode(self) -> Any:
try:
return json.loads(self._var_name)
except ValueError:
- return self._var_name
+ try:
+ return json.loads(self.json())
+ except (ValueError, NotImplementedError):
+ return self._var_name
def equals(self, other: Var) -> bool:
"""Check if two vars are equal.
@@ -738,6 +768,16 @@ def equals(self, other: Var) -> bool:
Returns:
Whether the vars are equal.
"""
+ from reflex.ivars import ImmutableVar
+
+ if isinstance(other, ImmutableVar) or isinstance(self, ImmutableVar):
+ return (
+ self._var_name == other._var_name
+ and self._var_type == other._var_type
+ and ImmutableVarData.merge(self._get_all_var_data())
+ == ImmutableVarData.merge(other._get_all_var_data())
+ )
+
return (
self._var_name == other._var_name
and self._var_type == other._var_type
@@ -800,11 +840,19 @@ def __str__(self) -> str:
"""
from reflex.utils import format
- out = (
- self._var_full_name
- if self._var_is_local
- else format.wrap(self._var_full_name, "{")
- )
+ if self._var_is_local:
+ console.deprecate(
+ feature_name="Local Vars",
+ reason=(
+ "Setting _var_is_local to True does not have any effect anymore. "
+ "Use the new ImmutableVar instead."
+ ),
+ deprecation_version="0.5.9",
+ removal_version="0.6.0",
+ )
+ out = self._var_full_name
+ else:
+ out = format.wrap(self._var_full_name, "{")
if self._var_is_string:
out = format.format_string(out)
return out
@@ -1009,7 +1057,6 @@ def __getattr__(self, name: str) -> Var:
return self._replace(
_var_name=f"{self._var_name}{'?' if is_optional else ''}.{name}",
_var_type=type_,
- _var_is_string=False,
)
if name in REPLACED_NAMES:
diff --git a/reflex/vars.pyi b/reflex/vars.pyi
index 47d433374d9..8c923f03e0c 100644
--- a/reflex/vars.pyi
+++ b/reflex/vars.pyi
@@ -63,6 +63,8 @@ class ImmutableVarData:
def merge(
cls, *others: ImmutableVarData | VarData | None
) -> ImmutableVarData | None: ...
+ @classmethod
+ def from_state(cls, state: Type[BaseState] | str) -> ImmutableVarData: ...
def _decode_var_immutable(value: str) -> tuple[ImmutableVarData, str]: ...
@@ -150,8 +152,9 @@ class Var:
@property
def _var_full_name(self) -> str: ...
def _var_set_state(self, state: Type[BaseState] | str) -> Any: ...
- def _get_all_var_data(self) -> VarData: ...
+ def _get_all_var_data(self) -> VarData | ImmutableVarData: ...
def json(self) -> str: ...
+ def _type(self) -> Var: ...
@dataclass(eq=False)
class BaseVar(Var):
diff --git a/scripts/integration.sh b/scripts/integration.sh
index dc8b5d5537a..17ba66ec795 100755
--- a/scripts/integration.sh
+++ b/scripts/integration.sh
@@ -34,4 +34,4 @@ if [ -f /proc/$pid/winpid ]; then
echo "Windows detected, passing winpid $pid to port waiter"
fi
-python scripts/wait_for_listening_port.py $check_ports --timeout=900 --server-pid "$pid"
+python scripts/wait_for_listening_port.py $check_ports --timeout=1800 --server-pid "$pid"
diff --git a/tests/components/base/test_bare.py b/tests/components/base/test_bare.py
index 264d136cb0c..adc7ac1b05b 100644
--- a/tests/components/base/test_bare.py
+++ b/tests/components/base/test_bare.py
@@ -1,16 +1,21 @@
import pytest
from reflex.components.base.bare import Bare
+from reflex.ivars.base import ImmutableVar
+
+STATE_VAR = ImmutableVar.create_safe("default_state.name")
@pytest.mark.parametrize(
"contents,expected",
[
- ("hello", "hello"),
- ("{}", "{}"),
- (None, ""),
- ("${default_state.name}", "${default_state.name}"),
- ("{state.name}", "{state.name}"),
+ ("hello", '{"hello"}'),
+ ("{}", '{"{}"}'),
+ (None, '{""}'),
+ (STATE_VAR, "{default_state.name}"),
+ # This behavior is now unsupported.
+ # ("${default_state.name}", "${default_state.name}"),
+ # ("{state.name}", "{state.name}"),
],
)
def test_fstrings(contents, expected):
diff --git a/tests/components/base/test_script.py b/tests/components/base/test_script.py
index 372178d5f2d..c6b67da11c9 100644
--- a/tests/components/base/test_script.py
+++ b/tests/components/base/test_script.py
@@ -13,7 +13,7 @@ def test_script_inline():
assert render_dict["name"] == "Script"
assert not render_dict["contents"]
assert len(render_dict["children"]) == 1
- assert render_dict["children"][0]["contents"] == "{`let x = 42`}"
+ assert render_dict["children"][0]["contents"] == '{"let x = 42"}'
def test_script_src():
@@ -23,7 +23,7 @@ def test_script_src():
assert render_dict["name"] == "Script"
assert not render_dict["contents"]
assert not render_dict["children"]
- assert "src={`foo.js`}" in render_dict["props"]
+ assert 'src={"foo.js"}' in render_dict["props"]
def test_script_neither():
@@ -58,14 +58,14 @@ def test_script_event_handler():
)
render_dict = component.render()
assert (
- f'onReady={{(...args) => addEvents([Event("{EvState.get_full_name()}.on_ready", {{}})], args, {{}})}}'
+ f'onReady={{((...args) => ((addEvents([(Event("{EvState.get_full_name()}.on_ready", ({{ }})))], args, ({{ }})))))}}'
in render_dict["props"]
)
assert (
- f'onLoad={{(...args) => addEvents([Event("{EvState.get_full_name()}.on_load", {{}})], args, {{}})}}'
+ f'onLoad={{((...args) => ((addEvents([(Event("{EvState.get_full_name()}.on_load", ({{ }})))], args, ({{ }})))))}}'
in render_dict["props"]
)
assert (
- f'onError={{(...args) => addEvents([Event("{EvState.get_full_name()}.on_error", {{}})], args, {{}})}}'
+ f'onError={{((...args) => ((addEvents([(Event("{EvState.get_full_name()}.on_error", ({{ }})))], args, ({{ }})))))}}'
in render_dict["props"]
)
diff --git a/tests/components/core/test_banner.py b/tests/components/core/test_banner.py
index 184a65cc9e3..f46ee16b1ac 100644
--- a/tests/components/core/test_banner.py
+++ b/tests/components/core/test_banner.py
@@ -9,8 +9,11 @@
def test_websocket_target_url():
url = WebsocketTargetURL.create()
- _imports = url._get_all_imports(collapse=True)
- assert tuple(_imports) == ("/utils/state", "/env.json")
+ var_data = url._get_all_var_data()
+ assert var_data is not None
+ assert sorted(tuple((key for key, _ in var_data.imports))) == sorted(
+ ("/utils/state", "/env.json")
+ )
def test_connection_banner():
diff --git a/tests/components/core/test_colors.py b/tests/components/core/test_colors.py
index 0c14c8a7c10..d5d5dc9958f 100644
--- a/tests/components/core/test_colors.py
+++ b/tests/components/core/test_colors.py
@@ -3,7 +3,7 @@
import reflex as rx
from reflex.components.datadisplay.code import CodeBlock
from reflex.constants.colors import Color
-from reflex.vars import Var
+from reflex.ivars.base import LiteralVar
class ColorState(rx.State):
@@ -18,38 +18,38 @@ class ColorState(rx.State):
def create_color_var(color):
- return Var.create(color)
+ return LiteralVar.create(color)
@pytest.mark.parametrize(
"color, expected",
[
- (create_color_var(rx.color("mint")), "var(--mint-7)"),
- (create_color_var(rx.color("mint", 3)), "var(--mint-3)"),
- (create_color_var(rx.color("mint", 3, True)), "var(--mint-a3)"),
+ (create_color_var(rx.color("mint")), '"var(--mint-7)"'),
+ (create_color_var(rx.color("mint", 3)), '"var(--mint-3)"'),
+ (create_color_var(rx.color("mint", 3, True)), '"var(--mint-a3)"'),
(
create_color_var(rx.color(ColorState.color, ColorState.shade)), # type: ignore
- f"var(--${{{color_state_name}.color}}-${{{color_state_name}.shade}})",
+ f'("var(--"+{str(color_state_name)}.color+"-"+{str(color_state_name)}.shade+")")',
),
(
create_color_var(rx.color(f"{ColorState.color}", f"{ColorState.shade}")), # type: ignore
- f"var(--${{{color_state_name}.color}}-${{{color_state_name}.shade}})",
+ f'("var(--"+{str(color_state_name)}.color+"-"+{str(color_state_name)}.shade+")")',
),
(
create_color_var(
rx.color(f"{ColorState.color_part}ato", f"{ColorState.shade}") # type: ignore
),
- f"var(--${{{color_state_name}.color_part}}ato-${{{color_state_name}.shade}})",
+ f'("var(--"+{str(color_state_name)}.color_part+"ato-"+{str(color_state_name)}.shade+")")',
),
(
create_color_var(f'{rx.color(ColorState.color, f"{ColorState.shade}")}'), # type: ignore
- f"var(--${{{color_state_name}.color}}-${{{color_state_name}.shade}})",
+ f'("var(--"+{str(color_state_name)}.color+"-"+{str(color_state_name)}.shade+")")',
),
(
create_color_var(
f'{rx.color(f"{ColorState.color}", f"{ColorState.shade}")}' # type: ignore
),
- f"var(--${{{color_state_name}.color}}-${{{color_state_name}.shade}})",
+ f'("var(--"+{str(color_state_name)}.color+"-"+{str(color_state_name)}.shade+")")',
),
],
)
@@ -67,11 +67,11 @@ def test_color(color, expected):
[
(
rx.cond(True, rx.color("mint"), rx.color("tomato", 5)),
- "{isTrue(true) ? `var(--mint-7)` : `var(--tomato-5)`}",
+ '(Boolean(true) ? "var(--mint-7)" : "var(--tomato-5)")',
),
(
rx.cond(True, rx.color(ColorState.color), rx.color(ColorState.color, 5)), # type: ignore
- f"{{isTrue(true) ? `var(--${{{color_state_name}.color}}-7)` : `var(--${{{color_state_name}.color}}-5)`}}",
+ f'(Boolean(true) ? ("var(--"+{str(color_state_name)}.color+"-7)") : ("var(--"+{str(color_state_name)}.color+"-5)"))',
),
(
rx.match(
@@ -80,9 +80,9 @@ def test_color(color, expected):
("second", rx.color("tomato", 5)),
rx.color(ColorState.color, 2), # type: ignore
),
- "{(() => { switch (JSON.stringify(`condition`)) {case JSON.stringify(`first`): return (`var(--mint-7)`);"
- " break;case JSON.stringify(`second`): return (`var(--tomato-5)`); break;default: "
- f"return (`var(--${{{color_state_name}.color}}-2)`); break;}};}})()}}",
+ '(() => { switch (JSON.stringify("condition")) {case JSON.stringify("first"): return ("var(--mint-7)");'
+ ' break;case JSON.stringify("second"): return ("var(--tomato-5)"); break;default: '
+ f'return (("var(--"+{str(color_state_name)}.color+"-2)")); break;}};}})()',
),
(
rx.match(
@@ -91,10 +91,10 @@ def test_color(color, expected):
("second", rx.color(ColorState.color, 5)), # type: ignore
rx.color(ColorState.color, 2), # type: ignore
),
- "{(() => { switch (JSON.stringify(`condition`)) {case JSON.stringify(`first`): "
- f"return (`var(--${{{color_state_name}.color}}-7)`); break;case JSON.stringify(`second`): "
- f"return (`var(--${{{color_state_name}.color}}-5)`); break;default: "
- f"return (`var(--${{{color_state_name}.color}}-2)`); break;}};}})()}}",
+ '(() => { switch (JSON.stringify("condition")) {case JSON.stringify("first"): '
+ f'return (("var(--"+{str(color_state_name)}.color+"-7)")); break;case JSON.stringify("second"): '
+ f'return (("var(--"+{str(color_state_name)}.color+"-5)")); break;default: '
+ f'return (("var(--"+{str(color_state_name)}.color+"-2)")); break;}};}})()',
),
],
)
@@ -105,12 +105,12 @@ def test_color_with_conditionals(cond_var, expected):
@pytest.mark.parametrize(
"color, expected",
[
- (create_color_var(rx.color("red")), "{`var(--red-7)`}"),
- (create_color_var(rx.color("green", shade=1)), "{`var(--green-1)`}"),
- (create_color_var(rx.color("blue", alpha=True)), "{`var(--blue-a7)`}"),
- ("red", "red"),
- ("green", "green"),
- ("blue", "blue"),
+ (create_color_var(rx.color("red")), '"var(--red-7)"'),
+ (create_color_var(rx.color("green", shade=1)), '"var(--green-1)"'),
+ (create_color_var(rx.color("blue", alpha=True)), '"var(--blue-a7)"'),
+ ("red", '"red"'),
+ ("green", '"green"'),
+ ("blue", '"blue"'),
],
)
def test_radix_color(color, expected):
@@ -122,4 +122,4 @@ def test_radix_color(color, expected):
expected (str): The expected custom_style string, radix or literal
"""
code_block = CodeBlock.create("Hello World", background_color=color)
- assert code_block.custom_style["backgroundColor"].__format__("") == expected # type: ignore
+ assert str(code_block.custom_style["backgroundColor"]) == expected # type: ignore
diff --git a/tests/components/core/test_cond.py b/tests/components/core/test_cond.py
index e18be221751..e3fc40ae363 100644
--- a/tests/components/core/test_cond.py
+++ b/tests/components/core/test_cond.py
@@ -6,9 +6,10 @@
from reflex.components.base.fragment import Fragment
from reflex.components.core.cond import Cond, cond
from reflex.components.radix.themes.typography.text import Text
+from reflex.ivars.base import ImmutableVar, LiteralVar, immutable_computed_var
from reflex.state import BaseState, State
from reflex.utils.format import format_state_name
-from reflex.vars import BaseVar, Var, computed_var
+from reflex.vars import Var
@pytest.fixture
@@ -21,8 +22,8 @@ class CondState(BaseState):
def test_f_string_cond_interpolation():
# make sure backticks inside interpolation don't get escaped
- var = Var.create(f"x {cond(True, 'a', 'b')}")
- assert str(var) == "x ${isTrue(true) ? `a` : `b`}"
+ var = LiteralVar.create(f"x {cond(True, 'a', 'b')}")
+ assert str(var) == '("x "+(Boolean(true) ? "a" : "b"))'
@pytest.mark.parametrize(
@@ -57,7 +58,7 @@ def test_validate_cond(cond_state: BaseState):
[true_value_text] = true_value["children"]
assert true_value_text["name"] == "RadixThemesText"
- assert true_value_text["children"][0]["contents"] == "{`cond is True`}"
+ assert true_value_text["children"][0]["contents"] == '{"cond is True"}'
# false value
false_value = condition["false_value"]
@@ -65,7 +66,7 @@ def test_validate_cond(cond_state: BaseState):
[false_value_text] = false_value["children"]
assert false_value_text["name"] == "RadixThemesText"
- assert false_value_text["children"][0]["contents"] == "{`cond is False`}"
+ assert false_value_text["children"][0]["contents"] == '{"cond is False"}'
@pytest.mark.parametrize(
@@ -93,10 +94,10 @@ def test_prop_cond(c1: Any, c2: Any):
assert isinstance(prop_cond, Var)
if not isinstance(c1, Var):
- c1 = json.dumps(c1).replace('"', "`")
+ c1 = json.dumps(c1)
if not isinstance(c2, Var):
- c2 = json.dumps(c2).replace('"', "`")
- assert str(prop_cond) == f"{{isTrue(true) ? {c1} : {c2}}}"
+ c2 = json.dumps(c2)
+ assert str(prop_cond) == f"(Boolean(true) ? {c1} : {c2})"
def test_cond_no_mix():
@@ -125,23 +126,23 @@ def test_cond_computed_var():
"""Test if cond works with computed vars."""
class CondStateComputed(State):
- @computed_var
+ @immutable_computed_var
def computed_int(self) -> int:
return 0
- @computed_var
+ @immutable_computed_var
def computed_str(self) -> str:
return "a string"
comp = cond(True, CondStateComputed.computed_int, CondStateComputed.computed_str)
# TODO: shouln't this be a ComputedVar?
- assert isinstance(comp, BaseVar)
+ assert isinstance(comp, ImmutableVar)
state_name = format_state_name(CondStateComputed.get_full_name())
assert (
str(comp)
- == f"{{isTrue(true) ? {state_name}.computed_int : {state_name}.computed_str}}"
+ == f"(Boolean(true) ? {state_name}.computed_int : {state_name}.computed_str)"
)
assert comp._var_type == Union[int, str]
diff --git a/tests/components/core/test_debounce.py b/tests/components/core/test_debounce.py
index 8ad15ea58a5..95feb7ae69b 100644
--- a/tests/components/core/test_debounce.py
+++ b/tests/components/core/test_debounce.py
@@ -4,8 +4,8 @@
import reflex as rx
from reflex.components.core.debounce import DEFAULT_DEBOUNCE_TIMEOUT
+from reflex.ivars.base import LiteralVar
from reflex.state import BaseState
-from reflex.vars import BaseVar
def test_create_no_child():
@@ -60,11 +60,7 @@ def test_render_child_props():
assert "css" in tag.props and isinstance(tag.props["css"], rx.Var)
for prop in ["foo", "bar", "baz", "quuc"]:
assert prop in str(tag.props["css"])
- assert tag.props["value"].equals(
- BaseVar(
- _var_name="real", _var_type=str, _var_is_local=True, _var_is_string=False
- )
- )
+ assert tag.props["value"].equals(LiteralVar.create("real"))
assert len(tag.props["onChange"].events) == 1
assert tag.props["onChange"].events[0].handler == S.on_change
assert tag.contents == ""
@@ -156,11 +152,7 @@ def test_render_child_props_recursive():
assert "css" in tag.props and isinstance(tag.props["css"], rx.Var)
for prop in ["foo", "bar", "baz", "quuc"]:
assert prop in str(tag.props["css"])
- assert tag.props["value"].equals(
- BaseVar(
- _var_name="outer", _var_type=str, _var_is_local=True, _var_is_string=False
- )
- )
+ assert tag.props["value"].equals(LiteralVar.create("outer"))
assert tag.props["forceNotifyOnBlur"]._var_name == "false"
assert tag.props["forceNotifyByEnter"]._var_name == "false"
assert tag.props["debounceTimeout"]._var_name == "42"
diff --git a/tests/components/core/test_foreach.py b/tests/components/core/test_foreach.py
index 6e4fa6b5e52..f1fae2577f1 100644
--- a/tests/components/core/test_foreach.py
+++ b/tests/components/core/test_foreach.py
@@ -278,7 +278,7 @@ def test_foreach_component_styles():
)
)
component._add_style_recursive({box: {"color": "red"}})
- assert 'css={{"color": "red"}}' in str(component)
+ assert 'css={({ ["color"] : "red" })}' in str(component)
def test_foreach_component_state():
diff --git a/tests/components/core/test_html.py b/tests/components/core/test_html.py
index 325bdcaf95d..4847e1d5af9 100644
--- a/tests/components/core/test_html.py
+++ b/tests/components/core/test_html.py
@@ -1,6 +1,7 @@
import pytest
from reflex.components.core.html import Html
+from reflex.state import State
def test_html_no_children():
@@ -15,8 +16,26 @@ def test_html_many_children():
def test_html_create():
html = Html.create("<p>Hello !</p>")
- assert str(html.dangerouslySetInnerHTML) == '{"__html": "<p>Hello !</p>"}' # type: ignore
+ assert str(html.dangerouslySetInnerHTML) == '({ ["__html"] : "<p>Hello !</p>" })' # type: ignore
assert (
str(html)
- == '<div className={`rx-Html`} dangerouslySetInnerHTML={{"__html": "<p>Hello !</p>"}}/>'
+ == '<div className={"rx-Html"} dangerouslySetInnerHTML={({ ["__html"] : "<p>Hello !</p>" })}/>'
+ )
+
+
+def test_html_fstring_create():
+ class TestState(State):
+ """The app state."""
+
+ myvar: str = "Blue"
+
+ html = Html.create(f"<p>Hello {TestState.myvar}!</p>")
+
+ assert (
+ str(html.dangerouslySetInnerHTML) # type: ignore
+ == f'({{ ["__html"] : ("<p>Hello "+{str(TestState.myvar)}+"!</p>") }})'
+ )
+ assert (
+ str(html)
+ == f'<div className={{"rx-Html"}} dangerouslySetInnerHTML={{{str(html.dangerouslySetInnerHTML)}}}/>' # type: ignore
)
diff --git a/tests/components/core/test_match.py b/tests/components/core/test_match.py
index 883386ebdba..1843b914d57 100644
--- a/tests/components/core/test_match.py
+++ b/tests/components/core/test_match.py
@@ -1,4 +1,4 @@
-from typing import Tuple
+from typing import Dict, List, Tuple
import pytest
@@ -6,7 +6,7 @@
from reflex.components.core.match import Match
from reflex.state import BaseState
from reflex.utils.exceptions import MatchTypeError
-from reflex.vars import BaseVar
+from reflex.vars import Var
class MatchState(BaseState):
@@ -35,7 +35,7 @@ def test_match_components():
[match_child] = match_dict["children"]
assert match_child["name"] == "match"
- assert str(match_child["cond"]) == f"{{{MatchState.get_name()}.value}}"
+ assert str(match_child["cond"]) == f"{MatchState.get_name()}.value"
match_cases = match_child["match_cases"]
assert len(match_cases) == 6
@@ -44,7 +44,7 @@ def test_match_components():
assert match_cases[0][0]._var_type == int
first_return_value_render = match_cases[0][1].render()
assert first_return_value_render["name"] == "RadixThemesText"
- assert first_return_value_render["children"][0]["contents"] == "{`first value`}"
+ assert first_return_value_render["children"][0]["contents"] == '{"first value"}'
assert match_cases[1][0]._var_name == "2"
assert match_cases[1][0]._var_type == int
@@ -52,36 +52,36 @@ def test_match_components():
assert match_cases[1][1]._var_type == int
second_return_value_render = match_cases[1][2].render()
assert second_return_value_render["name"] == "RadixThemesText"
- assert second_return_value_render["children"][0]["contents"] == "{`second value`}"
+ assert second_return_value_render["children"][0]["contents"] == '{"second value"}'
assert match_cases[2][0]._var_name == "[1, 2]"
- assert match_cases[2][0]._var_type == list
+ assert match_cases[2][0]._var_type == List[int]
third_return_value_render = match_cases[2][1].render()
assert third_return_value_render["name"] == "RadixThemesText"
- assert third_return_value_render["children"][0]["contents"] == "{`third value`}"
+ assert third_return_value_render["children"][0]["contents"] == '{"third value"}'
- assert match_cases[3][0]._var_name == "random"
+ assert match_cases[3][0]._var_name == '"random"'
assert match_cases[3][0]._var_type == str
fourth_return_value_render = match_cases[3][1].render()
assert fourth_return_value_render["name"] == "RadixThemesText"
- assert fourth_return_value_render["children"][0]["contents"] == "{`fourth value`}"
+ assert fourth_return_value_render["children"][0]["contents"] == '{"fourth value"}'
- assert match_cases[4][0]._var_name == '{"foo": "bar"}'
- assert match_cases[4][0]._var_type == dict
+ assert match_cases[4][0]._var_name == '({ ["foo"] : "bar" })'
+ assert match_cases[4][0]._var_type == Dict[str, str]
fifth_return_value_render = match_cases[4][1].render()
assert fifth_return_value_render["name"] == "RadixThemesText"
- assert fifth_return_value_render["children"][0]["contents"] == "{`fifth value`}"
+ assert fifth_return_value_render["children"][0]["contents"] == '{"fifth value"}'
- assert match_cases[5][0]._var_name == f"(({MatchState.get_name()}.num) + (1))"
+ assert match_cases[5][0]._var_name == f"({MatchState.get_name()}.num + 1)"
assert match_cases[5][0]._var_type == int
fifth_return_value_render = match_cases[5][1].render()
assert fifth_return_value_render["name"] == "RadixThemesText"
- assert fifth_return_value_render["children"][0]["contents"] == "{`sixth value`}"
+ assert fifth_return_value_render["children"][0]["contents"] == '{"sixth value"}'
default = match_child["default"].render()
assert default["name"] == "RadixThemesText"
- assert default["children"][0]["contents"] == "{`default value`}"
+ assert default["children"][0]["contents"] == '{"default value"}'
@pytest.mark.parametrize(
@@ -99,12 +99,12 @@ def test_match_components():
(MatchState.string, f"{MatchState.value} - string"),
"default value",
),
- f"(() => {{ switch (JSON.stringify({MatchState.get_name()}.value)) {{case JSON.stringify(1): return (`first`); break;case JSON.stringify(2): case JSON.stringify(3): return "
- "(`second value`); break;case JSON.stringify([1, 2]): return (`third-value`); break;case JSON.stringify(`random`): "
- 'return (`fourth_value`); break;case JSON.stringify({"foo": "bar"}): return (`fifth value`); '
- f"break;case JSON.stringify((({MatchState.get_name()}.num) + (1))): return (`sixth value`); break;case JSON.stringify(`${{{MatchState.get_name()}.value}} - string`): "
- f"return ({MatchState.get_name()}.string); break;case JSON.stringify({MatchState.get_name()}.string): return (`${{{MatchState.get_name()}.value}} - string`); break;default: "
- "return (`default value`); break;};})()",
+ f'(() => {{ switch (JSON.stringify({MatchState.get_name()}.value)) {{case JSON.stringify(1): return ("first"); break;case JSON.stringify(2): case JSON.stringify(3): return '
+ '("second value"); break;case JSON.stringify([1, 2]): return ("third-value"); break;case JSON.stringify("random"): '
+ 'return ("fourth_value"); break;case JSON.stringify(({ ["foo"] : "bar" })): return ("fifth value"); '
+ f'break;case JSON.stringify(({MatchState.get_name()}.num + 1)): return ("sixth value"); break;case JSON.stringify(({MatchState.get_name()}.value+" - string")): '
+ f'return ({MatchState.get_name()}.string); break;case JSON.stringify({MatchState.get_name()}.string): return (({MatchState.get_name()}.value+" - string")); break;default: '
+ 'return ("default value"); break;};})()',
),
(
(
@@ -118,11 +118,11 @@ def test_match_components():
(MatchState.string, f"{MatchState.value} - string"),
MatchState.string,
),
- f"(() => {{ switch (JSON.stringify({MatchState.get_name()}.value)) {{case JSON.stringify(1): return (`first`); break;case JSON.stringify(2): case JSON.stringify(3): return "
- "(`second value`); break;case JSON.stringify([1, 2]): return (`third-value`); break;case JSON.stringify(`random`): "
- 'return (`fourth_value`); break;case JSON.stringify({"foo": "bar"}): return (`fifth value`); '
- f"break;case JSON.stringify((({MatchState.get_name()}.num) + (1))): return (`sixth value`); break;case JSON.stringify(`${{{MatchState.get_name()}.value}} - string`): "
- f"return ({MatchState.get_name()}.string); break;case JSON.stringify({MatchState.get_name()}.string): return (`${{{MatchState.get_name()}.value}} - string`); break;default: "
+ f'(() => {{ switch (JSON.stringify({MatchState.get_name()}.value)) {{case JSON.stringify(1): return ("first"); break;case JSON.stringify(2): case JSON.stringify(3): return '
+ '("second value"); break;case JSON.stringify([1, 2]): return ("third-value"); break;case JSON.stringify("random"): '
+ 'return ("fourth_value"); break;case JSON.stringify(({ ["foo"] : "bar" })): return ("fifth value"); '
+ f'break;case JSON.stringify(({MatchState.get_name()}.num + 1)): return ("sixth value"); break;case JSON.stringify(({MatchState.get_name()}.value+" - string")): '
+ f'return ({MatchState.get_name()}.string); break;case JSON.stringify({MatchState.get_name()}.string): return (({MatchState.get_name()}.value+" - string")); break;default: '
f"return ({MatchState.get_name()}.string); break;}};}})()",
),
],
@@ -135,7 +135,7 @@ def test_match_vars(cases, expected):
expected: The expected var full name.
"""
match_comp = Match.create(MatchState.value, *cases)
- assert isinstance(match_comp, BaseVar)
+ assert isinstance(match_comp, Var)
assert match_comp._var_full_name == expected
@@ -247,8 +247,8 @@ def test_match_case_tuple_elements(match_case):
(MatchState.num + 1, "black"),
rx.text("default value"),
),
- "Match cases should have the same return types. Case 3 with return value `red` of type "
- "<class 'reflex.vars.BaseVar'> is not <class 'reflex.components.component.BaseComponent'>",
+ 'Match cases should have the same return types. Case 3 with return value `"red"` of type '
+ "<class 'reflex.ivars.sequence.LiteralStringVar'> is not <class 'reflex.components.component.BaseComponent'>",
),
(
(
@@ -260,8 +260,8 @@ def test_match_case_tuple_elements(match_case):
([1, 2], rx.text("third value")),
rx.text("default value"),
),
- "Match cases should have the same return types. Case 3 with return value `<RadixThemesText as={`p`}> {`first value`} </RadixThemesText>` "
- "of type <class 'reflex.components.radix.themes.typography.text.Text'> is not <class 'reflex.vars.BaseVar'>",
+ 'Match cases should have the same return types. Case 3 with return value `<RadixThemesText as={"p"}> {"first value"} </RadixThemesText>` '
+ "of type <class 'reflex.components.radix.themes.typography.text.Text'> is not <class 'reflex.vars.Var'>",
),
],
)
diff --git a/tests/components/datadisplay/test_code.py b/tests/components/datadisplay/test_code.py
index 64452e90cd9..49fbae09f54 100644
--- a/tests/components/datadisplay/test_code.py
+++ b/tests/components/datadisplay/test_code.py
@@ -4,7 +4,7 @@
@pytest.mark.parametrize(
- "theme, expected", [("light", "one-light"), ("dark", "one-dark")]
+ "theme, expected", [("light", '"one-light"'), ("dark", '"one-dark"')]
)
def test_code_light_dark_theme(theme, expected):
code_block = CodeBlock.create(theme=theme)
diff --git a/tests/components/forms/test_uploads.py b/tests/components/forms/test_uploads.py
index f8856a20f7e..3b2ee014f28 100644
--- a/tests/components/forms/test_uploads.py
+++ b/tests/components/forms/test_uploads.py
@@ -83,11 +83,11 @@ def test_upload_root_component_render(upload_root_component):
# upload
assert upload["name"] == "ReactDropzone"
assert upload["props"] == [
- "id={`default`}",
+ 'id={"default"}',
"multiple={true}",
"onDrop={e => setFilesById(filesById => {\n"
" const updatedFilesById = Object.assign({}, filesById);\n"
- " updatedFilesById[`default`] = e;\n"
+ ' updatedFilesById["default"] = e;\n'
" return updatedFilesById;\n"
" })\n"
" }",
@@ -99,23 +99,23 @@ def test_upload_root_component_render(upload_root_component):
[box] = upload["children"]
assert box["name"] == "RadixThemesBox"
assert box["props"] == [
- "className={`rx-Upload`}",
- 'css={{"border": "1px dotted black"}}',
+ 'className={"rx-Upload"}',
+ 'css={({ ["border"] : "1px dotted black" })}',
"{...getRootProps()}",
]
# input, button and text inside of box
[input, button, text] = box["children"]
assert input["name"] == "input"
- assert input["props"] == ["type={`file`}", "{...getInputProps()}"]
+ assert input["props"] == ['type={"file"}', "{...getInputProps()}"]
assert button["name"] == "RadixThemesButton"
- assert button["children"][0]["contents"] == "{`select file`}"
+ assert button["children"][0]["contents"] == '{"select file"}'
assert text["name"] == "RadixThemesText"
assert (
text["children"][0]["contents"]
- == "{`Drag and drop files here or click to select files`}"
+ == '{"Drag and drop files here or click to select files"}'
)
@@ -130,11 +130,11 @@ def test_upload_component_render(upload_component):
# upload
assert upload["name"] == "ReactDropzone"
assert upload["props"] == [
- "id={`default`}",
+ 'id={"default"}',
"multiple={true}",
"onDrop={e => setFilesById(filesById => {\n"
" const updatedFilesById = Object.assign({}, filesById);\n"
- " updatedFilesById[`default`] = e;\n"
+ ' updatedFilesById["default"] = e;\n'
" return updatedFilesById;\n"
" })\n"
" }",
@@ -146,23 +146,23 @@ def test_upload_component_render(upload_component):
[box] = upload["children"]
assert box["name"] == "RadixThemesBox"
assert box["props"] == [
- "className={`rx-Upload`}",
- 'css={{"border": "1px dotted black", "padding": "5em", "textAlign": "center"}}',
+ 'className={"rx-Upload"}',
+ 'css={({ ["border"] : "1px dotted black", ["padding"] : "5em", ["textAlign"] : "center" })}',
"{...getRootProps()}",
]
# input, button and text inside of box
[input, button, text] = box["children"]
assert input["name"] == "input"
- assert input["props"] == ["type={`file`}", "{...getInputProps()}"]
+ assert input["props"] == ['type={"file"}', "{...getInputProps()}"]
assert button["name"] == "RadixThemesButton"
- assert button["children"][0]["contents"] == "{`select file`}"
+ assert button["children"][0]["contents"] == '{"select file"}'
assert text["name"] == "RadixThemesText"
assert (
text["children"][0]["contents"]
- == "{`Drag and drop files here or click to select files`}"
+ == '{"Drag and drop files here or click to select files"}'
)
@@ -175,13 +175,13 @@ def test_upload_component_with_props_render(upload_component_with_props):
upload = upload_component_with_props.render()
assert upload["props"] == [
- "id={`default`}",
+ 'id={"default"}',
"maxFiles={2}",
"multiple={true}",
"noDrag={true}",
"onDrop={e => setFilesById(filesById => {\n"
" const updatedFilesById = Object.assign({}, filesById);\n"
- " updatedFilesById[`default`] = e;\n"
+ ' updatedFilesById["default"] = e;\n'
" return updatedFilesById;\n"
" })\n"
" }",
@@ -193,11 +193,11 @@ def test_upload_component_id_with_special_chars(upload_component_id_special):
upload = upload_component_id_special.render()
assert upload["props"] == [
- r"id={`#spec!\`al-_98ID`}",
+ r'id={"#spec!`al-_98ID"}',
"multiple={true}",
"onDrop={e => setFilesById(filesById => {\n"
" const updatedFilesById = Object.assign({}, filesById);\n"
- " updatedFilesById[`#spec!\\`al-_98ID`] = e;\n"
+ ' updatedFilesById["#spec!`al-_98ID"] = e;\n'
" return updatedFilesById;\n"
" })\n"
" }",
diff --git a/tests/components/media/test_image.py b/tests/components/media/test_image.py
index a39895c6792..ba8353260fe 100644
--- a/tests/components/media/test_image.py
+++ b/tests/components/media/test_image.py
@@ -6,6 +6,7 @@
import reflex as rx
from reflex.components.next.image import Image # type: ignore
+from reflex.ivars.sequence import StringVar
from reflex.utils.serializers import serialize, serialize_image
@@ -36,9 +37,13 @@ def test_set_src_str():
"""Test that setting the src works."""
image = rx.image(src="pic2.jpeg")
# when using next/image, we explicitly create a _var_is_str Var
- # assert str(image.src) == "{`pic2.jpeg`}" # type: ignore
+ assert str(image.src) in ( # type: ignore
+ '"pic2.jpeg"',
+ "'pic2.jpeg'",
+ "`pic2.jpeg`",
+ )
# For plain rx.el.img, an explicit var is not created, so the quoting happens later
- assert str(image.src) == "pic2.jpeg" # type: ignore
+ # assert str(image.src) == "pic2.jpeg" # type: ignore
def test_set_src_img(pil_image: Img):
@@ -48,7 +53,7 @@ def test_set_src_img(pil_image: Img):
pil_image: The image to serialize.
"""
image = Image.create(src=pil_image)
- assert str(image.src._var_name) == serialize_image(pil_image) # type: ignore
+ assert str(image.src._var_name) == '"' + serialize_image(pil_image) + '"' # type: ignore
def test_render(pil_image: Img):
@@ -58,4 +63,4 @@ def test_render(pil_image: Img):
pil_image: The image to serialize.
"""
image = Image.create(src=pil_image)
- assert image.src._var_is_string # type: ignore
+ assert isinstance(image.src, StringVar) # type: ignore
diff --git a/tests/components/test_component.py b/tests/components/test_component.py
index 3d32a53d7a4..45350a5c5fd 100644
--- a/tests/components/test_component.py
+++ b/tests/components/test_component.py
@@ -18,6 +18,7 @@
)
from reflex.constants import EventTriggers
from reflex.event import EventChain, EventHandler, parse_args_spec
+from reflex.ivars.base import LiteralVar
from reflex.state import BaseState
from reflex.style import Style
from reflex.utils import imports
@@ -230,8 +231,8 @@ def test_set_style_attrs(component1):
component1: A test component.
"""
component = component1(color="white", text_align="center")
- assert component.style["color"] == "white"
- assert component.style["textAlign"] == "center"
+ assert str(component.style["color"]) == '"white"'
+ assert str(component.style["textAlign"]) == '"center"'
def test_custom_attrs(component1):
@@ -255,7 +256,10 @@ def test_create_component(component1):
c = component1.create(*children, **attrs)
assert isinstance(c, component1)
assert c.children == children
- assert c.style == {"color": "white", "textAlign": "center"}
+ assert (
+ str(LiteralVar.create(c.style))
+ == '({ ["color"] : "white", ["textAlign"] : "center" })'
+ )
@pytest.mark.parametrize(
@@ -419,8 +423,8 @@ def test_add_style(component1, component2):
}
c1 = component1()._add_style_recursive(style) # type: ignore
c2 = component2()._add_style_recursive(style) # type: ignore
- assert c1.style["color"] == "white"
- assert c2.style["color"] == "black"
+ assert str(c1.style["color"]) == '"white"'
+ assert str(c2.style["color"]) == '"black"'
def test_add_style_create(component1, component2):
@@ -436,8 +440,8 @@ def test_add_style_create(component1, component2):
}
c1 = component1()._add_style_recursive(style) # type: ignore
c2 = component2()._add_style_recursive(style) # type: ignore
- assert c1.style["color"] == "white"
- assert c2.style["color"] == "black"
+ assert str(c1.style["color"]) == '"white"'
+ assert str(c2.style["color"]) == '"black"'
def test_get_imports(component1, component2):
@@ -607,8 +611,8 @@ def test_create_filters_none_props(test_component):
assert "prop4" not in component.get_props()
# Assert that the style prop is present in the component's props
- assert component.style["color"] == "white"
- assert component.style["text-align"] == "center"
+ assert str(component.style["color"]) == '"white"'
+ assert str(component.style["text-align"]) == '"center"'
@pytest.mark.parametrize("children", [((None,),), ("foo", ("bar", (None,)))])
@@ -635,7 +639,7 @@ def test_component_create_unallowed_types(children, test_component):
"children": [
{
"name": "RadixThemesText",
- "props": ["as={`p`}"],
+ "props": ['as={"p"}'],
"contents": "",
"args": None,
"special_props": set(),
@@ -643,7 +647,7 @@ def test_component_create_unallowed_types(children, test_component):
{
"name": "",
"props": [],
- "contents": "{`first_text`}",
+ "contents": '{"first_text"}',
"args": None,
"special_props": set(),
"children": [],
@@ -670,7 +674,7 @@ def test_component_create_unallowed_types(children, test_component):
"args": None,
"autofocus": False,
"children": [],
- "contents": "{`first_text`}",
+ "contents": '{"first_text"}',
"name": "",
"props": [],
"special_props": set(),
@@ -678,7 +682,7 @@ def test_component_create_unallowed_types(children, test_component):
],
"contents": "",
"name": "RadixThemesText",
- "props": ["as={`p`}"],
+ "props": ['as={"p"}'],
"special_props": set(),
},
{
@@ -689,7 +693,7 @@ def test_component_create_unallowed_types(children, test_component):
"args": None,
"autofocus": False,
"children": [],
- "contents": "{`second_text`}",
+ "contents": '{"second_text"}',
"name": "",
"props": [],
"special_props": set(),
@@ -697,7 +701,7 @@ def test_component_create_unallowed_types(children, test_component):
],
"contents": "",
"name": "RadixThemesText",
- "props": ["as={`p`}"],
+ "props": ['as={"p"}'],
"special_props": set(),
},
],
@@ -721,7 +725,7 @@ def test_component_create_unallowed_types(children, test_component):
"args": None,
"autofocus": False,
"children": [],
- "contents": "{`first_text`}",
+ "contents": '{"first_text"}',
"name": "",
"props": [],
"special_props": set(),
@@ -729,7 +733,7 @@ def test_component_create_unallowed_types(children, test_component):
],
"contents": "",
"name": "RadixThemesText",
- "props": ["as={`p`}"],
+ "props": ['as={"p"}'],
"special_props": set(),
},
{
@@ -748,7 +752,7 @@ def test_component_create_unallowed_types(children, test_component):
"args": None,
"autofocus": False,
"children": [],
- "contents": "{`second_text`}",
+ "contents": '{"second_text"}',
"name": "",
"props": [],
"special_props": set(),
@@ -756,7 +760,7 @@ def test_component_create_unallowed_types(children, test_component):
],
"contents": "",
"name": "RadixThemesText",
- "props": ["as={`p`}"],
+ "props": ['as={"p"}'],
"special_props": set(),
}
],
@@ -825,9 +829,9 @@ def get_event_triggers(self) -> Dict[str, Any]:
comp = C1.create(on_foo=C1State.mock_handler)
assert comp.render()["props"][0] == (
- "onFoo={(__e,_alpha,_bravo,_charlie) => addEvents("
- f'[Event("{C1State.get_full_name()}.mock_handler", {{_e:__e.target.value,_bravo:_bravo["nested"],_charlie:((_charlie.custom) + (42))}})], '
- "[__e,_alpha,_bravo,_charlie], {})}"
+ "onFoo={((__e, _alpha, _bravo, _charlie) => ((addEvents("
+ f'[(Event("{C1State.get_full_name()}.mock_handler", ({{ ["_e"] : __e["target"]["value"], ["_bravo"] : _bravo["nested"], ["_charlie"] : (_charlie["custom"] + 42) }})))], '
+ "[__e, _alpha, _bravo, _charlie], ({ })))))}"
)
@@ -1003,10 +1007,10 @@ def test_component_with_only_valid_children(fixture, request):
@pytest.mark.parametrize(
"component,rendered",
[
- (rx.text("hi"), "<RadixThemesText as={`p`}>\n {`hi`}\n</RadixThemesText>"),
+ (rx.text("hi"), '<RadixThemesText as={"p"}>\n {"hi"}\n</RadixThemesText>'),
(
rx.box(rc.heading("test", size="md")),
- "<RadixThemesBox>\n <Heading size={`md`}>\n {`test`}\n</Heading>\n</RadixThemesBox>",
+ '<RadixThemesBox>\n <Heading size={"md"}>\n {"test"}\n</Heading>\n</RadixThemesBox>',
),
],
)
@@ -1061,7 +1065,7 @@ def test_stateful_banner():
assert isinstance(stateful_component, StatefulComponent)
-TEST_VAR = Var.create_safe("test")._replace(
+TEST_VAR = LiteralVar.create("test")._replace(
merge_var_data=VarData(
hooks={"useTest": None},
imports={"test": [ImportVar(tag="test")]},
@@ -1069,36 +1073,36 @@ def test_stateful_banner():
interpolations=[],
)
)
-FORMATTED_TEST_VAR = Var.create(f"foo{TEST_VAR}bar")
-STYLE_VAR = TEST_VAR._replace(_var_name="style", _var_is_local=False)
+FORMATTED_TEST_VAR = LiteralVar.create(f"foo{TEST_VAR}bar")
+STYLE_VAR = TEST_VAR._replace(_var_name="style")
EVENT_CHAIN_VAR = TEST_VAR._replace(_var_type=EventChain)
ARG_VAR = Var.create("arg")
-TEST_VAR_DICT_OF_DICT = Var.create_safe({"a": {"b": "test"}})._replace(
- merge_var_data=TEST_VAR._var_data
-)
-FORMATTED_TEST_VAR_DICT_OF_DICT = Var.create_safe({"a": {"b": f"footestbar"}})._replace(
+TEST_VAR_DICT_OF_DICT = LiteralVar.create({"a": {"b": "test"}})._replace(
merge_var_data=TEST_VAR._var_data
)
+FORMATTED_TEST_VAR_DICT_OF_DICT = LiteralVar.create(
+ {"a": {"b": f"footestbar"}}
+)._replace(merge_var_data=TEST_VAR._var_data)
-TEST_VAR_LIST_OF_LIST = Var.create_safe([["test"]])._replace(
+TEST_VAR_LIST_OF_LIST = LiteralVar.create([["test"]])._replace(
merge_var_data=TEST_VAR._var_data
)
-FORMATTED_TEST_VAR_LIST_OF_LIST = Var.create_safe([["footestbar"]])._replace(
+FORMATTED_TEST_VAR_LIST_OF_LIST = LiteralVar.create([["footestbar"]])._replace(
merge_var_data=TEST_VAR._var_data
)
-TEST_VAR_LIST_OF_LIST_OF_LIST = Var.create_safe([[["test"]]])._replace(
- merge_var_data=TEST_VAR._var_data
-)
-FORMATTED_TEST_VAR_LIST_OF_LIST_OF_LIST = Var.create_safe([[["footestbar"]]])._replace(
+TEST_VAR_LIST_OF_LIST_OF_LIST = LiteralVar.create([[["test"]]])._replace(
merge_var_data=TEST_VAR._var_data
)
+FORMATTED_TEST_VAR_LIST_OF_LIST_OF_LIST = LiteralVar.create(
+ [[["footestbar"]]]
+)._replace(merge_var_data=TEST_VAR._var_data)
-TEST_VAR_LIST_OF_DICT = Var.create_safe([{"a": "test"}])._replace(
+TEST_VAR_LIST_OF_DICT = LiteralVar.create([{"a": "test"}])._replace(
merge_var_data=TEST_VAR._var_data
)
-FORMATTED_TEST_VAR_LIST_OF_DICT = Var.create_safe([{"a": "footestbar"}])._replace(
+FORMATTED_TEST_VAR_LIST_OF_DICT = LiteralVar.create([{"a": "footestbar"}])._replace(
merge_var_data=TEST_VAR._var_data
)
@@ -1187,7 +1191,7 @@ def handler2(self, arg):
id="direct-special_props",
),
pytest.param(
- rx.fragment(special_props={Var.create(f"foo{TEST_VAR}bar")}),
+ rx.fragment(special_props={LiteralVar.create(f"foo{TEST_VAR}bar")}),
[FORMATTED_TEST_VAR],
id="fstring-special_props",
),
@@ -1296,6 +1300,8 @@ def test_get_vars(component, exp_vars):
comp_vars,
sorted(exp_vars, key=lambda v: v._var_name),
):
+ # print(str(comp_var), str(exp_var))
+ # print(comp_var._get_all_var_data(), exp_var._get_all_var_data())
assert comp_var.equals(exp_var)
@@ -1335,9 +1341,11 @@ def test_instantiate_all_components():
continue
component = getattr(
rx,
- component_name
- if not isinstance(component_name, tuple)
- else component_name[1],
+ (
+ component_name
+ if not isinstance(component_name, tuple)
+ else component_name[1]
+ ),
)
if isinstance(component, type) and issubclass(component, Component):
component.create()
@@ -1595,14 +1603,14 @@ class C2(C1):
c1 = C1.create(prop1="prop1_1", prop2="prop2_1")
rendered_c1 = c1.render()
- assert "renamed_prop1={`prop1_1`}" in rendered_c1["props"]
- assert "renamed_prop2={`prop2_1`}" in rendered_c1["props"]
+ assert 'renamed_prop1={"prop1_1"}' in rendered_c1["props"]
+ assert 'renamed_prop2={"prop2_1"}' in rendered_c1["props"]
c2 = C2.create(prop1="prop1_2", prop2="prop2_2", prop3="prop3_2")
rendered_c2 = c2.render()
- assert "renamed_prop1={`prop1_2`}" in rendered_c2["props"]
- assert "subclass_prop2={`prop2_2`}" in rendered_c2["props"]
- assert "renamed_prop3={`prop3_2`}" in rendered_c2["props"]
+ assert 'renamed_prop1={"prop1_2"}' in rendered_c2["props"]
+ assert 'subclass_prop2={"prop2_2"}' in rendered_c2["props"]
+ assert 'renamed_prop3={"prop3_2"}' in rendered_c2["props"]
def test_deprecated_props(capsys):
@@ -1626,9 +1634,9 @@ class C1(Component):
assert not out_err.out
c1_1_render = c1_1.render()
- assert "type={`type1`}" in c1_1_render["props"]
- assert "min={`min1`}" in c1_1_render["props"]
- assert "max={`max1`}" in c1_1_render["props"]
+ assert 'type={"type1"}' in c1_1_render["props"]
+ assert 'min={"min1"}' in c1_1_render["props"]
+ assert 'max={"max1"}' in c1_1_render["props"]
# Deprecation warning is emitted with underscore suffix,
# but the component still works.
@@ -1638,9 +1646,9 @@ class C1(Component):
assert not out_err.err
c1_2_render = c1_2.render()
- assert "type={`type2`}" in c1_2_render["props"]
- assert "min={`min2`}" in c1_2_render["props"]
- assert "max={`max2`}" in c1_2_render["props"]
+ assert 'type={"type2"}' in c1_2_render["props"]
+ assert 'min={"min2"}' in c1_2_render["props"]
+ assert 'max={"max2"}' in c1_2_render["props"]
class C2(Component):
tag = "C2"
@@ -1656,9 +1664,9 @@ class C2(Component):
assert not out_err.out
c2_1_render = c2_1.render()
- assert "type={`type1`}" in c2_1_render["props"]
- assert "min={`min1`}" in c2_1_render["props"]
- assert "max={`max1`}" in c2_1_render["props"]
+ assert 'type={"type1"}' in c2_1_render["props"]
+ assert 'min={"min1"}' in c2_1_render["props"]
+ assert 'max={"max1"}' in c2_1_render["props"]
def test_custom_component_get_imports():
@@ -2008,11 +2016,11 @@ def test_add_style_embedded_vars(test_state: BaseState):
Args:
test_state: A test state.
"""
- v0 = Var.create_safe("parent")._replace(
+ v0 = LiteralVar.create("parent")._replace(
merge_var_data=VarData(hooks={"useParent": None}), # type: ignore
)
v1 = rx.color("plum", 10)
- v2 = Var.create_safe("text")._replace(
+ v2 = LiteralVar.create("text")._replace(
merge_var_data=VarData(hooks={"useText": None}), # type: ignore
)
@@ -2045,7 +2053,7 @@ def add_style(self):
assert "useParent" in page._get_all_hooks_internal()
assert (
str(page).count(
- f'css={{{{"fakeParent": "parent", "color": "var(--plum-10)", "fake": "text", "margin": `${{{test_state.get_name()}.num}}%`}}}}'
+ f'css={{({{ ["fakeParent"] : "parent", ["color"] : "var(--plum-10)", ["fake"] : "text", ["margin"] : ({test_state.get_name()}.num+"%") }})}}'
)
== 1
)
@@ -2066,10 +2074,10 @@ def add_style(self):
assert len(page.children[0].children) == 1
# Expect the style to be added to the child of the foreach
- assert 'css={{"color": "red"}}' in str(page.children[0].children[0])
+ assert 'css={({ ["color"] : "red" })}' in str(page.children[0].children[0])
# Expect only one instance of this CSS dict in the rendered page
- assert str(page).count('css={{"color": "red"}}') == 1
+ assert str(page).count('css={({ ["color"] : "red" })}') == 1
class TriggerState(rx.State):
diff --git a/tests/components/test_component_state.py b/tests/components/test_component_state.py
index 0dc0956e247..574997ba53f 100644
--- a/tests/components/test_component_state.py
+++ b/tests/components/test_component_state.py
@@ -35,8 +35,8 @@ def get_component(cls, *children, **props):
assert cs1.State.increment != cs2.State.increment
assert len(cs1.children) == 1
- assert cs1.children[0].render() == Bare.create("{`a`}").render()
+ assert cs1.children[0].render() == Bare.create("a").render()
assert cs1.id == "a"
assert len(cs2.children) == 1
- assert cs2.children[0].render() == Bare.create("{`b`}").render()
+ assert cs2.children[0].render() == Bare.create("b").render()
assert cs2.id == "b"
diff --git a/tests/components/test_tag.py b/tests/components/test_tag.py
index 2fb2f4563d4..d43f73842b8 100644
--- a/tests/components/test_tag.py
+++ b/tests/components/test_tag.py
@@ -3,6 +3,7 @@
import pytest
from reflex.components.tags import CondTag, Tag, tagless
+from reflex.ivars.base import LiteralVar
from reflex.vars import BaseVar, Var
@@ -12,8 +13,8 @@
({}, []),
({"key-hypen": 1}, ["key-hypen={1}"]),
({"key": 1}, ["key={1}"]),
- ({"key": "value"}, ["key={`value`}"]),
- ({"key": True, "key2": "value2"}, ["key={true}", "key2={`value2`}"]),
+ ({"key": "value"}, ['key={"value"}']),
+ ({"key": True, "key2": "value2"}, ["key={true}", 'key2={"value2"}']),
],
)
def test_format_props(props: Dict[str, Var], test_props: List):
@@ -53,8 +54,8 @@ def test_is_valid_prop(prop: Var, valid: bool):
def test_add_props():
"""Test that the props are added."""
tag = Tag().add_props(key="value", key2=42, invalid=None, invalid2={})
- assert tag.props["key"].equals(Var.create("value"))
- assert tag.props["key2"].equals(Var.create(42))
+ assert tag.props["key"].equals(LiteralVar.create("value"))
+ assert tag.props["key2"].equals(LiteralVar.create(42))
assert "invalid" not in tag.props
assert "invalid2" not in tag.props
@@ -102,7 +103,7 @@ def test_format_tag(tag: Tag, expected: Dict):
assert tag_dict["name"] == expected["name"]
assert tag_dict["contents"] == expected["contents"]
for prop, prop_value in tag_dict["props"].items():
- assert prop_value.equals(Var.create_safe(expected["props"][prop]))
+ assert prop_value.equals(LiteralVar.create(expected["props"][prop]))
def test_format_cond_tag():
diff --git a/tests/test_app.py b/tests/test_app.py
index 17afd2bb738..efaca4234d9 100644
--- a/tests/test_app.py
+++ b/tests/test_app.py
@@ -1252,7 +1252,7 @@ def test_app_wrap_compile_theme(compilable_app: tuple[App, Path]):
"function AppWrap({children}) {"
"return ("
"<RadixThemesColorModeProvider>"
- "<RadixThemesTheme accentColor={`plum`} css={{...theme.styles.global[':root'], ...theme.styles.global.body}}>"
+ "<RadixThemesTheme accentColor={\"plum\"} css={{...theme.styles.global[':root'], ...theme.styles.global.body}}>"
"<Fragment>"
"{children}"
"</Fragment>"
@@ -1434,16 +1434,16 @@ def page2():
assert isinstance((fragment_wrapper := app.pages["index"].children[0]), Fragment)
assert isinstance((first_text := fragment_wrapper.children[0]), Text)
- assert str(first_text.children[0].contents) == "{`first`}" # type: ignore
+ assert str(first_text.children[0].contents) == '"first"' # type: ignore
assert isinstance((second_text := fragment_wrapper.children[1]), Text)
- assert str(second_text.children[0].contents) == "{`second`}" # type: ignore
+ assert str(second_text.children[0].contents) == '"second"' # type: ignore
# Test page with trailing comma.
assert isinstance(
(page2_fragment_wrapper := app.pages["page2"].children[0]), Fragment
)
assert isinstance((third_text := page2_fragment_wrapper.children[0]), Text)
- assert str(third_text.children[0].contents) == "{`third`}" # type: ignore
+ assert str(third_text.children[0].contents) == '"third"' # type: ignore
@pytest.mark.parametrize("export", (True, False))
diff --git a/tests/test_event.py b/tests/test_event.py
index 284542a4347..a484e0a3c38 100644
--- a/tests/test_event.py
+++ b/tests/test_event.py
@@ -1,10 +1,10 @@
-import json
from typing import List
import pytest
from reflex import event
from reflex.event import Event, EventHandler, EventSpec, call_event_handler, fix_events
+from reflex.ivars.base import ImmutableVar, LiteralVar
from reflex.state import BaseState
from reflex.utils import format
from reflex.vars import Var
@@ -70,7 +70,7 @@ def test_fn_with_args(_, arg1, arg2):
event_spec = handler("first", "second") # type: ignore
assert (
format.format_event(event_spec)
- == 'Event("test_fn_with_args", {arg1:`first`,arg2:`second`})'
+ == 'Event("test_fn_with_args", {arg1:"first",arg2:"second"})'
)
first, second = 123, "456"
@@ -78,14 +78,14 @@ def test_fn_with_args(_, arg1, arg2):
event_spec = handler(first, second) # type: ignore
assert (
format.format_event(event_spec)
- == 'Event("test_fn_with_args", {arg1:123,arg2:`456`})'
+ == 'Event("test_fn_with_args", {arg1:123,arg2:"456"})'
)
assert event_spec.handler == handler
assert event_spec.args[0][0].equals(Var.create_safe("arg1"))
assert event_spec.args[0][1].equals(Var.create_safe(first))
assert event_spec.args[1][0].equals(Var.create_safe("arg2"))
- assert event_spec.args[1][1].equals(Var.create_safe(second))
+ assert event_spec.args[1][1].equals(LiteralVar.create(second))
handler = EventHandler(fn=test_fn_with_args)
with pytest.raises(TypeError):
@@ -160,15 +160,15 @@ def test_fn_with_args(_, arg1, arg2):
[
(
("/path", None, None),
- 'Event("_redirect", {path:`/path`,external:false,replace:false})',
+ 'Event("_redirect", {path:"/path",external:false,replace:false})',
),
(
("/path", True, None),
- 'Event("_redirect", {path:`/path`,external:true,replace:false})',
+ 'Event("_redirect", {path:"/path",external:true,replace:false})',
),
(
("/path", False, None),
- 'Event("_redirect", {path:`/path`,external:false,replace:false})',
+ 'Event("_redirect", {path:"/path",external:false,replace:false})',
),
(
(Var.create_safe("path"), None, None),
@@ -176,11 +176,11 @@ def test_fn_with_args(_, arg1, arg2):
),
(
("/path", None, True),
- 'Event("_redirect", {path:`/path`,external:false,replace:true})',
+ 'Event("_redirect", {path:"/path",external:false,replace:true})',
),
(
("/path", True, True),
- 'Event("_redirect", {path:`/path`,external:true,replace:true})',
+ 'Event("_redirect", {path:"/path",external:true,replace:true})',
),
],
)
@@ -213,10 +213,10 @@ def test_event_console_log():
spec = event.console_log("message")
assert isinstance(spec, EventSpec)
assert spec.handler.fn.__qualname__ == "_console"
- assert spec.args[0][0].equals(Var.create_safe("message"))
- assert spec.args[0][1].equals(Var.create_safe("message"))
- assert format.format_event(spec) == 'Event("_console", {message:`message`})'
- spec = event.console_log(Var.create_safe("message"))
+ assert spec.args[0][0].equals(ImmutableVar(_var_name="message", _var_type=str))
+ assert spec.args[0][1].equals(LiteralVar.create("message"))
+ assert format.format_event(spec) == 'Event("_console", {message:"message"})'
+ spec = event.console_log(ImmutableVar.create_safe("message"))
assert format.format_event(spec) == 'Event("_console", {message:message})'
@@ -225,10 +225,10 @@ def test_event_window_alert():
spec = event.window_alert("message")
assert isinstance(spec, EventSpec)
assert spec.handler.fn.__qualname__ == "_alert"
- assert spec.args[0][0].equals(Var.create_safe("message"))
- assert spec.args[0][1].equals(Var.create_safe("message"))
- assert format.format_event(spec) == 'Event("_alert", {message:`message`})'
- spec = event.window_alert(Var.create_safe("message"))
+ assert spec.args[0][0].equals(ImmutableVar(_var_name="message", _var_type=str))
+ assert spec.args[0][1].equals(LiteralVar.create("message"))
+ assert format.format_event(spec) == 'Event("_alert", {message:"message"})'
+ spec = event.window_alert(ImmutableVar.create_safe("message"))
assert format.format_event(spec) == 'Event("_alert", {message:message})'
@@ -238,10 +238,10 @@ def test_set_focus():
assert isinstance(spec, EventSpec)
assert spec.handler.fn.__qualname__ == "_set_focus"
assert spec.args[0][0].equals(Var.create_safe("ref"))
- assert spec.args[0][1].equals(Var.create_safe("ref_input1"))
- assert format.format_event(spec) == 'Event("_set_focus", {ref:`ref_input1`})'
+ assert spec.args[0][1].equals(LiteralVar.create("ref_input1"))
+ assert format.format_event(spec) == 'Event("_set_focus", {ref:"ref_input1"})'
spec = event.set_focus("input1")
- assert format.format_event(spec) == 'Event("_set_focus", {ref:`ref_input1`})'
+ assert format.format_event(spec) == 'Event("_set_focus", {ref:"ref_input1"})'
def test_set_value():
@@ -250,16 +250,16 @@ def test_set_value():
assert isinstance(spec, EventSpec)
assert spec.handler.fn.__qualname__ == "_set_value"
assert spec.args[0][0].equals(Var.create_safe("ref"))
- assert spec.args[0][1].equals(Var.create_safe("ref_input1"))
+ assert spec.args[0][1].equals(LiteralVar.create("ref_input1"))
assert spec.args[1][0].equals(Var.create_safe("value"))
- assert spec.args[1][1].equals(Var.create_safe(""))
+ assert spec.args[1][1].equals(LiteralVar.create(""))
assert (
- format.format_event(spec) == 'Event("_set_value", {ref:`ref_input1`,value:``})'
+ format.format_event(spec) == 'Event("_set_value", {ref:"ref_input1",value:""})'
)
- spec = event.set_value("input1", Var.create_safe("message"))
+ spec = event.set_value("input1", ImmutableVar.create_safe("message"))
assert (
format.format_event(spec)
- == 'Event("_set_value", {ref:`ref_input1`,value:message})'
+ == 'Event("_set_value", {ref:"ref_input1",value:message})'
)
@@ -269,12 +269,12 @@ def test_remove_cookie():
assert isinstance(spec, EventSpec)
assert spec.handler.fn.__qualname__ == "_remove_cookie"
assert spec.args[0][0].equals(Var.create_safe("key"))
- assert spec.args[0][1].equals(Var.create_safe("testkey"))
+ assert spec.args[0][1].equals(LiteralVar.create("testkey"))
assert spec.args[1][0].equals(Var.create_safe("options"))
- assert spec.args[1][1].equals(Var.create_safe({"path": "/"}))
+ assert spec.args[1][1].equals(LiteralVar.create({"path": "/"}))
assert (
format.format_event(spec)
- == 'Event("_remove_cookie", {key:`testkey`,options:{"path": "/"}})'
+ == 'Event("_remove_cookie", {key:"testkey",options:({ ["path"] : "/" })})'
)
@@ -290,12 +290,12 @@ def test_remove_cookie_with_options():
assert isinstance(spec, EventSpec)
assert spec.handler.fn.__qualname__ == "_remove_cookie"
assert spec.args[0][0].equals(Var.create_safe("key"))
- assert spec.args[0][1].equals(Var.create_safe("testkey"))
+ assert spec.args[0][1].equals(LiteralVar.create("testkey"))
assert spec.args[1][0].equals(Var.create_safe("options"))
- assert spec.args[1][1].equals(Var.create_safe(options))
+ assert spec.args[1][1].equals(LiteralVar.create(options))
assert (
format.format_event(spec)
- == f'Event("_remove_cookie", {{key:`testkey`,options:{json.dumps(options)}}})'
+ == f'Event("_remove_cookie", {{key:"testkey",options:{str(LiteralVar.create(options))}}})'
)
@@ -314,9 +314,9 @@ def test_remove_local_storage():
assert isinstance(spec, EventSpec)
assert spec.handler.fn.__qualname__ == "_remove_local_storage"
assert spec.args[0][0].equals(Var.create_safe("key"))
- assert spec.args[0][1].equals(Var.create_safe("testkey"))
+ assert spec.args[0][1].equals(LiteralVar.create("testkey"))
assert (
- format.format_event(spec) == 'Event("_remove_local_storage", {key:`testkey`})'
+ format.format_event(spec) == 'Event("_remove_local_storage", {key:"testkey"})'
)
diff --git a/tests/test_state.py b/tests/test_state.py
index 1a014739d5b..d34e771cb80 100644
--- a/tests/test_state.py
+++ b/tests/test_state.py
@@ -40,7 +40,7 @@
from reflex.testing import chdir
from reflex.utils import format, prerequisites, types
from reflex.utils.format import json_dumps
-from reflex.vars import BaseVar, ComputedVar
+from reflex.vars import BaseVar, ComputedVar, Var
from tests.states.mutation import MutableSQLAModel, MutableTestState
from .states import GenState
@@ -266,8 +266,8 @@ def test_base_class_vars(test_state):
if field in test_state.get_skip_vars():
continue
prop = getattr(cls, field)
- assert isinstance(prop, BaseVar)
- assert prop._var_name == field
+ assert isinstance(prop, Var)
+ assert prop._var_name.split(".")[-1] == field
assert cls.num1._var_type == int
assert cls.num2._var_type == float
@@ -395,30 +395,27 @@ def test_default_setters(test_state):
def test_class_indexing_with_vars():
"""Test that we can index into a state var with another var."""
prop = TestState.array[TestState.num1]
- assert (
- str(prop) == f"{{{TestState.get_name()}.array.at({TestState.get_name()}.num1)}}"
- )
+ assert str(prop) == f"{TestState.get_name()}.array.at({TestState.get_name()}.num1)"
prop = TestState.mapping["a"][TestState.num1]
assert (
str(prop)
- == f'{{{TestState.get_name()}.mapping["a"].at({TestState.get_name()}.num1)}}'
+ == f'{TestState.get_name()}.mapping["a"].at({TestState.get_name()}.num1)'
)
prop = TestState.mapping[TestState.map_key]
assert (
- str(prop)
- == f"{{{TestState.get_name()}.mapping[{TestState.get_name()}.map_key]}}"
+ str(prop) == f"{TestState.get_name()}.mapping[{TestState.get_name()}.map_key]"
)
def test_class_attributes():
"""Test that we can get class attributes."""
prop = TestState.obj.prop1
- assert str(prop) == f"{{{TestState.get_name()}.obj.prop1}}"
+ assert str(prop) == f'{TestState.get_name()}.obj["prop1"]'
prop = TestState.complex[1].prop1
- assert str(prop) == f"{{{TestState.get_name()}.complex[1].prop1}}"
+ assert str(prop) == f'{TestState.get_name()}.complex[1]["prop1"]'
def test_get_parent_state():
@@ -1064,7 +1061,8 @@ def test_dirty_computed_var_from_backend_var(
Args:
interdependent_state: A state with varying Var dependencies.
"""
- assert InterdependentState._v3._backend is True
+ # Accessing ._v3 returns the immutable var it represents instead of the actual computed var
+ # assert InterdependentState._v3._backend is True
interdependent_state._v2 = 2
assert interdependent_state.get_delta() == {
interdependent_state.get_full_name(): {"v2x2": 4, "v3x2": 4},
@@ -2604,15 +2602,23 @@ class UnionState(BaseState):
c3r: Custom3 = Custom3(c2r=Custom2(c1r=Custom1(foo="")))
custom_union: Union[Custom1, Custom2, Custom3] = Custom1(foo="")
- assert UnionState.c3.c2._var_name == "c3?.c2" # type: ignore
- assert UnionState.c3.c2.c1._var_name == "c3?.c2?.c1" # type: ignore
- assert UnionState.c3.c2.c1.foo._var_name == "c3?.c2?.c1?.foo" # type: ignore
- assert UnionState.c3.c2.c1r.foo._var_name == "c3?.c2?.c1r.foo" # type: ignore
- assert UnionState.c3.c2r.c1._var_name == "c3?.c2r.c1" # type: ignore
- assert UnionState.c3.c2r.c1.foo._var_name == "c3?.c2r.c1?.foo" # type: ignore
- assert UnionState.c3.c2r.c1r.foo._var_name == "c3?.c2r.c1r.foo" # type: ignore
- assert UnionState.c3i.c2._var_name == "c3i.c2" # type: ignore
- assert UnionState.c3r.c2._var_name == "c3r.c2" # type: ignore
+ assert str(UnionState.c3.c2) == f'{str(UnionState.c3)}?.["c2"]' # type: ignore
+ assert str(UnionState.c3.c2.c1) == f'{str(UnionState.c3)}?.["c2"]?.["c1"]' # type: ignore
+ assert (
+ str(UnionState.c3.c2.c1.foo) == f'{str(UnionState.c3)}?.["c2"]?.["c1"]?.["foo"]' # type: ignore
+ )
+ assert (
+ str(UnionState.c3.c2.c1r.foo) == f'{str(UnionState.c3)}?.["c2"]?.["c1r"]["foo"]' # type: ignore
+ )
+ assert str(UnionState.c3.c2r.c1) == f'{str(UnionState.c3)}?.["c2r"]["c1"]' # type: ignore
+ assert (
+ str(UnionState.c3.c2r.c1.foo) == f'{str(UnionState.c3)}?.["c2r"]["c1"]?.["foo"]' # type: ignore
+ )
+ assert (
+ str(UnionState.c3.c2r.c1r.foo) == f'{str(UnionState.c3)}?.["c2r"]["c1r"]["foo"]' # type: ignore
+ )
+ assert str(UnionState.c3i.c2) == f'{str(UnionState.c3i)}["c2"]' # type: ignore
+ assert str(UnionState.c3r.c2) == f'{str(UnionState.c3r)}["c2"]' # type: ignore
assert UnionState.custom_union.foo is not None # type: ignore
assert UnionState.custom_union.c1 is not None # type: ignore
assert UnionState.custom_union.c1r is not None # type: ignore
diff --git a/tests/test_style.py b/tests/test_style.py
index 825d72a9d24..8fa443cdf60 100644
--- a/tests/test_style.py
+++ b/tests/test_style.py
@@ -1,18 +1,19 @@
from __future__ import annotations
-from typing import Any
+from typing import Any, Dict
import pytest
import reflex as rx
from reflex import style
from reflex.components.component import evaluate_style_namespaces
+from reflex.ivars.base import ImmutableVar, LiteralVar
from reflex.style import Style
-from reflex.vars import Var, VarData
+from reflex.vars import ImmutableVarData, Var, VarData
test_style = [
({"a": 1}, {"a": 1}),
- ({"a": Var.create("abc")}, {"a": "abc"}),
+ ({"a": LiteralVar.create("abc")}, {"a": "abc"}),
({"test_case": 1}, {"testCase": 1}),
({"test_case": {"a": 1}}, {"testCase": {"a": 1}}),
({":test_case": {"a": 1}}, {":testCase": {"a": 1}}),
@@ -21,8 +22,8 @@
{"::-webkit-scrollbar": {"display": "none"}},
{"::-webkit-scrollbar": {"display": "none"}},
),
- ({"margin_y": "2rem"}, {"marginBottom": "2rem", "marginTop": "2rem"}),
- ({"marginY": "2rem"}, {"marginBottom": "2rem", "marginTop": "2rem"}),
+ ({"margin_y": "2rem"}, {"marginTop": "2rem", "marginBottom": "2rem"}),
+ ({"marginY": "2rem"}, {"marginTop": "2rem", "marginBottom": "2rem"}),
(
{"::-webkit-scrollbar": {"bgColor": "red"}},
{"::-webkit-scrollbar": {"backgroundColor": "red"}},
@@ -49,7 +50,7 @@ def test_convert(style_dict, expected):
expected: The expected formatted style.
"""
converted_dict, _var_data = style.convert(style_dict)
- assert converted_dict == expected
+ assert LiteralVar.create(converted_dict).equals(LiteralVar.create(expected))
@pytest.mark.parametrize(
@@ -63,7 +64,9 @@ def test_create_style(style_dict, expected):
style_dict: The style to check.
expected: The expected formatted style.
"""
- assert style.Style(style_dict) == expected
+ assert LiteralVar.create(style.Style(style_dict)).equals(
+ LiteralVar.create(expected)
+ )
def compare_dict_of_var(d1: dict[str, Any], d2: dict[str, Any]):
@@ -87,39 +90,47 @@ def compare_dict_of_var(d1: dict[str, Any], d2: dict[str, Any]):
@pytest.mark.parametrize(
("kwargs", "style_dict", "expected_get_style"),
[
- ({}, {}, {"css": None}),
- ({"color": "hotpink"}, {}, {"css": Var.create(Style({"color": "hotpink"}))}),
- ({}, {"color": "red"}, {"css": Var.create(Style({"color": "red"}))}),
+ ({}, {}, {}),
+ (
+ {"color": "hotpink"},
+ {},
+ {"css": LiteralVar.create(Style({"color": "hotpink"}))},
+ ),
+ ({}, {"color": "red"}, {"css": LiteralVar.create(Style({"color": "red"}))}),
(
{"color": "hotpink"},
{"color": "red"},
- {"css": Var.create(Style({"color": "hotpink"}))},
+ {"css": LiteralVar.create(Style({"color": "hotpink"}))},
),
(
{"_hover": {"color": "hotpink"}},
{},
- {"css": Var.create(Style({"&:hover": {"color": "hotpink"}}))},
+ {"css": LiteralVar.create(Style({"&:hover": {"color": "hotpink"}}))},
),
(
{},
{"_hover": {"color": "red"}},
- {"css": Var.create(Style({"&:hover": {"color": "red"}}))},
+ {"css": LiteralVar.create(Style({"&:hover": {"color": "red"}}))},
),
(
{},
{":hover": {"color": "red"}},
- {"css": Var.create(Style({"&:hover": {"color": "red"}}))},
+ {"css": LiteralVar.create(Style({"&:hover": {"color": "red"}}))},
),
(
{},
{"::-webkit-scrollbar": {"display": "none"}},
- {"css": Var.create(Style({"&::-webkit-scrollbar": {"display": "none"}}))},
+ {
+ "css": LiteralVar.create(
+ Style({"&::-webkit-scrollbar": {"display": "none"}})
+ )
+ },
),
(
{},
{"::-moz-progress-bar": {"background_color": "red"}},
{
- "css": Var.create(
+ "css": LiteralVar.create(
Style({"&::-moz-progress-bar": {"backgroundColor": "red"}})
)
},
@@ -128,7 +139,7 @@ def compare_dict_of_var(d1: dict[str, Any], d2: dict[str, Any]):
{"color": ["#111", "#222", "#333", "#444", "#555"]},
{},
{
- "css": Var.create(
+ "css": LiteralVar.create(
Style(
{
"@media screen and (min-width: 0)": {"color": "#111"},
@@ -148,7 +159,7 @@ def compare_dict_of_var(d1: dict[str, Any], d2: dict[str, Any]):
},
{},
{
- "css": Var.create(
+ "css": LiteralVar.create(
Style(
{
"@media screen and (min-width: 0)": {"color": "#111"},
@@ -169,7 +180,7 @@ def compare_dict_of_var(d1: dict[str, Any], d2: dict[str, Any]):
},
{},
{
- "css": Var.create(
+ "css": LiteralVar.create(
Style(
{
"@media screen and (min-width: 0)": {
@@ -209,7 +220,7 @@ def compare_dict_of_var(d1: dict[str, Any], d2: dict[str, Any]):
},
{},
{
- "css": Var.create(
+ "css": LiteralVar.create(
Style(
{
"&:hover": {
@@ -236,7 +247,7 @@ def compare_dict_of_var(d1: dict[str, Any], d2: dict[str, Any]):
{"_hover": {"color": ["#111", "#222", "#333", "#444", "#555"]}},
{},
{
- "css": Var.create(
+ "css": LiteralVar.create(
Style(
{
"&:hover": {
@@ -268,7 +279,7 @@ def compare_dict_of_var(d1: dict[str, Any], d2: dict[str, Any]):
},
{},
{
- "css": Var.create(
+ "css": LiteralVar.create(
Style(
{
"&:hover": {
@@ -307,7 +318,7 @@ def compare_dict_of_var(d1: dict[str, Any], d2: dict[str, Any]):
},
{},
{
- "css": Var.create(
+ "css": LiteralVar.create(
Style(
{
"&:hover": {
@@ -361,20 +372,20 @@ class StyleState(rx.State):
[
(
{"color": StyleState.color},
- {"css": Var.create(Style({"color": StyleState.color}))},
+ {"css": LiteralVar.create(Style({"color": StyleState.color}))},
),
(
{"color": f"dark{StyleState.color}"},
{
- "css": Var.create_safe(f'{{"color": `dark{StyleState.color}`}}').to(
- Style
- )
+ "css": ImmutableVar.create_safe(
+ f'({{ ["color"] : ("dark"+{StyleState.color}) }})'
+ ).to(Dict[str, str])
},
),
(
{"color": StyleState.color, "_hover": {"color": StyleState.color2}},
{
- "css": Var.create(
+ "css": LiteralVar.create(
Style(
{
"color": StyleState.color,
@@ -387,7 +398,7 @@ class StyleState(rx.State):
(
{"color": [StyleState.color, "gray", StyleState.color2, "yellow", "blue"]},
{
- "css": Var.create(
+ "css": LiteralVar.create(
Style(
{
"@media screen and (min-width: 0)": {
@@ -415,7 +426,7 @@ class StyleState(rx.State):
]
},
{
- "css": Var.create(
+ "css": LiteralVar.create(
Style(
{
"&:hover": {
@@ -453,7 +464,7 @@ class StyleState(rx.State):
}
},
{
- "css": Var.create(
+ "css": LiteralVar.create(
Style(
{
"&:hover": {
@@ -492,7 +503,10 @@ def test_style_via_component_with_state(
"""
comp = rx.el.div(**kwargs)
- assert comp.style._var_data == expected_get_style["css"]._var_data
+ assert (
+ ImmutableVarData.merge(comp.style._var_data)
+ == expected_get_style["css"]._get_all_var_data()
+ )
# Assert that style values are equal.
compare_dict_of_var(comp._get_style(), expected_get_style)
@@ -507,10 +521,10 @@ def test_evaluate_style_namespaces():
def test_style_update_with_var_data():
"""Test that .update with a Style containing VarData works."""
- red_var = Var.create_safe("red")._replace(
+ red_var = LiteralVar.create("red")._replace(
merge_var_data=VarData(hooks={"const red = true": None}), # type: ignore
)
- blue_var = Var.create_safe("blue", _var_is_local=False)._replace(
+ blue_var = LiteralVar.create("blue")._replace(
merge_var_data=VarData(hooks={"const blue = true": None}), # type: ignore
)
@@ -521,7 +535,9 @@ def test_style_update_with_var_data():
)
s2 = Style()
s2.update(s1, background_color=f"{blue_var}ish")
- assert s2 == {"color": "red", "backgroundColor": "`${blue}ish`"}
+ assert str(LiteralVar.create(s2)) == str(
+ LiteralVar.create({"color": "red", "backgroundColor": "blueish"})
+ )
assert s2._var_data is not None
assert "const red = true" in s2._var_data.hooks
assert "const blue = true" in s2._var_data.hooks
diff --git a/tests/test_var.py b/tests/test_var.py
index 5c67d992477..cca6cbec475 100644
--- a/tests/test_var.py
+++ b/tests/test_var.py
@@ -8,19 +8,19 @@
from reflex.base import Base
from reflex.constants.base import REFLEX_VAR_CLOSING_TAG, REFLEX_VAR_OPENING_TAG
-from reflex.experimental.vars.base import (
+from reflex.ivars.base import (
ImmutableVar,
LiteralVar,
var_operation,
)
-from reflex.experimental.vars.function import ArgsFunctionOperation, FunctionStringVar
-from reflex.experimental.vars.number import (
+from reflex.ivars.function import ArgsFunctionOperation, FunctionStringVar
+from reflex.ivars.number import (
LiteralBooleanVar,
LiteralNumberVar,
NumberVar,
)
-from reflex.experimental.vars.object import LiteralObjectVar
-from reflex.experimental.vars.sequence import (
+from reflex.ivars.object import LiteralObjectVar
+from reflex.ivars.sequence import (
ArrayVar,
ConcatVarOperation,
LiteralArrayVar,
@@ -892,10 +892,10 @@ def test_literal_var():
def test_function_var():
- addition_func = FunctionStringVar("((a, b) => a + b)")
+ addition_func = FunctionStringVar.create("((a, b) => a + b)")
assert str(addition_func.call(1, 2)) == "(((a, b) => a + b)(1, 2))"
- manual_addition_func = ArgsFunctionOperation(
+ manual_addition_func = ArgsFunctionOperation.create(
("a", "b"),
{
"args": [ImmutableVar.create_safe("a"), ImmutableVar.create_safe("b")],
@@ -913,14 +913,14 @@ def test_function_var():
== "(((...args) => ((((a, b) => a + b)(1, ...args))))(2))"
)
- create_hello_statement = ArgsFunctionOperation(
+ create_hello_statement = ArgsFunctionOperation.create(
("name",), f"Hello, {ImmutableVar.create_safe('name')}!"
)
- first_name = LiteralStringVar("Steven")
- last_name = LiteralStringVar("Universe")
+ first_name = LiteralStringVar.create("Steven")
+ last_name = LiteralStringVar.create("Universe")
assert (
str(create_hello_statement.call(f"{first_name} {last_name}"))
- == '(((name) => (("Hello, "+name+"!")))(("Steven"+" "+"Universe")))'
+ == '(((name) => (("Hello, "+name+"!")))("Steven Universe"))'
)
@@ -932,7 +932,7 @@ def add(a: Union[NumberVar, int], b: Union[NumberVar, int]) -> str:
assert str(add(1, 2)) == "(1 + 2)"
assert str(add(a=4, b=-9)) == "(4 + -9)"
- five = LiteralNumberVar(5)
+ five = LiteralNumberVar.create(5)
seven = add(2, five)
assert isinstance(seven, NumberVar)
@@ -952,7 +952,7 @@ def test_string_operations():
def test_all_number_operations():
- starting_number = LiteralNumberVar(-5.4)
+ starting_number = LiteralNumberVar.create(-5.4)
complicated_number = (((-(starting_number + 1)) * 2 / 3) // 2 % 3) ** 2
@@ -967,19 +967,19 @@ def test_all_number_operations():
assert (
str(even_more_complicated_number)
- == "!(((Math.abs(Math.floor(((Math.floor(((-((-5.4 + 1)) * 2) / 3) / 2) % 3) ** 2))) != 0) || (true && (Math.round(((Math.floor(((-((-5.4 + 1)) * 2) / 3) / 2) % 3) ** 2)) != 0))))"
+ == "!(Boolean((Math.abs(Math.floor(((Math.floor(((-((-5.4 + 1)) * 2) / 3) / 2) % 3) ** 2))) || (2 && Math.round(((Math.floor(((-((-5.4 + 1)) * 2) / 3) / 2) % 3) ** 2))))))"
)
- assert str(LiteralNumberVar(5) > False) == "(5 > 0)"
- assert str(LiteralBooleanVar(False) < 5) == "((false ? 1 : 0) < 5)"
+ assert str(LiteralNumberVar.create(5) > False) == "(5 > 0)"
+ assert str(LiteralBooleanVar.create(False) < 5) == "((false ? 1 : 0) < 5)"
assert (
- str(LiteralBooleanVar(False) < LiteralBooleanVar(True))
+ str(LiteralBooleanVar.create(False) < LiteralBooleanVar.create(True))
== "((false ? 1 : 0) < (true ? 1 : 0))"
)
def test_index_operation():
- array_var = LiteralArrayVar([1, 2, 3, 4, 5])
+ array_var = LiteralArrayVar.create([1, 2, 3, 4, 5])
assert str(array_var[0]) == "[1, 2, 3, 4, 5].at(0)"
assert str(array_var[1:2]) == "[1, 2, 3, 4, 5].slice(1, 2)"
assert (
@@ -988,9 +988,9 @@ def test_index_operation():
)
assert (
str(array_var[::-1])
- == "[1, 2, 3, 4, 5].slice(0, [1, 2, 3, 4, 5].length).reverse().slice(undefined, undefined).filter((_, i) => i % 1 === 0)"
+ == "[1, 2, 3, 4, 5].slice(0, [1, 2, 3, 4, 5].length).slice().reverse().slice(undefined, undefined).filter((_, i) => i % 1 === 0)"
)
- assert str(array_var.reverse()) == "[1, 2, 3, 4, 5].reverse()"
+ assert str(array_var.reverse()) == "[1, 2, 3, 4, 5].slice().reverse()"
assert str(array_var[0].to(NumberVar) + 9) == "([1, 2, 3, 4, 5].at(0) + 9)"
@@ -999,7 +999,7 @@ def test_array_operations():
assert str(array_var.length()) == "[1, 2, 3, 4, 5].length"
assert str(array_var.contains(3)) == "[1, 2, 3, 4, 5].includes(3)"
- assert str(array_var.reverse()) == "[1, 2, 3, 4, 5].reverse()"
+ assert str(array_var.reverse()) == "[1, 2, 3, 4, 5].slice().reverse()"
assert (
str(ArrayVar.range(10))
== "Array.from({ length: (10 - 0) / 1 }, (_, i) => 0 + i * 1)"
@@ -1019,7 +1019,7 @@ def test_array_operations():
def test_object_operations():
- object_var = LiteralObjectVar({"a": 1, "b": 2, "c": 3})
+ object_var = LiteralObjectVar.create({"a": 1, "b": 2, "c": 3})
assert (
str(object_var.keys()) == 'Object.keys(({ ["a"] : 1, ["b"] : 2, ["c"] : 3 }))'
@@ -1035,13 +1035,13 @@ def test_object_operations():
assert str(object_var.a) == '({ ["a"] : 1, ["b"] : 2, ["c"] : 3 })["a"]'
assert str(object_var["a"]) == '({ ["a"] : 1, ["b"] : 2, ["c"] : 3 })["a"]'
assert (
- str(object_var.merge(LiteralObjectVar({"c": 4, "d": 5})))
- == 'Object.assign(({ ["a"] : 1, ["b"] : 2, ["c"] : 3 }), ({ ["c"] : 4, ["d"] : 5 }))'
+ str(object_var.merge(LiteralObjectVar.create({"c": 4, "d": 5})))
+ == '({...({ ["a"] : 1, ["b"] : 2, ["c"] : 3 }), ...({ ["c"] : 4, ["d"] : 5 })})'
)
def test_type_chains():
- object_var = LiteralObjectVar({"a": 1, "b": 2, "c": 3})
+ object_var = LiteralObjectVar.create({"a": 1, "b": 2, "c": 3})
assert (object_var._key_type(), object_var._value_type()) == (str, int)
assert (object_var.keys()._var_type, object_var.values()._var_type) == (
List[str],
@@ -1062,7 +1062,7 @@ def test_type_chains():
def test_nested_dict():
- arr = LiteralArrayVar([{"bar": ["foo", "bar"]}], List[Dict[str, List[str]]])
+ arr = LiteralArrayVar.create([{"bar": ["foo", "bar"]}], List[Dict[str, List[str]]])
assert (
str(arr[0]["bar"][0]) == '[({ ["bar"] : ["foo", "bar"] })].at(0)["bar"].at(0)'
@@ -1720,8 +1720,8 @@ def test_invalid_var_operations(operand1_var: Var, operand2_var, operators: List
f"{ATestState.get_full_name()}.value",
),
(
- Var.create(f"{ATestState.value} string", _var_is_string=True),
- f"`${{{ATestState.get_full_name()}.value}} string`",
+ LiteralVar.create(f"{ATestState.value} string"),
+ f'({ATestState.get_full_name()}.value+" string")',
),
(Var.create(ATestState.dict_val), f"{ATestState.get_full_name()}.dict_val"),
],
diff --git a/tests/utils/test_format.py b/tests/utils/test_format.py
index 95ebc047b6b..4623f0fb287 100644
--- a/tests/utils/test_format.py
+++ b/tests/utils/test_format.py
@@ -8,6 +8,7 @@
from reflex.components.tags.tag import Tag
from reflex.event import EventChain, EventHandler, EventSpec, FrontendEvent
+from reflex.ivars.base import ImmutableVar, LiteralVar
from reflex.style import Style
from reflex.utils import format
from reflex.utils.serializers import serialize_figure
@@ -422,19 +423,19 @@ def test_format_cond(
(
"state__state.value",
[
- [Var.create(1), Var.create("red", _var_is_string=True)],
- [Var.create(2), Var.create(3), Var.create("blue", _var_is_string=True)],
+ [LiteralVar.create(1), LiteralVar.create("red")],
+ [LiteralVar.create(2), LiteralVar.create(3), LiteralVar.create("blue")],
[TestState.mapping, TestState.num1],
[
- Var.create(f"{TestState.map_key}-key", _var_is_string=True),
- Var.create("return-key", _var_is_string=True),
+ LiteralVar.create(f"{TestState.map_key}-key"),
+ LiteralVar.create("return-key"),
],
],
- Var.create("yellow", _var_is_string=True),
- "(() => { switch (JSON.stringify(state__state.value)) {case JSON.stringify(1): return (`red`); break;case JSON.stringify(2): case JSON.stringify(3): "
- f"return (`blue`); break;case JSON.stringify({TestState.get_full_name()}.mapping): return "
- f"({TestState.get_full_name()}.num1); break;case JSON.stringify(`${{{TestState.get_full_name()}.map_key}}-key`): return (`return-key`);"
- " break;default: return (`yellow`); break;};})()",
+ LiteralVar.create("yellow"),
+ '(() => { switch (JSON.stringify(state__state.value)) {case JSON.stringify(1): return ("red"); break;case JSON.stringify(2): case JSON.stringify(3): '
+ f'return ("blue"); break;case JSON.stringify({TestState.get_full_name()}.mapping): return '
+ f'({TestState.get_full_name()}.num1); break;case JSON.stringify(({TestState.get_full_name()}.map_key+"-key")): return ("return-key");'
+ ' break;default: return ("yellow"); break;};})()',
)
],
)
@@ -541,7 +542,7 @@ def test_format_match(
{
"h1": f"{{({{node, ...props}}) => <Heading {{...props}} {''.join(Tag(name='', props=Style({'as_': 'h1'})).format_props())} />}}"
},
- '{{"h1": ({node, ...props}) => <Heading {...props} as={`h1`} />}}',
+ '{{"h1": ({node, ...props}) => <Heading {...props} as={"h1"} />}}',
),
],
)
@@ -558,7 +559,11 @@ def test_format_prop(prop: Var, formatted: str):
@pytest.mark.parametrize(
"single_props,key_value_props,output",
[
- (["string"], {"key": 42}, ["key={42}", "string"]),
+ (
+ [ImmutableVar.create_safe("...props")],
+ {"key": 42},
+ ["key={42}", "{...props}"],
+ ),
],
)
def test_format_props(single_props, key_value_props, output):