Fix content filter sheet crash on macOS (closes #2371)

Dimillian · Dimillian · commit 3fa1930f9e00 · 2025-12-31T08:43:12.000+01:00
diff --git a/IceCubesApp/App/Main/AppView.swift b/IceCubesApp/App/Main/AppView.swift
@@ -130,7 +130,10 @@ struct AppView: View {
       }
     }
     .id(appAccountsManager.currentClient.id)
-    .withSheetDestinations(sheetDestinations: $appRouterPath.presentedSheet)
+    .withSheetDestinations(
+      sheetDestinations: $appRouterPath.presentedSheet,
+      routerPath: appRouterPath
+    )
     .environment(\.selectedTabScrollToTop, selectedTabScrollToTop)
   }
 
diff --git a/IceCubesApp/App/Router/AppRegistry.swift b/IceCubesApp/App/Router/AppRegistry.swift
@@ -96,9 +96,13 @@ extension View {
     }
   }
 
-  func withSheetDestinations(sheetDestinations: Binding<SheetDestination?>) -> some View {
+  func withSheetDestinations(
+    sheetDestinations: Binding<SheetDestination?>,
+    routerPath: RouterPath
+  ) -> some View {
     sheet(item: sheetDestinations) { destination in
-      switch destination {
+      Group {
+        switch destination {
       case .replyToStatusEditor(let status):
         StatusEditor.MainView(mode: .replyTo(status: status))
           .withEnvironments()
@@ -183,7 +187,9 @@ extension View {
       case .accountFiltersList:
         FiltersListView()
           .withEnvironments()
+        }
       }
+      .environment(routerPath)
     }
   }
 
diff --git a/IceCubesApp/App/Tabs/ExploreTab.swift b/IceCubesApp/App/Tabs/ExploreTab.swift
@@ -18,7 +18,10 @@ struct ExploreTab: View {
     NavigationStack(path: $routerPath.path) {
       ExploreView()
         .withAppRouter()
-        .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
+        .withSheetDestinations(
+          sheetDestinations: $routerPath.presentedSheet,
+          routerPath: routerPath
+        )
         .toolbar {
           ToolbarTab(routerPath: $routerPath)
         }
diff --git a/IceCubesApp/App/Tabs/MessagesTab.swift b/IceCubesApp/App/Tabs/MessagesTab.swift
@@ -20,7 +20,10 @@ struct MessagesTab: View {
     NavigationStack(path: $routerPath.path) {
       ConversationsListView()
         .withAppRouter()
-        .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
+        .withSheetDestinations(
+          sheetDestinations: $routerPath.presentedSheet,
+          routerPath: routerPath
+        )
         .toolbar {
           ToolbarTab(routerPath: $routerPath)
         }
diff --git a/IceCubesApp/App/Tabs/NavigationTab.swift b/IceCubesApp/App/Tabs/NavigationTab.swift
@@ -27,7 +27,10 @@ struct NavigationTab<Content: View>: View {
       content()
         .withEnvironments()
         .withAppRouter()
-        .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
+        .withSheetDestinations(
+          sheetDestinations: $routerPath.presentedSheet,
+          routerPath: routerPath
+        )
         .withSafariRouter()
         .toolbar {
           ToolbarTab(routerPath: $routerPath)
diff --git a/IceCubesApp/App/Tabs/NotificationTab.swift b/IceCubesApp/App/Tabs/NotificationTab.swift
@@ -29,7 +29,10 @@ struct NotificationsTab: View {
     NavigationStack(path: $routerPath.path) {
       NotificationsListView(lockedType: lockedType)
         .withAppRouter()
-        .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
+        .withSheetDestinations(
+          sheetDestinations: $routerPath.presentedSheet,
+          routerPath: routerPath
+        )
         .toolbar {
           ToolbarItem(placement: .topBarTrailing) {
             Button {
diff --git a/IceCubesApp/App/Tabs/ProfileTab.swift b/IceCubesApp/App/Tabs/ProfileTab.swift
@@ -20,7 +20,10 @@ struct ProfileTab: View {
       if let account = currentAccount.account {
         AccountDetailView(account: account)
           .withAppRouter()
-          .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
+          .withSheetDestinations(
+            sheetDestinations: $routerPath.presentedSheet,
+            routerPath: routerPath
+          )
           .id(account.id)
       } else {
         AccountDetailView(account: .placeholder())
diff --git a/IceCubesApp/App/Tabs/Settings/SettingsTab.swift b/IceCubesApp/App/Tabs/Settings/SettingsTab.swift
@@ -64,7 +64,10 @@ struct SettingsTabs: View {
         }
       }
       .withAppRouter()
-      .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
+      .withSheetDestinations(
+        sheetDestinations: $routerPath.presentedSheet,
+        routerPath: routerPath
+      )
       .onAppear {
         startingPoint = RouterPath.settingsStartingPoint
         RouterPath.settingsStartingPoint = nil
diff --git a/IceCubesApp/App/Tabs/Timeline/TimelineTab.swift b/IceCubesApp/App/Tabs/Timeline/TimelineTab.swift
@@ -50,7 +50,10 @@ struct TimelineTab: View {
         canFilterTimeline: canFilterTimeline
       )
       .withAppRouter()
-      .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
+      .withSheetDestinations(
+        sheetDestinations: $routerPath.presentedSheet,
+        routerPath: routerPath
+      )
       .toolbar {
         toolbarView
       }

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,10 @@ struct AppView: View {`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`	`.id(appAccountsManager.currentClient.id)`
`133`		`- .withSheetDestinations(sheetDestinations: $appRouterPath.presentedSheet)`
	`133`	`+ .withSheetDestinations(`
	`134`	`+ sheetDestinations: $appRouterPath.presentedSheet,`
	`135`	`+ routerPath: appRouterPath`
	`136`	`+ )`
`134`	`137`	`.environment(\.selectedTabScrollToTop, selectedTabScrollToTop)`
`135`	`138`	`}`
`136`	`139`
Original file line number	Diff line number	Diff line change
`@@ -96,9 +96,13 @@ extension View {`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
`99`		`- func withSheetDestinations(sheetDestinations: Binding<SheetDestination?>) -> some View {`
	`99`	`+ func withSheetDestinations(`
	`100`	`+ sheetDestinations: Binding<SheetDestination?>,`
	`101`	`+ routerPath: RouterPath`
	`102`	`+ ) -> some View {`
`100`	`103`	`sheet(item: sheetDestinations) { destination in`
`101`		`- switch destination {`
	`104`	`+ Group {`
	`105`	`+ switch destination {`
`102`	`106`	`case .replyToStatusEditor(let status):`
`103`	`107`	`StatusEditor.MainView(mode: .replyTo(status: status))`
`104`	`108`	`.withEnvironments()`
`@@ -183,7 +187,9 @@ extension View {`
`183`	`187`	`case .accountFiltersList:`
`184`	`188`	`FiltersListView()`
`185`	`189`	`.withEnvironments()`
	`190`	`+ }`
`186`	`191`	`}`
	`192`	`+ .environment(routerPath)`
`187`	`193`	`}`
`188`	`194`	`}`
`189`	`195`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,10 @@ struct SettingsTabs: View {`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`.withAppRouter()`
`67`		`- .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)`
	`67`	`+ .withSheetDestinations(`
	`68`	`+ sheetDestinations: $routerPath.presentedSheet,`
	`69`	`+ routerPath: routerPath`
	`70`	`+ )`
`68`	`71`	`.onAppear {`
`69`	`72`	`startingPoint = RouterPath.settingsStartingPoint`
`70`	`73`	`RouterPath.settingsStartingPoint = nil`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,10 @@ struct TimelineTab: View {`
`50`	`50`	`canFilterTimeline: canFilterTimeline`
`51`	`51`	`)`
`52`	`52`	`.withAppRouter()`
`53`		`- .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)`
	`53`	`+ .withSheetDestinations(`
	`54`	`+ sheetDestinations: $routerPath.presentedSheet,`
	`55`	`+ routerPath: routerPath`
	`56`	`+ )`
`54`	`57`	`.toolbar {`
`55`	`58`	`toolbarView`
`56`	`59`	`}`