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

merging two style instance should give a style instance (#4706)

Browse Source 
* merging two style instance should give a style instance

* fix ci

* carry _var_data
This commit is contained in:
Thomas Brandého 2025-01-28 22:47:57 +01:00 committed by GitHub
parent 42e6dfa40d
commit 3bd2bea54d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
reflex/style.py
View File

@ -292,6 +292,18 @@ class Style(dict):
) )
super().__setitem__(key, value) super().__setitem__(key, value)
def __or__(self, other: Style | dict) -> Style:
"""Combine two styles.
Args:
other: The other style to combine.
Returns:
The combined style.
"""
_var_data = VarData.merge(self._var_data, getattr(other, "_var_data", None))
return Style(super().__or__(self, other), _var_data=_var_data) # pyright: ignore [reportGeneralTypeIssues, reportCallIssue]
def _format_emotion_style_pseudo_selector(key: str) -> str: 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.