Skip to content

fix(tabs): non-active restored tabs no longer require manual refresh #1025

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
May 6, 2026
+20 −17
Merged

fix(tabs): non-active restored tabs no longer require manual refresh #1025

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
37 changes: 20 additions & 17 deletions TablePro/Views/Main/Extensions/MainContentView+Helpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,29 @@ extension MainContentView {
let hasPendingEdits =
changeManager.hasChanges
|| (tabManager.selectedTab?.pendingChanges.hasChanges ?? false)
guard !hasPendingEdits else { return }
coordinator.needsLazyLoad = false
if let selectedTab = tabManager.selectedTab,
!selectedTab.tableContext.databaseName.isEmpty,
selectedTab.tableContext.databaseName != session.activeDatabase
{
Task { await coordinator.switchDatabase(to: selectedTab.tableContext.databaseName) }
} else if let selectedTab = tabManager.selectedTab,
let tabSchema = selectedTab.tableContext.schemaName,
!tabSchema.isEmpty,
tabSchema != session.currentSchema
{
// Restore schema on the driver without clearing tabs (unlike switchSchema which resets UI)
Task {
await coordinator.restoreSchemaAndRunQuery(tabSchema)
if !hasPendingEdits {
coordinator.needsLazyLoad = false
if let selectedTab = tabManager.selectedTab,
!selectedTab.tableContext.databaseName.isEmpty,
selectedTab.tableContext.databaseName != session.activeDatabase
{
Task { await coordinator.switchDatabase(to: selectedTab.tableContext.databaseName) }
} else if let selectedTab = tabManager.selectedTab,
let tabSchema = selectedTab.tableContext.schemaName,
!tabSchema.isEmpty,
tabSchema != session.currentSchema
{
Task {
await coordinator.restoreSchemaAndRunQuery(tabSchema)
}
} else {
coordinator.runQuery()
}
} else {
coordinator.runQuery()
}
}
if session.isConnected {
coordinator.lazyLoadCurrentTabIfNeeded()
}
let mappedState = mapSessionStatus(session.status)
if mappedState != toolbarState.connectionState {
toolbarState.connectionState = mappedState
Expand Down
Loading