fix: merge duplicate onChange handlers into single observer

datlechin · datlechin · commit 6e7d70a946f6 · 2026-03-22T21:03:34.000+07:00
diff --git a/TablePro/Views/Sidebar/FavoritesTabView.swift b/TablePro/Views/Sidebar/FavoritesTabView.swift
@@ -81,6 +81,11 @@ internal struct FavoritesTabView: View {
             deleteSelectedFavorites()
         }
         .onChange(of: selectedFavoriteIds) { oldIds, newIds in
+            if newIds.isEmpty {
+                lastInsertedFavoriteId = nil
+                return
+            }
+
             let added = newIds.subtracting(oldIds)
             guard added.count == 1,
                   newIds.count == 1,
@@ -93,11 +98,6 @@ internal struct FavoritesTabView: View {
                 lastInsertedFavoriteId = selectedId
             }
         }
-        .onChange(of: selectedFavoriteIds) {
-            if selectedFavoriteIds.isEmpty {
-                lastInsertedFavoriteId = nil
-            }
-        }
     }
 
     /// Renders tree items with DisclosureGroup for folders.

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,11 @@ internal struct FavoritesTabView: View {`
`81`	`81`	`deleteSelectedFavorites()`
`82`	`82`	`}`
`83`	`83`	`.onChange(of: selectedFavoriteIds) { oldIds, newIds in`
	`84`	`+ if newIds.isEmpty {`
	`85`	`+ lastInsertedFavoriteId = nil`
	`86`	`+ return`
	`87`	`+ }`
	`88`	`+`
`84`	`89`	`let added = newIds.subtracting(oldIds)`
`85`	`90`	`guard added.count == 1,`
`86`	`91`	`newIds.count == 1,`
`@@ -93,11 +98,6 @@ internal struct FavoritesTabView: View {`
`93`	`98`	`lastInsertedFavoriteId = selectedId`
`94`	`99`	`}`
`95`	`100`	`}`
`96`		`- .onChange(of: selectedFavoriteIds) {`
`97`		`- if selectedFavoriteIds.isEmpty {`
`98`		`- lastInsertedFavoriteId = nil`
`99`		`- }`
`100`		`- }`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`/// Renders tree items with DisclosureGroup for folders.`