Skip to content

Commit

Permalink
merging two style instance should give a style instance (#4706)
Browse files Browse the repository at this point in the history
* merging two style instance should give a style instance

* fix ci

* carry _var_data
  • Loading branch information
Lendemor authored Jan 28, 2025
1 parent 42e6dfa commit 3bd2bea
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions reflex/style.py
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,18 @@ def __setitem__(self, key: str, value: Any):
)
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:
"""Format a pseudo selector for emotion CSS-in-JS.
Expand Down

0 comments on commit 3bd2bea

Please sign in to comment.