Skip to content

Commit

Permalink
If a Var is Optional, iterate over it as if it is not
Browse files Browse the repository at this point in the history
This is potentially dangerous because it will cause frontend exception if the
value actually is null.
  • Loading branch information
masenf committed Dec 10, 2024
1 parent 49a8f81 commit 732459c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion reflex/components/core/foreach.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def render(self):
iterable_state=str(tag.iterable),
arg_name=tag.arg_var_name,
arg_index=tag.get_index_var_arg(),
iterable_type=tag.iterable._var_type.mro()[0].__name__,
iterable_type=tag.get_iterable_var_type().__name__,
)


Expand Down
14 changes: 9 additions & 5 deletions reflex/components/tags/iter_tag.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from typing import TYPE_CHECKING, Any, Callable, Iterable, Tuple, Type, Union, get_args

from reflex.components.tags.tag import Tag
from reflex.utils.types import is_optional
from reflex.vars import LiteralArrayVar, Var, get_unique_variable_name

if TYPE_CHECKING:
Expand Down Expand Up @@ -38,15 +39,18 @@ def get_iterable_var_type(self) -> Type:
The type of the iterable var.
"""
iterable = self.iterable
var_type = iterable._var_type
if is_optional(var_type):
var_type = get_args(var_type)[0]
try:
if iterable._var_type.mro()[0] is dict:
if var_type.mro()[0] is dict:
# Arg is a tuple of (key, value).
return Tuple[get_args(iterable._var_type)] # type: ignore
elif iterable._var_type.mro()[0] is tuple:
return Tuple[get_args(var_type)] # type: ignore
elif var_type.mro()[0] is tuple:
# Arg is a union of any possible values in the tuple.
return Union[get_args(iterable._var_type)] # type: ignore
return Union[get_args(var_type)] # type: ignore
else:
return get_args(iterable._var_type)[0]
return get_args(var_type)[0]
except Exception:
return Any

Expand Down

0 comments on commit 732459c

Please sign in to comment.