fix: select nearest neighbor tab after dropping a table

datlechin · datlechin · commit 7fabba7f9a8d · 2026-03-17T13:38:32.000+07:00
diff --git a/TablePro/Views/Main/Extensions/MainContentCoordinator+SaveChanges.swift b/TablePro/Views/Main/Extensions/MainContentCoordinator+SaveChanges.swift
@@ -234,9 +234,12 @@ extension MainContentCoordinator {
                         )
 
                         if !tabIdsToRemove.isEmpty {
+                            let firstRemovedIndex = tabManager.tabs
+                                .firstIndex { tabIdsToRemove.contains($0.id) } ?? 0
                             tabManager.tabs.removeAll { tabIdsToRemove.contains($0.id) }
-                            if let firstRemaining = tabManager.tabs.first {
-                                tabManager.selectedTabId = firstRemaining.id
+                            if !tabManager.tabs.isEmpty {
+                                let neighborIndex = min(firstRemovedIndex, tabManager.tabs.count - 1)
+                                tabManager.selectedTabId = tabManager.tabs[neighborIndex].id
                             } else {
                                 tabManager.selectedTabId = nil
                             }

Original file line number	Diff line number	Diff line change
`@@ -234,9 +234,12 @@ extension MainContentCoordinator {`
`234`	`234`	`)`
`235`	`235`
`236`	`236`	`if !tabIdsToRemove.isEmpty {`
	`237`	`+ let firstRemovedIndex = tabManager.tabs`
	`238`	`+ .firstIndex { tabIdsToRemove.contains($0.id) } ?? 0`
`237`	`239`	`tabManager.tabs.removeAll { tabIdsToRemove.contains($0.id) }`
`238`		`- if let firstRemaining = tabManager.tabs.first {`
`239`		`- tabManager.selectedTabId = firstRemaining.id`
	`240`	`+ if !tabManager.tabs.isEmpty {`
	`241`	`+ let neighborIndex = min(firstRemovedIndex, tabManager.tabs.count - 1)`
	`242`	`+ tabManager.selectedTabId = tabManager.tabs[neighborIndex].id`
`240`	`243`	`} else {`
`241`	`244`	`tabManager.selectedTabId = nil`
`242`	`245`	`}`