Skip to content

fix: keep sidebar search field visible when no tables match filter #238

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

Merged
datlechin merged 1 commit into from
Mar 9, 2026
Merged

fix: keep sidebar search field visible when no tables match filter #238

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
87 changes: 41 additions & 46 deletions TablePro/Views/Sidebar/SidebarView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,6 @@ struct SidebarView: View {
loadingState
} else if tables.isEmpty {
emptyState
} else if filteredTables.isEmpty {
noMatchState
} else {
tableList
}
Expand Down Expand Up @@ -170,57 +168,54 @@ struct SidebarView: View {
.frame(maxWidth: .infinity, maxHeight: .infinity)
}

private var noMatchState: some View {
VStack(spacing: 8) {
Image(systemName: "magnifyingglass")
.font(.title)
.foregroundStyle(.tertiary)
Text(sidebarLabel(mongodb: "No matching collections", redis: "No matching databases", default: "No matching tables"))
.font(.subheadline)
.foregroundStyle(.secondary)
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
}

// MARK: - Table List

private var tableList: some View {
List(selection: selectedTablesBinding) {
Section(isExpanded: $viewModel.isTablesExpanded) {
ForEach(filteredTables) { table in
TableRow(
table: table,
isActive: activeTableName == table.name,
isPendingTruncate: pendingTruncates.contains(table.name),
isPendingDelete: pendingDeletes.contains(table.name)
)
.tag(table)
.contextMenu {
SidebarContextMenu(
clickedTable: table,
selectedTables: selectedTablesBinding,
isReadOnly: AppState.shared.isReadOnly,
onBatchToggleTruncate: { viewModel.batchToggleTruncate() },
onBatchToggleDelete: { viewModel.batchToggleDelete() }
if filteredTables.isEmpty {
ContentUnavailableView(
sidebarLabel(mongodb: "No matching collections", redis: "No matching databases", default: "No matching tables"),
systemImage: "magnifyingglass"
)
.listRowSeparator(.hidden)
.listRowBackground(Color.clear)
} else {
Section(isExpanded: $viewModel.isTablesExpanded) {
ForEach(filteredTables) { table in
TableRow(
table: table,
isActive: activeTableName == table.name,
isPendingTruncate: pendingTruncates.contains(table.name),
isPendingDelete: pendingDeletes.contains(table.name)
)
}
}
} header: {
Text(sidebarLabel(mongodb: "Collections", redis: "Databases", default: "Tables"))
.help(sidebarLabel(
mongodb: "Right-click to show all collections",
redis: "Right-click to show all databases",
default: "Right-click to show all tables"
))
.contextMenu {
Button(sidebarLabel(
mongodb: String(localized: "Show All Collections"),
redis: String(localized: "Show All Databases"),
default: String(localized: "Show All Tables")
)) {
onShowAllTables?()
.tag(table)
.contextMenu {
SidebarContextMenu(
clickedTable: table,
selectedTables: selectedTablesBinding,
isReadOnly: AppState.shared.isReadOnly,
onBatchToggleTruncate: { viewModel.batchToggleTruncate() },
onBatchToggleDelete: { viewModel.batchToggleDelete() }
)
}
}
} header: {
Text(sidebarLabel(mongodb: "Collections", redis: "Databases", default: "Tables"))
.help(sidebarLabel(
mongodb: "Right-click to show all collections",
redis: "Right-click to show all databases",
default: "Right-click to show all tables"
))
.contextMenu {
Button(sidebarLabel(
mongodb: String(localized: "Show All Collections"),
redis: String(localized: "Show All Databases"),
default: String(localized: "Show All Tables")
)) {
onShowAllTables?()
}
}
}
}
}
.listStyle(.sidebar)
Expand Down