fix: favorites selection state, keyboard delete, reliable dialog query passing

Author: datlechin

TablePro/Views/Editor/HistoryPanelView.swift

@@ -21,8 +21,7 @@ struct HistoryPanelView: View {
     @State private var searchTask: Task<Void, Never>?
     @State private var copyButtonTitle = "Copy Query"
     @State private var copyResetTask: Task<Void, Never>?
-    @State private var showFavoriteDialog = false
-    @State private var favoriteQuery: String?
+    @State private var favoriteDialogQuery: FavoriteDialogQuery?
     @FocusedValue(\.commandActions) private var actions
 
     private let dataProvider = HistoryDataProvider()
@@ -51,11 +50,11 @@ struct HistoryPanelView: View {
         .onReceive(NotificationCenter.default.publisher(for: .queryHistoryDidUpdate)) { _ in
             loadData()
         }
-        .sheet(isPresented: $showFavoriteDialog) {
+        .sheet(item: $favoriteDialogQuery) { item in
             FavoriteEditDialog(
                 connectionId: UUID(),
                 favorite: nil,
-                initialQuery: favoriteQuery,
+                initialQuery: item.query,
                 forceGlobal: true
             )
         }
@@ -197,8 +196,7 @@ private extension HistoryPanelView {
         }
 
         Button {
-            favoriteQuery = entry.query
-            showFavoriteDialog = true
+            favoriteDialogQuery = FavoriteDialogQuery(query: entry.query)
         } label: {
             Label(String(localized: "Save as Favorite"), systemImage: "star")
         }

TablePro/Views/Main/Child/MainEditorContentView.swift

@@ -66,8 +66,7 @@ struct MainEditorContentView: View {
     @State private var tabProviderVersions: [UUID: Int] = [:]
     @State private var tabProviderMetaVersions: [UUID: Int] = [:]
     @State private var cachedChangeManager: AnyChangeManager?
-    @State private var showFavoriteDialog = false
-    @State private var favoriteQuery: String?
+    @State private var favoriteDialogQuery: FavoriteDialogQuery?
 
     // Native macOS window tabs — no LRU tracking needed (single tab per window)
 
@@ -109,11 +108,11 @@ struct MainEditorContentView: View {
         }
         .background(.background)
         .animation(.easeInOut(duration: 0.2), value: isHistoryVisible)
-        .sheet(isPresented: $showFavoriteDialog) {
+        .sheet(item: $favoriteDialogQuery) { item in
             FavoriteEditDialog(
                 connectionId: connectionId,
                 favorite: nil,
-                initialQuery: favoriteQuery
+                initialQuery: item.query
             )
         }
         .onChange(of: tabManager.tabs.count) {
@@ -220,8 +219,8 @@ struct MainEditorContentView: View {
                         coordinator.aiViewModel?.handleOptimizeSelection(text)
                     },
                     onSaveAsFavorite: { text in
-                        favoriteQuery = text.isEmpty ? nil : text
-                        showFavoriteDialog = true
+                        guard !text.isEmpty else { return }
+                        favoriteDialogQuery = FavoriteDialogQuery(query: text)
                     }
                 )
             }

TablePro/Views/Sidebar/FavoriteEditDialog.swift

@@ -5,6 +5,12 @@
 
 import SwiftUI
 
+/// Wrapper for `.sheet(item:)` to ensure the query is passed reliably
+struct FavoriteDialogQuery: Identifiable {
+    let id = UUID()
+    let query: String
+}
+
 /// Dialog for creating or editing a SQL favorite
 struct FavoriteEditDialog: View {
     @Environment(\.dismiss) private var dismiss

TablePro/Views/Sidebar/FavoritesTabView.swift

@@ -10,6 +10,7 @@ import SwiftUI
 /// Full-tab favorites view with folder hierarchy and bottom toolbar
 struct FavoritesTabView: View {
     @State private var viewModel: FavoritesSidebarViewModel
+    @State private var selectedFavoriteIds: Set<String> = []
     @State private var folderToDelete: SQLFavoriteFolder?
     @State private var showDeleteFolderAlert = false
     let searchText: String
@@ -67,7 +68,7 @@ struct FavoritesTabView: View {
     // MARK: - List
 
     private func favoritesList(_ items: [FavoriteTreeItem]) -> some View {
-        List {
+        List(selection: $selectedFavoriteIds) {
             ForEach(items) { item in
                 FavoriteTreeItemRow(
                     item: item,
@@ -78,10 +79,45 @@ struct FavoritesTabView: View {
                         showDeleteFolderAlert = true
                     }
                 )
+                .tag(item.id)
             }
         }
         .listStyle(.sidebar)
         .scrollContentBackground(.hidden)
+        .onDeleteCommand {
+            deleteSelectedFavorites()
+        }
+        .contextMenu {
+            if !selectedFavoriteIds.isEmpty {
+                Button(role: .destructive) {
+                    deleteSelectedFavorites()
+                } label: {
+                    Label(String(localized: "Delete Selected"), systemImage: "trash")
+                }
+            }
+        }
+    }
+
+    private func deleteSelectedFavorites() {
+        let allFavorites = collectFavorites(from: viewModel.treeItems)
+        let toDelete = allFavorites.filter { selectedFavoriteIds.contains("fav-\($0.id)") }
+        for fav in toDelete {
+            viewModel.deleteFavorite(fav)
+        }
+        selectedFavoriteIds.removeAll()
+    }
+
+    private func collectFavorites(from items: [FavoriteTreeItem]) -> [SQLFavorite] {
+        var result: [SQLFavorite] = []
+        for item in items {
+            switch item {
+            case .favorite(let fav):
+                result.append(fav)
+            case .folder(_, let children):
+                result.append(contentsOf: collectFavorites(from: children))
+            }
+        }
+        return result
     }
 
     // MARK: - Empty States