From 30a1c2dc6556c8302efde6bb006f67a8014c3d62 Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Tue, 6 Jan 2026 01:12:39 -0800
Subject: [PATCH] fix sidebar disappearing on spa navigation to /teams/new

---
 src/lib/stores/sidebar.svelte.ts | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/lib/stores/sidebar.svelte.ts b/src/lib/stores/sidebar.svelte.ts
index 842d599a..8de75579 100644
--- a/src/lib/stores/sidebar.svelte.ts
+++ b/src/lib/stores/sidebar.svelte.ts
@@ -39,10 +39,16 @@ class SidebarStore {
 	/** The pane stack for sidebar navigation */
 	paneStack = new PaneStackStore()
 
+	/** Timeout ID for delayed pane stack clear after close animation */
+	private clearTimeoutId: ReturnType<typeof setTimeout> | null = null
+
 	/**
 	 * Open the sidebar with a snippet content (legacy API)
 	 */
 	open(title?: string, content?: Snippet, scrollable = true) {
+		// Cancel any pending clear from a previous close()
+		this.cancelPendingClear()
+
 		// For snippet content, we don't use the pane stack
 		// This is for backwards compatibility
 		this.state.open = true
@@ -59,6 +65,9 @@ class SidebarStore {
 		props?: Record<string, any>,
 		options?: OpenWithComponentOptions | boolean
 	) {
+		// Cancel any pending clear from a previous close()
+		this.cancelPendingClear()
+
 		// Handle backward compatibility where 4th param was scrollable boolean
 		const opts: OpenWithComponentOptions =
 			typeof options === 'boolean' ? { scrollable: options } : options ?? {}
@@ -112,12 +121,23 @@ class SidebarStore {
 	close() {
 		this.state.open = false
 		this.state.activeItemId = undefined
-		// Clear pane stack after animation
-		setTimeout(() => {
+		// Clear pane stack after animation completes
+		this.clearTimeoutId = setTimeout(() => {
 			this.paneStack.clear()
+			this.clearTimeoutId = null
 		}, 300)
 	}
 
+	/**
+	 * Cancel any pending pane stack clear from a previous close()
+	 */
+	private cancelPendingClear() {
+		if (this.clearTimeoutId) {
+			clearTimeout(this.clearTimeoutId)
+			this.clearTimeoutId = null
+		}
+	}
+
 	/**
 	 * Toggle the sidebar open/close state
 	 */