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

[REF-2915] ComponentState subclasses are always treated as mixin (#3372)

Browse Source 
Always treat ComponentState subclasses as mixin, and explicitly pass
`mixin=False` in `.create` classmethod when intentionally creating a substate.

This allows a "base" ComponentState to have subclasses that also work as
ComponentState themselves.

Fix #3368
This commit is contained in:
Masen Furer 2024-05-22 16:12:33 -07:00 committed by GitHub
parent 956a526b20
commit ed39c27bfb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
reflex/state.py
View File

@ -757,7 +757,9 @@ class BaseState(Base, ABC, extra=pydantic.Extra.allow):
for base in cls.__bases__ for base in cls.__bases__
if issubclass(base, BaseState) and base is not BaseState and not base._mixin if issubclass(base, BaseState) and base is not BaseState and not base._mixin
] ]
assert len(parent_states) < 2, "Only one parent state is allowed." assert (
len(parent_states) < 2
), f"Only one parent state is allowed {parent_states}."
return parent_states[0] if len(parent_states) == 1 else None # type: ignore return parent_states[0] if len(parent_states) == 1 else None # type: ignore
@classmethod @classmethod
@ -1887,15 +1889,13 @@ class ComponentState(State, mixin=True):
_per_component_state_instance_count: ClassVar[int] = 0 _per_component_state_instance_count: ClassVar[int] = 0
@classmethod @classmethod
def __init_subclass__(cls, mixin: bool = False, **kwargs): def __init_subclass__(cls, mixin: bool = True, **kwargs):
"""Overwrite mixin default to True. """Overwrite mixin default to True.
Args: Args:
mixin: Whether the subclass is a mixin and should not be initialized. mixin: Whether the subclass is a mixin and should not be initialized.
**kwargs: The kwargs to pass to the pydantic init_subclass method. **kwargs: The kwargs to pass to the pydantic init_subclass method.
""" """
if ComponentState in cls.__bases__:
mixin = True
super().__init_subclass__(mixin=mixin, **kwargs) super().__init_subclass__(mixin=mixin, **kwargs)
@classmethod @classmethod
@ -1926,7 +1926,7 @@ class ComponentState(State, mixin=True):
""" """
cls._per_component_state_instance_count += 1 cls._per_component_state_instance_count += 1
state_cls_name = f"{cls.__name__}_n{cls._per_component_state_instance_count}" state_cls_name = f"{cls.__name__}_n{cls._per_component_state_instance_count}"
component_state = type(state_cls_name, (cls, State), {}) component_state = type(state_cls_name, (cls, State), {}, mixin=False)
component = component_state.get_component(*children, **props) component = component_state.get_component(*children, **props)
component.State = component_state component.State = component_state
return component return component