Update main.py

main.py

@@ -1,5 +1,5 @@
 """
-BuildSustain - Main Module
+BuildSustain - Main Module (Fixed Version)
 
 This is the main module for the BuildSustain application. It serves as the central
 orchestrator for the application, handling navigation between different modules and managing
@@ -162,8 +162,9 @@ class BuildSustain:
         if 'debug_mode' not in st.session_state:
             st.session_state.debug_mode = False
         
-        if 'rerun_pending' not in st.session_state:
-            st.session_state.rerun_pending = False
+        # Initialize module-specific rerun flags (for future modules that might need them)
+        if 'module_rerun_flags' not in st.session_state:
+            st.session_state.module_rerun_flags = {}
     
     def setup_layout(self):
         """
@@ -192,6 +193,9 @@ class BuildSustain:
             "Materials Cost"
         ]
         
+        # Store previous page for comparison
+        previous_page = st.session_state.current_page
+        
         # Create the navigation radio buttons
         selected_page = st.sidebar.radio(
             "Go to",
@@ -202,10 +206,9 @@ class BuildSustain:
         # Update the current page if changed
         if selected_page != st.session_state.current_page:
             st.session_state.current_page = selected_page
-            # Clear any temporary form states when changing pages
-            for key in list(st.session_state.keys()):
-                if key.endswith("_form_state") or key.endswith("_editor"):
-                    st.session_state.pop(key, None)
+            
+            # Clear module-specific states when leaving certain pages
+            self._handle_page_transition(previous_page, selected_page)
         
         # Add application info to sidebar
         st.sidebar.markdown("---")
@@ -231,10 +234,45 @@ class BuildSustain:
         # Display the selected page content
         self.display_page(st.session_state.current_page)
         
-        # Handle any pending reruns (for form submissions that need to refresh)
-        if st.session_state.rerun_pending:
-            st.session_state.rerun_pending = False
-            st.rerun()
+        # Handle module-specific reruns (only if needed by specific modules)
+        self._handle_module_reruns()
+    
+    def _handle_page_transition(self, previous_page: str, new_page: str):
+        """
+        Handle cleanup when transitioning between pages.
+        Only clear states that are specific to the page being left.
+        """
+        # Clear materials library specific states when leaving that page
+        if previous_page == "Material Library":
+            # Only clear materials library editor states
+            keys_to_clear = [
+                "material_editor", 
+                "fenestration_editor",
+                "material_saved",
+                "fenestration_saved"
+            ]
+            for key in keys_to_clear:
+                if key in st.session_state:
+                    st.session_state.pop(key, None)
+        
+        # Add similar cleanup for other modules as needed
+        # This approach ensures each module's cleanup is isolated
+        
+        # Clear any module-specific rerun flags when changing pages
+        st.session_state.module_rerun_flags = {}
+    
+    def _handle_module_reruns(self):
+        """
+        Handle module-specific rerun requests.
+        This allows modules to request reruns without interfering with each other.
+        """
+        # Check for any module-specific rerun requests
+        for module_name, should_rerun in st.session_state.module_rerun_flags.items():
+            if should_rerun:
+                # Clear the flag and trigger rerun
+                st.session_state.module_rerun_flags[module_name] = False
+                st.rerun()
+                break  # Only handle one rerun at a time
     
     def display_page(self, page: str):
         """