From 1603e0606de96d2404402370287995ca82d07fb6 Mon Sep 17 00:00:00 2001 From: Khaleel Al-Adhami Date: Thu, 15 Aug 2024 12:58:10 -0700 Subject: [PATCH] go back to passing test cases --- reflex/experimental/client_state.py | 17 +++++++---------- reflex/style.py | 5 ++--- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/reflex/experimental/client_state.py b/reflex/experimental/client_state.py index c36b47e54..af3056c4d 100644 --- a/reflex/experimental/client_state.py +++ b/reflex/experimental/client_state.py @@ -11,7 +11,7 @@ from reflex.event import EventChain, EventHandler, EventSpec, call_script from reflex.ivars.base import ImmutableVar, LiteralVar from reflex.ivars.function import FunctionVar from reflex.utils.imports import ImportVar -from reflex.vars import Var, VarData, get_unique_variable_name +from reflex.vars import ImmutableVarData, Var, VarData, get_unique_variable_name NoValue = object() @@ -197,15 +197,12 @@ class ClientStateVar(Var): else: arg = "" setter = f"({arg}) => {setter}({value._var_name_unwrapped})" - return ( - ImmutableVar.create_safe(setter) - .to(FunctionVar, EventChain) - ._replace( - merge_var_data=VarData( # type: ignore - imports=_refs_import if self._global_ref else {} - ) - ) - ) + return ImmutableVar( + _var_name=setter, + _var_data=ImmutableVarData( + imports=_refs_import if self._global_ref else {} + ), + ).to(FunctionVar, EventChain) @property def set(self) -> Var: diff --git a/reflex/style.py b/reflex/style.py index 89bedd03b..a2083f634 100644 --- a/reflex/style.py +++ b/reflex/style.py @@ -6,7 +6,6 @@ from typing import Any, Literal, Tuple, Type from reflex import constants from reflex.components.core.breakpoints import Breakpoints, breakpoints_values -from reflex.constants.base import REFLEX_VAR_OPENING_TAG from reflex.event import EventChain from reflex.ivars.base import ImmutableCallableVar, ImmutableVar, LiteralVar from reflex.ivars.function import FunctionVar @@ -129,8 +128,8 @@ def convert_item( if isinstance(style_item, Var): return style_item, style_item._get_all_var_data() - if isinstance(style_item, str) and REFLEX_VAR_OPENING_TAG not in style_item: - return style_item, None + # if isinstance(style_item, str) and REFLEX_VAR_OPENING_TAG not in style_item: + # return style_item, None # Otherwise, convert to Var to collapse VarData encoded in f-string. new_var = LiteralVar.create(style_item)