Skip to content

enh: persist sidebar visibility state #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
boriselec wants to merge 1 commit into
base: main
Choose a base branch
from
Open

enh: persist sidebar visibility state #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions macai/UI/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,16 @@ struct ContentView: View {

@State private var windowRef: NSWindow?
@State private var openedChatId: String? = nil
@State private var columnVisibility = NavigationSplitViewVisibility.all
@State private var lastChatCount = 0
@AppStorage("isSidebarVisible") var isSidebarVisible = true
@State private var lastChatCount: Int? = nil
@State private var searchText = ""
@State private var isSearchPresented = false

var body: some View {
NavigationSplitView(columnVisibility: $columnVisibility) {
NavigationSplitView(columnVisibility: Binding(
get: { isSidebarVisible ? .all : .detailOnly },
set: { isSidebarVisible = $0 != .detailOnly }
)) {
ChatListView(selectedChat: $selectedChat, searchText: $searchText)
.environmentObject(attentionStore)
.navigationSplitViewColumnWidth(
Expand Down Expand Up @@ -117,7 +120,7 @@ struct ContentView: View {
}
}
.onAppear(perform: {
updateSidebarVisibilityForChatCount(previousCount: lastChatCount, newCount: chats.count)
if chats.count == 0 { isSidebarVisible = false }
lastChatCount = chats.count
if let lastOpenedChatId = UUID(uuidString: lastOpenedChatId) {
if let lastOpenedChat = chats.first(where: { $0.id == lastOpenedChatId }) {
Expand All @@ -126,7 +129,9 @@ struct ContentView: View {
}
})
.onChange(of: chats.count) { newCount in
updateSidebarVisibilityForChatCount(previousCount: lastChatCount, newCount: newCount)
if let prev = lastChatCount {
updateSidebarVisibilityForChatCount(previousCount: prev, newCount: newCount)
}
lastChatCount = newCount
}
.background(WindowAccessor(window: $window))
Expand Down Expand Up @@ -444,12 +449,12 @@ struct ContentView: View {

private func updateSidebarVisibilityForChatCount(previousCount: Int, newCount: Int) {
if newCount == 0 {
columnVisibility = .detailOnly
isSidebarVisible = false
return
}

if previousCount == 0 && newCount > 0 {
columnVisibility = .all
isSidebarVisible = true
}
}
}
Expand Down
Loading