merging two style instance should give a style instance (#4706)
* merging two style instance should give a style instance * fix ci * carry _var_data
This commit is contained in:
parent
42e6dfa40d
commit
3bd2bea54d
@ -292,6 +292,18 @@ class Style(dict):
|
||||
)
|
||||
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.
|
||||
|
Loading…
Reference in New Issue
Block a user