expand first

Author: ethanndickson

Coder-Desktop/Coder-Desktop/Views/VPN/Agents.swift

@@ -5,6 +5,7 @@ struct Agents<VPN: VPNService>: View {
     @EnvironmentObject var state: AppState
     @State private var viewAll = false
     @State private var expandedItem: VPNMenuItem.ID?
+    @State private var hasToggledExpansion: Bool = false
     private let defaultVisibleRows = 5
 
     let inspection = Inspection<Self>()
@@ -16,8 +17,24 @@ struct Agents<VPN: VPNService>: View {
                 let items = vpn.menuState.sorted
                 let visibleItems = viewAll ? items[...] : items.prefix(defaultVisibleRows)
                 ForEach(visibleItems, id: \.id) { agent in
-                    MenuItemView(item: agent, baseAccessURL: state.baseAccessURL!, expandedItem: $expandedItem)
-                        .padding(.horizontal, Theme.Size.trayMargin)
+                    MenuItemView(
+                        item: agent,
+                        baseAccessURL: state.baseAccessURL!,
+                        expandedItem: $expandedItem,
+                        userInteracted: $hasToggledExpansion
+                    )
+                    .padding(.horizontal, Theme.Size.trayMargin)
+                }.onChange(of: visibleItems) {
+                    // If no workspaces are online, we should expand the first one to come online
+                    if visibleItems.filter({ $0.status != .off }).isEmpty {
+                        hasToggledExpansion = false
+                        return
+                    }
+                    if hasToggledExpansion {
+                        return
+                    }
+                    expandedItem = visibleItems.first?.id
+                    hasToggledExpansion = true
                 }
                 if items.count == 0 {
                     Text("No workspaces!")

Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenuItem.swift

@@ -66,6 +66,7 @@ struct MenuItemView: View {
     let item: VPNMenuItem
     let baseAccessURL: URL
     @Binding var expandedItem: VPNMenuItem.ID?
+    @Binding var userInteracted: Bool
 
     @State private var nameIsSelected: Bool = false
 
@@ -95,6 +96,7 @@ struct MenuItemView: View {
     }
 
     private func toggleExpanded() {
+        userInteracted = true
         if isExpanded {
             withAnimation(.snappy(duration: Theme.Animation.collapsibleDuration)) {
                 expandedItem = nil
@@ -254,6 +256,5 @@ struct AnimatedChevron: View {
             .font(.system(size: 12, weight: .semibold))
             .foregroundColor(color)
             .rotationEffect(.degrees(isExpanded ? 90 : 0))
-            .animation(.easeInOut(duration: Theme.Animation.collapsibleDuration), value: isExpanded)
     }
 }