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

don't camel case keys of dicts in style (#3982)

Browse Source 
* don't camel case keys of dicts in style

* change tests to fit the code 😎

* respect objectvars as true dicts
This commit is contained in:
Khaleel Al-Adhami 2024-09-24 17:38:49 -07:00 committed by GitHub
parent 46be46d6ea
commit 5e738fd62b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reflex/components/component.py
View File

@ -477,7 +477,7 @@ class Component(BaseComponent, ABC):
# Merge styles, the later ones overriding keys in the earlier ones. # Merge styles, the later ones overriding keys in the earlier ones.
style = {k: v for style_dict in style for k, v in style_dict.items()} style = {k: v for style_dict in style for k, v in style_dict.items()}
if isinstance(style, Breakpoints): if isinstance(style, (Breakpoints, Var)):
style = { style = {
# Assign the Breakpoints to the self-referential selector to avoid squashing down to a regular dict. # Assign the Breakpoints to the self-referential selector to avoid squashing down to a regular dict.
"&": style, "&": style,

14
reflex/style.py
View File

@ -13,6 +13,7 @@ from reflex.utils.imports import ImportVar
from reflex.vars import VarData from reflex.vars import VarData
from reflex.vars.base import CallableVar, LiteralVar, Var from reflex.vars.base import CallableVar, LiteralVar, Var
from reflex.vars.function import FunctionVar from reflex.vars.function import FunctionVar
from reflex.vars.object import ObjectVar
SYSTEM_COLOR_MODE: str = "system" SYSTEM_COLOR_MODE: str = "system"
LIGHT_COLOR_MODE: str = "light" LIGHT_COLOR_MODE: str = "light"
@ -188,7 +189,16 @@ def convert(
out[k] = return_value out[k] = return_value
for key, value in style_dict.items(): for key, value in style_dict.items():
keys = format_style_key(key) keys = (
format_style_key(key)
if not isinstance(value, (dict, ObjectVar))
or (
isinstance(value, Breakpoints)
and all(not isinstance(v, dict) for v in value.values())
)
else (key,)
)
if isinstance(value, Var): if isinstance(value, Var):
return_val = value return_val = value
new_var_data = value._get_all_var_data() new_var_data = value._get_all_var_data()
@ -283,7 +293,7 @@ def _format_emotion_style_pseudo_selector(key: str) -> str:
"""Format a pseudo selector for emotion CSS-in-JS. """Format a pseudo selector for emotion CSS-in-JS.
Args: Args:
key: Underscore-prefixed or colon-prefixed pseudo selector key (_hover). key: Underscore-prefixed or colon-prefixed pseudo selector key (_hover/:hover).
Returns: Returns:
A self-referential pseudo selector key (&:hover). A self-referential pseudo selector key (&:hover).

6
tests/test_style.py
View File

@ -15,9 +15,9 @@ test_style = [
({"a": 1}, {"a": 1}), ({"a": 1}, {"a": 1}),
({"a": LiteralVar.create("abc")}, {"a": "abc"}), ({"a": LiteralVar.create("abc")}, {"a": "abc"}),
({"test_case": 1}, {"testCase": 1}), ({"test_case": 1}, {"testCase": 1}),
({"test_case": {"a": 1}}, {"testCase": {"a": 1}}), ({"test_case": {"a": 1}}, {"test_case": {"a": 1}}),
({":test_case": {"a": 1}}, {":testCase": {"a": 1}}), ({":test_case": {"a": 1}}, {":test_case": {"a": 1}}),
({"::test_case": {"a": 1}}, {"::testCase": {"a": 1}}), ({"::test_case": {"a": 1}}, {"::test_case": {"a": 1}}),
( (
{"::-webkit-scrollbar": {"display": "none"}}, {"::-webkit-scrollbar": {"display": "none"}},
{"::-webkit-scrollbar": {"display": "none"}}, {"::-webkit-scrollbar": {"display": "none"}},