Commitd4fe07e

committed

expand first

1 parentcd5877a commitd4fe07eCopy full SHA for d4fe07e

File tree

+21

-3

lines changed

+21

-3

lines changed

Lines changed: 19 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ struct Agents<VPN: VPNService>: View {`
`5`	`5`	`@EnvironmentObjectvarstate:AppState`
`6`	`6`	`@StateprivatevarviewAll=false`
`7`	`7`	`@StateprivatevarexpandedItem:VPNMenuItem.ID?`
	`8`	`+@StateprivatevarhasToggledExpansion:Bool=false`
`8`	`9`	`privateletdefaultVisibleRows=5`
`9`	`10`
`10`	`11`	`letinspection=Inspection<Self>()`
`@@ -16,8 +17,24 @@ struct Agents<VPN: VPNService>: View {`
`16`	`17`	`letitems= vpn.menuState.sorted`
`17`	`18`	`letvisibleItems= viewAll?items[...]: items.prefix(defaultVisibleRows)`
`18`	`19`	`ForEach(visibleItems, id: \.id){ agentin`
`19`		`-MenuItemView(item: agent, baseAccessURL: state.baseAccessURL!, expandedItem: $expandedItem)`
`20`		`-.padding(.horizontal,Theme.Size.trayMargin)`
	`20`	`+MenuItemView(`
	`21`	`+ item: agent,`
	`22`	`+ baseAccessURL: state.baseAccessURL!,`
	`23`	`+ expandedItem: $expandedItem,`
	`24`	`+ userInteracted: $hasToggledExpansion`
	`25`	`+)`
	`26`	`+.padding(.horizontal,Theme.Size.trayMargin)`
	`27`	`+}.onChange(of: visibleItems){`
	`28`	`+ // If no workspaces are online, we should expand the first one to come online`
	`29`	`+if visibleItems.filter({ $0.status!=.off}).isEmpty{`
	`30`	`+ hasToggledExpansion=false`
	`31`	`+return`
	`32`	`+}`
	`33`	`+if hasToggledExpansion{`
	`34`	`+return`
	`35`	`+}`
	`36`	`+ expandedItem= visibleItems.first?.id`
	`37`	`+ hasToggledExpansion=true`
`21`	`38`	`}`
`22`	`39`	`if items.count==0{`
`23`	`40`	`Text("No workspaces!")`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ struct MenuItemView: View {`
`66`	`66`	`letitem:VPNMenuItem`
`67`	`67`	`letbaseAccessURL:URL`
`68`	`68`	`@BindingvarexpandedItem:VPNMenuItem.ID?`
	`69`	`+@BindingvaruserInteracted:Bool`
`69`	`70`
`70`	`71`	`@StateprivatevarnameIsSelected:Bool=false`
`71`	`72`
`@@ -95,6 +96,7 @@ struct MenuItemView: View {`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`privatefunc toggleExpanded(){`
	`99`	`+ userInteracted=true`
`98`	`100`	`if isExpanded{`
`99`	`101`	`withAnimation(.snappy(duration:Theme.Animation.collapsibleDuration)){`
`100`	`102`	`expandedItem=nil`
`@@ -254,6 +256,5 @@ struct AnimatedChevron: View {`
`254`	`256`	`.font(.system(size:12, weight:.semibold))`
`255`	`257`	`.foregroundColor(color)`
`256`	`258`	`.rotationEffect(.degrees(isExpanded?90:0))`
`257`		`-.animation(.easeInOut(duration:Theme.Animation.collapsibleDuration), value: isExpanded)`
`258`	`259`	`}`
`259`	`260`	`}`

Comments

(0)