Update page_files/Categorized_Search.py

page_files/Categorized_Search.py

@@ -8,14 +8,24 @@ from PIL import Image
 
 from data_loader import get_all_sections, load_material_data
 import streamlit.components.v1 as components
-
-def switch_tab(index):
+def clear_search():
+    """Clear the search box and search term. Called as a callback from other widgets."""
+    st.session_state._search_term = None
+    st.session_state["_pending_clear_search"] = True  
+
+def switch_tab(index, clear=True):
+    count = st.session_state.get('_tab_switch_count', 0) + 1
+    st.session_state['_tab_switch_count'] = count
     components.html(f"""
         <script>
+            var _unique = {count};
             var tabs = window.parent.document.querySelectorAll('[data-testid="stTabs"] button[role="tab"]');
             if (tabs.length > {index}) tabs[{index}].click();
         </script>
     """, height=0)
+    st.session_state.current_tab = index
+    if clear:
+        clear_search()
 st.markdown(
     """
     <style>
@@ -382,13 +392,17 @@ def toggle_class(material_class: str):
         st.session_state.active_classes = []  
     else:
         st.session_state.active_classes = [material_class]  
+
     st.session_state.current_page = 0
     st.session_state.selected_row = None
     st.session_state["last_synced_abbr"] = None
+    # Clear the dataframe selection for page 0
     df_key = f"materials_df_0"
     if df_key in st.session_state:
         st.session_state[df_key] = {"selection": {"rows": [], "columns": [], "cells": []}}
     st.session_state["_switch_to_tab"] = 0
+    clear_search()
+
 
 
 def visible_page_numbers(current_page: int, total_pages: int):
@@ -420,7 +434,10 @@ defaults = {
 for key, value in defaults.items():
     if key not in st.session_state:
         st.session_state[key] = value
-
+if st.session_state.get("_last_page") != "Categorized_Search":
+    st.session_state._search_term = None
+    st.session_state.top_search_input = ""
+    st.session_state._last_page = "Categorized_Search"
 if "material_type" in st.session_state:
     incoming_type = st.session_state.pop("material_type")
     if incoming_type in ["Composites", "Polymers", "Fibers"]:
@@ -431,10 +448,9 @@ if "selected_section" in st.session_state:
     st.session_state._reset_prop_checks = True
 
 if "search_term" in st.session_state:
-    st.session_state._search_term = st.session_state.pop("search_term")
-
-if st.session_state._search_term and not st.session_state.top_search_input:
-    st.session_state.top_search_input = st.session_state._search_term
+    incoming_term = st.session_state.pop("search_term")
+    st.session_state._search_term = incoming_term
+    st.session_state.top_search_input = incoming_term
 
 all_data = load_all_data()
 if "user_uploaded_data" in st.session_state:
@@ -504,7 +520,17 @@ st.session_state.current_page = min(st.session_state.current_page, total_pages -
 start = st.session_state.current_page * PAGE_SIZE
 end = start + PAGE_SIZE
 page_meta = filtered_meta.iloc[start:end].reset_index(drop=True)
-
+if st.session_state.pop("_restore_selection_highlight", False):
+    st.session_state.pop("_search_just_changed", None)
+    if st.session_state.selected_row:
+        abbr = st.session_state.selected_row[0]
+        match = page_meta[page_meta["material_abbreviation"] == abbr]
+        if not match.empty:
+            st.session_state["pending_row_select"] = match.index[0]
+        else:
+            st.session_state.pop("pending_row_select", None)  # ← clear stale index
+            st.session_state["_clear_df_selection"] = True    # ← clear wrong highlight
+            st.session_state["_search_just_changed"] = True
 left_col, right_col = st.columns([1.03, 3.07], gap="small")
 
 with left_col:
@@ -621,39 +647,69 @@ with left_col:
             disabled=st.session_state.selected_row is None,
         ):
             st.info("Open the Inspect tab on the right panel.")
-            switch_tab(1)
+            st.session_state["_switch_to_tab"] = 1
         if st.session_state.selected_row:
             selected_abbr, selected_name = st.session_state.selected_row
             st.markdown(
                 f"<div class='aim-selected'><b>Selected</b><br>{selected_name}<br><span style='font-family:monospace'>{selected_abbr}</span></div>",
                 unsafe_allow_html=True,
             )
-
+if st.session_state.pop("_pending_clear_search", False):
+    st.session_state.top_search_input = ""
+if st.session_state._search_term != st.session_state.get("_previous_search_term"):
+    if st.session_state.top_search_input:
+        st.session_state._search_term = st.session_state.top_search_input
+    if st.session_state._search_term:
+        st.session_state.selected_row = None
+        st.session_state["_clear_df_selection"] = True
+        switch_tab(0, clear=False)
+    st.session_state["_previous_search_term"] = st.session_state._search_term
 with right_col:
-    #with st.container(border=True):
-    #    with st.container(key="top_search_row"):
-    #        input_col, btn_col = st.columns([0.82, 0.18], gap="small")
-    #        with input_col:
-    #            search_query = st.text_input(
-    #                label="Search",
-    #                placeholder="Search by material name, property, or abbreviation...",
-    #                label_visibility="collapsed",
-    #                key="top_search_input",
-     #           )
-     #       with btn_col:
-     #           search_clicked = st.button("Search", key="top_search_btn", use_container_width=True)
-
-    #if search_clicked:
-    #    query = (search_query or "").strip()
-    #    st.session_state._search_term = query if query else None
-    #    st.session_state.current_page = 0
-    #    st.rerun()
-
+    
+    with st.container(border=True):
+        with st.container(key="top_search_row"):
+            input_col, btn_col = st.columns([0.82, 0.18], gap="small")
+            with input_col:
+                search_query = st.text_input(
+                    label="Search",
+                    placeholder="Search material name or abbreviation...",
+                    label_visibility="collapsed",
+                    key="top_search_input",
+                    on_change=lambda: None,
+                )
+            with btn_col:
+                search_clicked = st.button("Search", key="top_search_btn", width="stretch")
+
+    current_input = (search_query or "").strip()
+    previous_term = st.session_state._search_term or ""
+    st.write(f"DEBUG: fired, current='{current_input}', prev='{previous_term}'")
+    if search_clicked:
+        if current_input:
+            st.session_state["_switch_to_tab"] = 0
+        st.session_state._search_term = current_input if current_input else None
+        st.session_state.current_page = 0
+        if current_input:
+            st.session_state.selected_row = None                 
+        st.session_state["_clear_df_selection"] = True       
+        st.rerun()
+    elif current_input != previous_term:
+        st.session_state._search_term = current_input if current_input else None
+        st.session_state.current_page = 0
+        if current_input:
+            st.session_state.selected_row = None                 
+            st.session_state["_clear_df_selection"] = True
+        else:
+            st.session_state.pop("pending_row_select", None)  # ← clear stale index
+            #st.session_state["_clear_df_selection"] = True    # ← clear visual highlight
+            st.session_state["_restore_selection_highlight"] = True
+        st.session_state["_search_just_changed"] = True
+       
+        st.rerun()
     with st.container(border=True):
         st.markdown(
             """
             <div style='padding:14px 18px 0;'>
-                <div class='aim-breadcrumb'><span>MATERIALS DATABASE</span></div>
+                <div class='aim-breadcrumb'>INVENTORY / <span>MATERIALS DATABASE</span></div>
                 <div class='aim-title'>Materials Database</div>
             </div>
             """,
@@ -664,7 +720,8 @@ with right_col:
             ["All Materials", "Inspect"]
         )
         if st.session_state.get("_switch_to_tab") is not None:
-            switch_tab(st.session_state["_switch_to_tab"])
+            tab_index = st.session_state["_switch_to_tab"]
+            switch_tab(tab_index, clear=(tab_index != 1))
             del st.session_state["_switch_to_tab"]
         with tab_materials:
             filter_label = (
@@ -739,32 +796,56 @@ with right_col:
             selected_cells = event.selection.cells
 
             if selected_rows:
+                
+
                 row_idx = selected_rows[0]
+                if row_idx >= len(page_meta):   
+                        st.session_state.selected_row = None
+                        st.session_state["_clear_df_selection"] = True
+                        st.rerun()
+
                 chosen = page_meta.iloc[row_idx]
                 abbr = chosen["material_abbreviation"]
                 name = chosen["material_name"]
+                
                 if not (st.session_state.selected_row and st.session_state.selected_row[0] == abbr):
-                    st.session_state.selected_row = (abbr, name)
-                    st.rerun()
+                     st.session_state.selected_row = (abbr, name)
+                     
+                     st.rerun()
             else:
-                if st.session_state.selected_row is not None and not selected_cells:
+
+
+                if (
+                    st.session_state.selected_row is not None
+                    and not selected_cells
+                    and not st.session_state.pop("_search_just_changed", False)
+                ):
                     st.session_state.selected_row = None
-                    st.rerun()
+                    
 
+                    st.rerun()
             if selected_cells:
+                
                 row_idx = selected_cells[0][0]
+                if row_idx >= len(page_meta):   
+                    st.session_state["_clear_df_selection"] = True
+                    st.rerun()
+
                 chosen = page_meta.iloc[row_idx]
                 abbr = chosen["material_abbreviation"]
                 name = chosen["material_name"]
                 if st.session_state.selected_row and st.session_state.selected_row[0] == abbr:
                     st.session_state.selected_row = None
-                    st.session_state["pending_row_select"] = None
+                    st.session_state["_clear_df_selection"] = True
+                    
                     st.rerun()
-                elif st.session_state.selected_row is None or st.session_state.selected_row[0] != abbr:
+                if st.session_state.selected_row is None or st.session_state.selected_row[0] != abbr:
                     st.session_state.selected_row = (abbr, name)
                     st.session_state["pending_row_select"] = row_idx
+                    
                     st.rerun()
 
+
             info_col, nav_col = st.columns([2.4, 2.0])
             with info_col:
                 st.markdown(