Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

improve foreach behavior with strings #4751

Merged
merged 4 commits into from
Feb 6, 2025
Merged

improve foreach behavior with strings #4751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ed9b8f
improve foreach behavior with strings
adhami3310 Feb 5, 2025
cac0825
add a defensive guard before giving up
adhami3310 Feb 5, 2025
432614e
add integration tests
adhami3310 Feb 5, 2025
3596211
Merge branch 'main' into khaleel/eng-4586-foreach-does-not-infer-type…
adhami3310 Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions reflex/components/core/foreach.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,10 @@ def create(
TypeError: If the render function is a ComponentState.
UntypedVarError: If the iterable is of type Any without a type annotation.
"""
from reflex.vars.object import ObjectVar
from reflex.vars import ArrayVar, ObjectVar, StringVar

iterable = LiteralVar.create(iterable).guess_type()

iterable = LiteralVar.create(iterable)
if iterable._var_type == Any:
raise ForeachVarError(
f"Could not foreach over var `{iterable!s}` of type Any. "
Expand All @@ -75,6 +76,15 @@ def create(
if isinstance(iterable, ObjectVar):
iterable = iterable.entries()

if isinstance(iterable, StringVar):
iterable = iterable.split()

if not isinstance(iterable, ArrayVar):
raise ForeachVarError(
f"Could not foreach over var `{iterable!s}` of type {iterable._var_type}. "
"See https://reflex.dev/docs/library/dynamic-rendering/foreach/"
)

component = cls(
iterable=iterable,
render_fn=render_fn,
Expand Down
10 changes: 10 additions & 0 deletions tests/integration/test_var_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,14 @@ def index():
),
id="dict_in_foreach3",
),
rx.box(
rx.foreach("abcdef", lambda x: rx.text.span(x + " ")),
id="str_in_foreach",
),
rx.box(
rx.foreach(VarOperationState.str_var1, lambda x: rx.text.span(x + " ")),
id="str_var_in_foreach",
),
rx.box(
rx.foreach(
VarOperationState.people,
Expand Down Expand Up @@ -844,6 +852,8 @@ def test_var_operations(driver, var_operations: AppHarness):
("dict_in_foreach1", "a1b2"),
("dict_in_foreach2", "12"),
("dict_in_foreach3", "1234"),
("str_in_foreach", "a b c d e f"),
("str_var_in_foreach", "f i r s t"),
("typed_dict_in_foreach", "Hello Alice33Hello Bob28"),
]

Expand Down