streamlit-plugins 0.7.12__tar.gz → 0.7.13__tar.gz

{streamlit_plugins-0.7.12/streamlit_plugins.egg-info → streamlit_plugins-0.7.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: streamlit-plugins
-Version: 0.7.12
+Version: 0.7.13
 Summary: Components and Frameworks to give new features to streamlit
 Home-page: https://github.com/quiradev/streamlit-plugins
 Author: Victor Quilon Ranera

{streamlit_plugins-0.7.12 → streamlit_plugins-0.7.13}/streamlit_plugins/components/loader/__init__.py

@@ -6,6 +6,8 @@ from typing import TypeVar, Callable, Tuple, Optional
 
 import streamlit as st
 
+LOADER_Z_INDEX = 999999
+
 SHOWCASE2_GLOBAL_STYLES = """
     <style>
         a{
@@ -476,7 +478,7 @@ SHOWCASE_GLOBAL_STYLES = """
         flex-wrap: nowrap;
         justify-content: center;
         pointer-events: none;
-        z-index: 999;
+        z-index: LOADER_Z_INDEX_1;
     }
 
     .loader-star {
@@ -2403,7 +2405,7 @@ SHOWCASE_GLOBAL_STYLES = """
         }
     }
 </style>
-"""
+""".replace("LOADER_Z_INDEX", str(LOADER_Z_INDEX)).replace("LOADER_Z_INDEX_1", str(LOADER_Z_INDEX-1))
 
 
 def points_line(**kwargs):
@@ -2431,7 +2433,7 @@ def points_line(**kwargs):
         }            
         .container {
             text-align: center;
-            z-index: 999;
+            z-index: LOADER_Z_INDEX_1;
         }
         section {
             /* width: 30%; */
@@ -2588,7 +2590,7 @@ def grid_points(**kwargs):
         }            
         .container {
             text-align: center;
-            z-index: 999;
+            z-index: LOADER_Z_INDEX_1;
         }
         section {
             /* width: 30%; */
@@ -2734,7 +2736,7 @@ def pulse_bars(**kwargs):
         }            
         .container {
             text-align: center;
-            z-index: 999;
+            z-index: LOADER_Z_INDEX_1;
         }
         section {
             /* width: 30%; */
@@ -2858,7 +2860,7 @@ def pacman_loader(**kwargs):
         }            
         .container {
             text-align: center;
-            z-index: 999;
+            z-index: LOADER_Z_INDEX_1;
         }
         @keyframes ldio-2h0ei997e6j-1 {
             0% { transform: rotate(0deg) }
@@ -3313,7 +3315,7 @@ def standard_loaders(index=0):
         }
         .container {
             text-align: center;
-            z-index: 999;
+            z-index: LOADER_Z_INDEX_1;
         }
         section {
             /* width: 30%; */
@@ -3445,7 +3447,7 @@ def book_loader(**kwargs):
             height: 350px;
             /* background: #000000e6; */
             border-radius: 50%;
-            z-index: 1000;
+            z-index: LOADER_Z_INDEX;
         }
         .book-parent:after {
             content: "";
@@ -3456,7 +3458,7 @@ def book_loader(**kwargs):
             height: 100vh;
             background: ||-bcolor-||;
             backdrop-filter: blur(2px);
-            z-index: 999;
+            z-index: LOADER_Z_INDEX_1;
         }
         .book-container {
             --duration: 6s;
@@ -3469,7 +3471,7 @@ def book_loader(**kwargs):
             flex-wrap: nowrap;
             align-items: center;
             pointer-events: none;
-            z-index: 1000;
+            z-index: LOADER_Z_INDEX;
         }
         .book-container .icon {
             position: absolute;
@@ -4414,18 +4416,29 @@ def get_loader(loader_lib: LoadersLib | Callable[..., Tuple[str, str ,str], ], *
 class BaseLoader(ABC):
     LOADER_KEY = 'loader_container'
 
-    def __init__(self, loader_container=None, **kwargs):
-        if loader_container is None:
-            loader_container = st.container(key=self.LOADER_KEY)
-            with loader_container:
-                st.markdown(
-                    f"<style>\ndiv:has(>.st-key-{self.LOADER_KEY}){{\nheight: 0; position: absolute;\n}}\n</style>",
-                    unsafe_allow_html=True
-                )
+    def __init__(self, loader_container_key: Optional[str] = None, **kwargs):
+        if loader_container_key is None:
+            loader_container_key = self.LOADER_KEY
+        self.loader_container_key = loader_container_key
+
+        if "loader_container" in kwargs:
+            loader_container = kwargs["loader_container"]
+        else:
+            loader_container = st.container(key=self.loader_container_key)
+
+        with loader_container:
+            st.markdown(
+                f"<style>\ndiv:has(>.st-key-{self.loader_container_key}){{\nheight: 0; position: absolute;left:0;z-index:{LOADER_Z_INDEX-1}\n}}\n</style>",
+                unsafe_allow_html=True
+            )
         self.loader_container = loader_container
 
     def recreate_loader_with(self, **loader_kwargs) -> "LoaderType":
-        return self.__class__(loader_container=self.loader_container, **loader_kwargs)
+        return self.__class__(
+            loader_container_key=self.loader_container_key,
+            loader_container=self.loader_container,
+            **loader_kwargs
+        )
 
     @abstractmethod
     def run_loader(self, **kwargs):
@@ -4440,13 +4453,14 @@ LoaderType = TypeVar('LoaderType', bound=BaseLoader)
 
 class DefaultLoader(BaseLoader):
     def __init__(self,
-        loader_container=None,
+        loader_container_key: Optional[str] = None,
         label='', height=256,
         primary_color=None, background_color=None,
         loader_lib: LoadersLib | Callable[..., Tuple[str, str ,str], ] = LoadersLib.book_loader, index=0, loader_lib_kwargs: dict = None,
-        sleep_animation_time: float = 0.1
+        sleep_animation_time: float = 0.1,
+         **kwargs
     ):
-        super().__init__(loader_container=loader_container)
+        super().__init__(loader_container_key=loader_container_key, **kwargs)
         self.sleep_animation_time = sleep_animation_time
         if primary_color is None:
             if st.get_option('theme.primaryColor') is None:
@@ -4479,10 +4493,10 @@ class DefaultLoader(BaseLoader):
 
         loader_div, loader_style, loader_output_style = get_loader(loader_lib, index=index, **loader_lib_kwargs)
         self.loader_div = loader_div
-        self.loader_style = loader_style
+        self.loader_style = loader_style.replace("LOADER_Z_INDEX", str(LOADER_Z_INDEX)).replace("LOADER_Z_INDEX_1", str(LOADER_Z_INDEX-1))
 
         self.element_code = loader_div.replace("||-label-||", label)
-        self.element_style = loader_style.replace('||-height-||', height_css)
+        self.element_style = self.loader_style.replace('||-height-||', height_css)
         self.element_style = self.element_style.replace('||-pcolor-||', primary_color)
         self.element_style = self.element_style.replace('||-bcolor-||', background_color)
 

{streamlit_plugins-0.7.12 → streamlit_plugins-0.7.13}/streamlit_plugins/components/navbar/__init__.py

@@ -36,6 +36,9 @@ logger = logging.getLogger(__name__)
 
 NavbarPositionType = Literal["top", "under", "side", "static", "hidden"]
 
+NAVIGATION_KEY_PREFIX = "__navigation"
+NAVBAR_KEY_PREFIX = "__navbar"
+NAVIGATION_COMPONENT_KEY = "navigation-component"
 GAP_BETWEEN_COMPS = 1
 TOP_SIDE_ELEMENTS_MARGIN = 1.05
 TOP_SIDE_ELEMENTS_WIDTH = 4
@@ -367,6 +370,13 @@ body.nav-open div:has(> iframe[title="{_component_func.name}"]) {{
 }}
 """
 
+HIDE_SKELETON_STYLE = f"""
+div:has(> iframe[title="{_component_func.name}"]) [data-testid="stSkeleton"],
+div:has(> iframe[title="{_component_func.name}"]) .stSkeleton {{
+    display: none;
+}}
+"""
+
 # TODO: Hay que poner margenes en el iframe para que no ocupe el 100% de ancho si es menor la pantalla a 575
 
 MATERIAL_ICON_HOME = ":material/home:"
@@ -618,6 +628,7 @@ def st_navbar(
     input_styles: str | None = None,
     themes_data: list[dict]| None = None,
     theme_changer: bool = False,
+    hide_skeleton: bool = False,
     collapsible: bool = True,
     prefix_url: str = "",
     # url_navigation: bool = False,
@@ -641,11 +652,11 @@ def st_navbar(
             # Mostrar un warning de python de que no tendra efecto
             warnings.warn("The sticky_nav parameter will have no effect when calling st_navbar directly")
 
-    if "navbar_coi_instance" not in st.session_state:
-        st.session_state.navbar_coi_instance = False
+    if f"{NAVBAR_KEY_PREFIX}_coi_instance" not in st.session_state:
+        st.session_state[f"{NAVBAR_KEY_PREFIX}_coi_instance"] = False
 
-    if "navbar_st_styles_loaded" not in st.session_state:
-        st.session_state.navbar_st_styles_loaded = False
+    if f"{NAVBAR_KEY_PREFIX}_st_styles_loaded" not in st.session_state:
+        st.session_state[f"{NAVBAR_KEY_PREFIX}_st_styles_loaded"] = False
 
     if is_navigation:
         if themes_data is None and theme_changer:
@@ -655,8 +666,8 @@ def st_navbar(
     else:
         theme_changer = False
 
-    navbar_view = st.container(key=f"{key}_container_navbar")
-    coi_styles_view = st.container(key=f"{key}_container_coi_styles")
+    navbar_view = st.container(key=f"{NAVBAR_KEY_PREFIX}_{key}_container_navbar")
+    coi_styles_view = st.container(key=f"{NAVBAR_KEY_PREFIX}_{key}_container_coi_styles")
 
     # https://github.com/SnpM/streamlit-scroll-navigation
     with coi_styles_view:
@@ -722,17 +733,19 @@ def st_navbar(
         default_page_selected_id = override_page_selected_id
 
     input_styles = input_styles or ""
-    styles = f"\ndiv:has(> .st-key-{key}_container_coi_styles) {{\nheight: 0;\nposition: absolute;\n}}\n"
-    if not st.session_state.navbar_st_styles_loaded:
+    styles = f"\ndiv:has(> .st-key-{NAVBAR_KEY_PREFIX}_{key}_container_coi_styles) {{\nheight: 0;\nposition: absolute;\n}}\n"
+    if not st.session_state.get(f"{NAVBAR_KEY_PREFIX}_st_styles_loaded", False):
         styles += load_st_styles()
+        if hide_skeleton:
+            styles += HIDE_SKELETON_STYLE
         with coi_styles_view:
             st.markdown(f"<style>\n{input_styles}\n{styles}\n<style>", unsafe_allow_html=True)
 
-    # if not st.session_state.navbar_coi_instance:
+    # if not st.session_state.get(f"{NAVBAR_KEY_PREFIX}_coi_instance", False):
     # styles = load_st_styles()
     with coi_styles_view:
         instantiate_crossorigin_interface(_component_func.name, key, is_navigation, default_page_selected_id, position_mode, sticky_nav)
-        st.session_state.navbar_coi_instance = True
+        st.session_state[f"{NAVBAR_KEY_PREFIX}_coi_instance"] = True
 
     with navbar_view:
         component_value = _component_func(
@@ -771,7 +784,7 @@ def st_navbar(
     return component_value
 
 def st_which_page() -> str:
-    return st.session_state["navigation_page_id"]
+    return st.session_state[f"{NAVIGATION_KEY_PREFIX}_page_id"]
 
 def st_navigation(
     pages: list[StreamlitPage] | dict[str, list[StreamlitPage]],
@@ -785,23 +798,28 @@ def st_navigation(
     input_styles: str | None = None,
     themes_data: list[dict]| None = None,
     theme_changer: bool = True,
-    prefix_url: str = "",
-    key="NavigationComponent",
+    prefix_url: str = ""
 ) -> StreamlitPage:
-    if "navigation_prev_url_page_id" not in st.session_state:
-        st.session_state.navigation_prev_url_page_id = None
+    prev_url_page_id_key = f"{NAVIGATION_KEY_PREFIX}_prev_url_page_id"
+    prev_page_id_key = f"{NAVIGATION_KEY_PREFIX}_prev_page_id"
+    page_id_key = f"{NAVIGATION_KEY_PREFIX}_page_id"
+    force_page_id_key = f"{NAVIGATION_KEY_PREFIX}_force_page_id"
+    history_key = f"{NAVIGATION_KEY_PREFIX}_history"
+
+    if prev_url_page_id_key not in st.session_state:
+        st.session_state[prev_url_page_id_key] = None
 
-    if "navigation_prev_page_id" not in st.session_state:
-        st.session_state.navigation_prev_page_id = None
+    if prev_page_id_key not in st.session_state:
+        st.session_state[prev_page_id_key] = None
 
-    if "navigation_page_id" not in st.session_state:
-        st.session_state.navigation_page_id = None
+    if page_id_key not in st.session_state:
+        st.session_state[page_id_key] = None
 
-    if "navigation_force_page_id" not in st.session_state:
-        st.session_state.navigation_force_page_id = None
+    if force_page_id_key not in st.session_state:
+        st.session_state[force_page_id_key] = None
 
-    if "navigation_history" not in st.session_state:
-        st.session_state.navigation_history = []
+    if history_key not in st.session_state:
+        st.session_state[history_key] = []
 
     # Build state
     # {
@@ -883,41 +901,41 @@ def st_navigation(
         logout_page=logout_page,
     )
 
-    st.session_state["navigation_menu_pages"] = menu_pages
-    st.session_state["navigation_menu_account_pages"] = menu_account_pages
-    st.session_state["navigation_default_page_id"] = default_page._script_hash
+    st.session_state[f"{NAVIGATION_KEY_PREFIX}_menu_pages"] = menu_pages
+    st.session_state[f"{NAVIGATION_KEY_PREFIX}_menu_account_pages"] = menu_account_pages
+    st.session_state[f"{NAVIGATION_KEY_PREFIX}_default_page_id"] = default_page._script_hash
 
     logout_page_id, login_page_id = None, None
     if login_page:
         login_page_id = login_page._script_hash
-        st.session_state["navigation_login_page_id"] = login_page_id
-    
+        st.session_state[f"{NAVIGATION_KEY_PREFIX}_login_page_id"] = login_page_id
+
     if logout_page:
         logout_page_id = logout_page._script_hash
-        st.session_state["navigation_logout_page_id"] = logout_page_id
+        st.session_state[f"{NAVIGATION_KEY_PREFIX}_logout_page_id"] = logout_page_id
 
     if account_page:
         account_page_id = account_page._script_hash
-        st.session_state["navigation_account_page_id"] = account_page_id
+        st.session_state[f"{NAVIGATION_KEY_PREFIX}_account_page_id"] = account_page_id
 
     if settings_page:
         settings_page_id = settings_page._script_hash
-        st.session_state["navigation_settings_page_id"] = settings_page_id
+        st.session_state[f"{NAVIGATION_KEY_PREFIX}_settings_page_id"] = settings_page_id
 
 
-    st.session_state["navigation_page_map"] = pages_map
+    st.session_state[f"{NAVIGATION_KEY_PREFIX}_page_map"] = pages_map
 
 
-    if st.session_state["navigation_page_id"] is None:
-        st.session_state["navigation_page_id"] = st.session_state["navigation_default_page_id"]
-    
+    if st.session_state[page_id_key] is None:
+        st.session_state[page_id_key] = st.session_state[f"{NAVIGATION_KEY_PREFIX}_default_page_id"]
+
     next_page_id = st_navbar(
         menu_definition=menu_pages,  # if st.session_state.logged_in else [],
         home_definition=home_definition,
         login_definition=menu_account_pages,
         hide_streamlit_markers=False,
-        default_page_selected_id=st.session_state["navigation_page_id"] or st.session_state["navigation_default_page_id"],
-        override_page_selected_id=st.session_state["navigation_force_page_id"],
+        default_page_selected_id=st.session_state[page_id_key] or st.session_state[f"{NAVIGATION_KEY_PREFIX}_default_page_id"],
+        override_page_selected_id=st.session_state[force_page_id_key],
         position_mode=position_mode,
         sticky_nav=sticky_nav,
         input_styles=input_styles,
@@ -925,11 +943,12 @@ def st_navigation(
         theme_changer=theme_changer,
         prefix_url=prefix_url,
         # url_navigation=native_way,  # and url_navigation,
-        key=key,
+        key=NAVIGATION_COMPONENT_KEY,
+        hide_skeleton=True,
     )
-    st.session_state["navigation_force_page_id"] = None
-    prev_page_id = st.session_state["navigation_page_id"]
-    st.session_state["navigation_page_id"] = next_page_id  # Added to fix login/logout issue
+    st.session_state[force_page_id_key] = None
+    prev_page_id = st.session_state[page_id_key]
+    st.session_state[page_id_key] = next_page_id  # Added to fix login/logout issue
     # print("CUSTOM COMPONENT", pages_map[next_page_id].title)
     if native_way:
         # Si la url es el path igual al que devuelve el `next_page_id` quiere decir que la navegacion es por url
@@ -940,11 +959,11 @@ def st_navigation(
         #         pages_map, st.context.url, prefix_url=prefix_url
         #     )
         #     # print("URL PAGE", pages_map[url_page_id].title)
-        #     if url_page_id != st.session_state["navigation_prev_url_page_id"]:
+        #     if url_page_id != st.session_state[f"{NAVIGATION_KEY_PREFIX}_prev_url_page_id"]:
         #         # Navegacion por url
         #         # Give enough time to the custom component to update
         #         time.sleep(0.1)
-        #         st.session_state["navigation_prev_url_page_id"] = url_page_id
+        #         st.session_state[f"{NAVIGATION_KEY_PREFIX}_prev_url_page_id"] = url_page_id
         #         next_page_id = url_page_id
 
         page = st.navigation(
@@ -960,9 +979,9 @@ def st_navigation(
 
     # Solo si se cambia de pagina
     if prev_page_id != next_page_id:
-        st.session_state["navigation_page_id"] = next_page_id
+        st.session_state[page_id_key] = next_page_id
         if prev_page_id not in [logout_page_id, login_page_id]:
-            st.session_state["navigation_prev_page_id"] = prev_page_id
+            st.session_state[prev_page_id_key] = prev_page_id
         st_switch_page(next_page_id, native_way=native_way)
 
     page._can_be_called = True
@@ -970,19 +989,20 @@ def st_navigation(
     return page
 
 def add_page_to_history(page_id: str):
-    if "navigation_history" not in st.session_state:
-        st.session_state["navigation_history"] = []
+    history_key = f"{NAVIGATION_KEY_PREFIX}_history"
+    if history_key not in st.session_state:
+        st.session_state[history_key] = []
 
-    if len(st.session_state.navigation_history) > 0:
-        last_page_id, runs =  st.session_state.navigation_history[-1].split("::")
+    if len(st.session_state[history_key]) > 0:
+        last_page_id, runs = st.session_state[history_key][-1].split("::")
         if page_id == last_page_id:
-            st.session_state.navigation_history[-1] = f"{page_id}::{int(runs) + 1}"
+            st.session_state[history_key][-1] = f"{page_id}::{int(runs) + 1}"
             return
 
-    st.session_state.navigation_history.append(f"{page_id}::1")
+    st.session_state[history_key].append(f"{page_id}::1")
 
 def has_changed_page() -> bool:
-    history = st.session_state.get("navigation_history", [])
+    history = st.session_state.get(f"{NAVIGATION_KEY_PREFIX}_history", [])
     if not history or len(history) < 2:
         return False
 
@@ -997,37 +1017,42 @@ def has_changed_page() -> bool:
         return False
 
 def set_default_page(page_id: str):
-    st.session_state["navigation_default_page_id"] = page_id
+    st.session_state[f"{NAVIGATION_KEY_PREFIX}_default_page_id"] = page_id
 
 def init_navigation_transition(prev_page_id: str, page_id: str):
-    if "navigation_prev_page_id" not in st.session_state:
-        st.session_state["navigation_prev_page_id"] = prev_page_id
-    if "navigation_page_id" not in st.session_state:
-        st.session_state["navigation_page_id"] = page_id
+    prev_page_key = f"{NAVIGATION_KEY_PREFIX}_prev_page_id"
+    page_key = f"{NAVIGATION_KEY_PREFIX}_page_id"
+    if prev_page_key not in st.session_state:
+        st.session_state[prev_page_key] = prev_page_id
+    if page_key not in st.session_state:
+        st.session_state[page_key] = page_id
 
 def set_navigation_transition(prev_page_id: str, page_id: str):
-    st.session_state["navigation_prev_page_id"] = prev_page_id
-    st.session_state["navigation_page_id"] = page_id
+    st.session_state[f"{NAVIGATION_KEY_PREFIX}_prev_page_id"] = prev_page_id
+    st.session_state[f"{NAVIGATION_KEY_PREFIX}_page_id"] = page_id
 
 def set_force_next_page(page_id: str):
-    st.session_state["navigation_force_page_id"] = page_id
+    st.session_state[f"{NAVIGATION_KEY_PREFIX}_force_page_id"] = page_id
 
 def get_navigation_transition() -> tuple[str, str]:
-    return st.session_state["navigation_prev_page_id"], st.session_state["navigation_page_id"]
+    return (
+        st.session_state[f"{NAVIGATION_KEY_PREFIX}_prev_page_id"],
+        st.session_state[f"{NAVIGATION_KEY_PREFIX}_page_id"],
+    )
 
 def st_switch_home(native_way: bool = False):
-    st_switch_page(st.session_state["navigation_default_page_id"], native_way=native_way)
+    st_switch_page(st.session_state[f"{NAVIGATION_KEY_PREFIX}_default_page_id"], native_way=native_way)
 
 def st_switch_page(page_id: str, native_way: bool = False):
-    pages = st.session_state["navigation_page_map"]
+    pages = st.session_state[f"{NAVIGATION_KEY_PREFIX}_page_map"]
     page = pages.get(page_id, None)
     if page is None:
         raise ValueError(f"Page with id {page_id} not found")
 
     # add_page_to_history(page_id)
-    st.session_state["navigation_force_page_id"] = page_id
+    st.session_state[f"{NAVIGATION_KEY_PREFIX}_force_page_id"] = page_id
     if native_way:
-        st.switch_page(page)
+        st.switch_page(page, query_params=dict(st.query_params))
     else:
         st.rerun()
         # ctx = get_script_run_ctx()
@@ -1041,7 +1066,7 @@ def st_switch_page(page_id: str, native_way: bool = False):
         #         raise RerunException(rerun_data)
 
 def get_pages_info() -> tuple[dict[str, str], str, list[dict], list[dict], str | None, str | None, str | None, str | None]:
-    pages = st.session_state["navigation_page_map"]
+    pages = st.session_state[f"{NAVIGATION_KEY_PREFIX}_page_map"]
 
     default_page = next(filter(lambda p: p._default, pages.values()), None)
     if default_page is None:
@@ -1049,12 +1074,12 @@ def get_pages_info() -> tuple[dict[str, str], str, list[dict], list[dict], str |
 
     default_page_id = default_page._script_hash
     
-    login_page_id = st.session_state.get("navigation_login_page_id", None)
-    logout_page_id = st.session_state.get("navigation_logout_page_id", None)
-    account_page_id = st.session_state.get("navigation_account_page_id", None)
-    settings_page_id = st.session_state.get("navigation_settings_page_id", None)
+    login_page_id = st.session_state.get(f"{NAVIGATION_KEY_PREFIX}_login_page_id", None)
+    logout_page_id = st.session_state.get(f"{NAVIGATION_KEY_PREFIX}_logout_page_id", None)
+    account_page_id = st.session_state.get(f"{NAVIGATION_KEY_PREFIX}_account_page_id", None)
+    settings_page_id = st.session_state.get(f"{NAVIGATION_KEY_PREFIX}_settings_page_id", None)
 
-    menu_pages = st.session_state["navigation_menu_pages"]
-    menu_account_pages = st.session_state["navigation_menu_account_pages"]
+    menu_pages = st.session_state[f"{NAVIGATION_KEY_PREFIX}_menu_pages"]
+    menu_account_pages = st.session_state[f"{NAVIGATION_KEY_PREFIX}_menu_account_pages"]
 
     return pages, default_page_id, menu_pages, menu_account_pages, login_page_id, logout_page_id, account_page_id, settings_page_id