improvement: panel tabs handler on click

Author: emir-karabeg

apps/sim/hooks/use-collaborative-workflow.ts

@@ -889,7 +889,7 @@ export function useCollaborativeWorkflow() {
       }
       findAllDescendants(id)
 
-      // If the currently edited block is among the blocks being removed, clear selection to restore the last tab
+      // If the currently edited block is among the blocks being removed, clear selection to reset the panel
       const currentEditedBlockId = usePanelEditorStore.getState().currentBlockId
       if (currentEditedBlockId && blocksToRemove.has(currentEditedBlockId)) {
         usePanelEditorStore.getState().clearCurrentBlock()

apps/sim/stores/panel-new/editor/store.ts

@@ -42,29 +42,18 @@ export const usePanelEditorStore = create<PanelEditorState>()(
       setCurrentBlockId: (blockId) => {
         set({ currentBlockId: blockId })
 
-        // When a block is selected, switch to editor tab and remember previous tab
+        // When a block is selected, always switch to the editor tab
         if (blockId !== null) {
           const panelState = usePanelStore.getState()
-          const currentTab = panelState.activeTab
-
-          // Only save the previous tab if we're not already on the editor tab
-          if (currentTab !== 'editor') {
-            panelState.setPreviousTab(currentTab)
-            panelState.setActiveTab('editor')
-          }
+          panelState.setActiveTab('editor')
         }
       },
       clearCurrentBlock: () => {
         set({ currentBlockId: null })
 
-        // When selection is cleared, restore the previous tab
+        // When selection is cleared (e.g. clicking on the canvas), switch to the toolbar tab
         const panelState = usePanelStore.getState()
-        const previousTab = panelState.previousTab
-
-        if (previousTab !== null) {
-          panelState.setActiveTab(previousTab)
-          panelState.setPreviousTab(null)
-        }
+        panelState.setActiveTab('toolbar')
       },
       setConnectionsHeight: (height) => {
         const clampedHeight = Math.max(

apps/sim/stores/panel-new/store.ts

@@ -34,10 +34,6 @@ export const usePanelStore = create<PanelState>()(
           document.documentElement.removeAttribute('data-panel-active-tab')
         }
       },
-      previousTab: null,
-      setPreviousTab: (tab) => {
-        set({ previousTab: tab })
-      },
       _hasHydrated: false,
       setHasHydrated: (hasHydrated) => {
         set({ _hasHydrated: hasHydrated })

apps/sim/stores/panel-new/types.ts

@@ -11,9 +11,6 @@ export interface PanelState {
   setPanelWidth: (width: number) => void
   activeTab: PanelTab
   setActiveTab: (tab: PanelTab) => void
-  /** The tab that was active before switching to the editor */
-  previousTab: PanelTab | null
-  setPreviousTab: (tab: PanelTab | null) => void
   _hasHydrated: boolean
   setHasHydrated: (hasHydrated: boolean) => void
 }