laipeng/reflex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor things a bit

Browse Source
This commit is contained in:
Khaleel Al-Adhami 2025-02-14 15:53:22 -08:00
parent e2b9c1268d
commit 7d50500e06
1 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
reflex/components/base/bare.py
View File

@ -2,9 +2,9 @@
from __future__ import annotations from __future__ import annotations
from typing import Any, Iterator from typing import Any, Iterator, Sequence
from reflex.components.component import Component, ComponentStyle from reflex.components.component import BaseComponent, Component, ComponentStyle
from reflex.components.tags import Tag from reflex.components.tags import Tag
from reflex.components.tags.tagless import Tagless from reflex.components.tags.tagless import Tagless
from reflex.config import PerformanceMode, environment from reflex.config import PerformanceMode, environment
@ -47,6 +47,11 @@ def validate_str(value: str):
) )
def _components_from_var(var: Var) -> Sequence[BaseComponent]:
var_data = var._get_all_var_data()
return var_data.components if var_data else ()
class Bare(Component): class Bare(Component):
"""A component with no tag.""" """A component with no tag."""
@ -81,10 +86,8 @@ class Bare(Component):
""" """
hooks = super()._get_all_hooks_internal() hooks = super()._get_all_hooks_internal()
if isinstance(self.contents, Var): if isinstance(self.contents, Var):
var_data = self.contents._get_all_var_data() for component in _components_from_var(self.contents):
if var_data: hooks |= component._get_all_hooks_internal()
for component in var_data.components:
hooks |= component._get_all_hooks_internal()
return hooks return hooks
def _get_all_hooks(self) -> dict[str, VarData | None]: def _get_all_hooks(self) -> dict[str, VarData | None]:
@ -95,10 +98,8 @@ class Bare(Component):
""" """
hooks = super()._get_all_hooks() hooks = super()._get_all_hooks()
if isinstance(self.contents, Var): if isinstance(self.contents, Var):
var_data = self.contents._get_all_var_data() for component in _components_from_var(self.contents):
if var_data: hooks |= component._get_all_hooks()
for component in var_data.components:
hooks |= component._get_all_hooks()
return hooks return hooks
def _get_all_imports(self, collapse: bool = False) -> ParsedImportDict: def _get_all_imports(self, collapse: bool = False) -> ParsedImportDict:
@ -125,10 +126,8 @@ class Bare(Component):
""" """
dynamic_imports = super()._get_all_dynamic_imports() dynamic_imports = super()._get_all_dynamic_imports()
if isinstance(self.contents, Var): if isinstance(self.contents, Var):
var_data = self.contents._get_all_var_data() for component in _components_from_var(self.contents):
if var_data: dynamic_imports |= component._get_all_dynamic_imports()
for component in var_data.components:
dynamic_imports |= component._get_all_dynamic_imports()
return dynamic_imports return dynamic_imports
def _get_all_custom_code(self) -> set[str]: def _get_all_custom_code(self) -> set[str]:
@ -139,10 +138,8 @@ class Bare(Component):
""" """
custom_code = super()._get_all_custom_code() custom_code = super()._get_all_custom_code()
if isinstance(self.contents, Var): if isinstance(self.contents, Var):
var_data = self.contents._get_all_var_data() for component in _components_from_var(self.contents):
if var_data: custom_code |= component._get_all_custom_code()
for component in var_data.components:
custom_code |= component._get_all_custom_code()
return custom_code return custom_code
def _get_all_app_wrap_components(self) -> dict[tuple[int, str], Component]: def _get_all_app_wrap_components(self) -> dict[tuple[int, str], Component]:
@ -153,11 +150,9 @@ class Bare(Component):
""" """
app_wrap_components = super()._get_all_app_wrap_components() app_wrap_components = super()._get_all_app_wrap_components()
if isinstance(self.contents, Var): if isinstance(self.contents, Var):
var_data = self.contents._get_all_var_data() for component in _components_from_var(self.contents):
if var_data: if isinstance(component, Component):
for component in var_data.components: app_wrap_components |= component._get_all_app_wrap_components()
if isinstance(component, Component):
app_wrap_components |= component._get_all_app_wrap_components()
return app_wrap_components return app_wrap_components
def _get_all_refs(self) -> set[str]: def _get_all_refs(self) -> set[str]:
@ -168,10 +163,8 @@ class Bare(Component):
""" """
refs = super()._get_all_refs() refs = super()._get_all_refs()
if isinstance(self.contents, Var): if isinstance(self.contents, Var):
var_data = self.contents._get_all_var_data() for component in _components_from_var(self.contents):
if var_data: refs |= component._get_all_refs()
for component in var_data.components:
refs |= component._get_all_refs()
return refs return refs
def _render(self) -> Tag: def _render(self) -> Tag:
@ -198,12 +191,10 @@ class Bare(Component):
are_components_touched = False are_components_touched = False
if isinstance(self.contents, Var): if isinstance(self.contents, Var):
var_data = self.contents._get_all_var_data() for component in _components_from_var(self.contents):
if var_data: if isinstance(component, Component):
for component in var_data.components: component._add_style_recursive(style, theme)
if isinstance(component, Component): are_components_touched = True
component._add_style_recursive(style, theme)
are_components_touched = True
if are_components_touched: if are_components_touched:
GLOBAL_CACHE.clear() GLOBAL_CACHE.clear()