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

Fix string color (#3922)

Browse Source
This commit is contained in:
Khaleel Al-Adhami 2024-09-16 11:12:51 -07:00 committed by GitHub
parent 085b761f6b
commit 8328a622a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
reflex/vars/base.py
View File

@ -1067,6 +1067,10 @@ class LiteralVar(Var):
_var_type=type(value),
_var_data=_var_data,
)
if isinstance(serialized_value, str):
return LiteralStringVar.create(
serialized_value, _var_type=type(value), _var_data=_var_data
)
return LiteralVar.create(serialized_value, _var_data=_var_data)
if dataclasses.is_dataclass(value) and not isinstance(value, type):

19
reflex/vars/sequence.py
View File

@ -553,12 +553,14 @@ class LiteralStringVar(LiteralVar, StringVar):
def create(
cls,
value: str,
_var_type: GenericType | None = str,
_var_data: VarData | None = None,
) -> StringVar:
"""Create a var from a string value.
Args:
value: The value to create the var from.
_var_type: The type of the var.
_var_data: Additional hooks and imports associated with the Var.
Returns:
@ -591,18 +593,27 @@ class LiteralStringVar(LiteralVar, StringVar):
filtered_strings_and_vals = [
s for s in strings_and_vals if isinstance(s, Var) or s
]
if len(filtered_strings_and_vals) == 1:
return LiteralVar.create(filtered_strings_and_vals[0]).to(StringVar)
only_string = filtered_strings_and_vals[0]
if isinstance(only_string, str):
return LiteralVar.create(only_string).to(StringVar, _var_type)
else:
return only_string.to(StringVar, only_string._var_type)
return ConcatVarOperation.create(
concat_result = ConcatVarOperation.create(
*filtered_strings_and_vals,
_var_data=_var_data,
)
return (
concat_result
if _var_type is str
else concat_result.to(StringVar, _var_type)
)
return LiteralStringVar(
_js_expr=json.dumps(value),
_var_type=str,
_var_type=_var_type,
_var_data=_var_data,
_var_value=value,
)

23
tests/components/core/test_colors.py
View File

@ -1,3 +1,5 @@
from typing import Type, Union
import pytest
import reflex as rx
@ -22,44 +24,45 @@ def create_color_var(color):
@pytest.mark.parametrize(
"color, expected",
"color, expected, expected_type",
[
(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)"', Color),
(create_color_var(rx.color("mint", 3)), '"var(--mint-3)"', Color),
(create_color_var(rx.color("mint", 3, True)), '"var(--mint-a3)"', Color),
(
create_color_var(rx.color(ColorState.color, ColorState.shade)), # type: ignore
f'("var(--"+{str(color_state_name)}.color+"-"+{str(color_state_name)}.shade+")")',
Color,
),
(
create_color_var(rx.color(f"{ColorState.color}", f"{ColorState.shade}")), # type: ignore
f'("var(--"+{str(color_state_name)}.color+"-"+{str(color_state_name)}.shade+")")',
Color,
),
(
create_color_var(
rx.color(f"{ColorState.color_part}ato", f"{ColorState.shade}") # type: ignore
),
f'("var(--"+{str(color_state_name)}.color_part+"ato-"+{str(color_state_name)}.shade+")")',
Color,
),
(
create_color_var(f'{rx.color(ColorState.color, f"{ColorState.shade}")}'), # type: ignore
f'("var(--"+{str(color_state_name)}.color+"-"+{str(color_state_name)}.shade+")")',
str,
),
(
create_color_var(
f'{rx.color(f"{ColorState.color}", f"{ColorState.shade}")}' # type: ignore
),
f'("var(--"+{str(color_state_name)}.color+"-"+{str(color_state_name)}.shade+")")',
str,
),
],
)
def test_color(color, expected):
assert color._var_type is str
def test_color(color, expected, expected_type: Union[Type[str], Type[Color]]):
assert color._var_type is expected_type
assert str(color) == expected
if color._var_type == Color:
assert str(color) == f"{{`{expected}`}}"
else:
assert str(color) == expected
@pytest.mark.parametrize(