From eafe53369e4cfd8adcf76464a7039efed474400d Mon Sep 17 00:00:00 2001 From: Masen Furer Date: Mon, 12 Feb 2024 14:55:39 -0800 Subject: [PATCH] keep-chakra: whitelist is always whitelist (#2585) Regardless of whether the same name exists in the top level rx. namespace, always convert whitelisted names to rx.chakra. --- reflex/utils/prerequisites.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/reflex/utils/prerequisites.py b/reflex/utils/prerequisites.py index 19ed398ec..25119458e 100644 --- a/reflex/utils/prerequisites.py +++ b/reflex/utils/prerequisites.py @@ -1003,18 +1003,17 @@ def _get_rx_chakra_component_to_migrate() -> set[str]: rx_chakra_names = set(dir(reflex.chakra)) names_to_migrate = set() + + # whitelist names will always be rewritten as rx.chakra. whitelist = { - "CodeBlock", "ColorModeIcon", "MultiSelect", "MultiSelectOption", - "base", - "code_block", - "color_mode_cond", "color_mode_icon", "multi_select", "multi_select_option", } + for rx_chakra_name in sorted(rx_chakra_names): if rx_chakra_name.startswith("_"): continue @@ -1032,12 +1031,8 @@ def _get_rx_chakra_component_to_migrate() -> set[str]: rx_chakra_object, ChakraComponent ): names_to_migrate.add(rx_chakra_name) - pass - else: - # For the given rx.chakra., does rx. exist? - # And of these, should we include in migration? - if hasattr(reflex, rx_chakra_name) and rx_chakra_name in whitelist: - names_to_migrate.add(rx_chakra_name) + elif rx_chakra_name in whitelist: + names_to_migrate.add(rx_chakra_name) except Exception: raise