diff options
| -rw-r--r-- | Sora/Views/Generic/GenericListView.swift | 30 | ||||
| -rw-r--r-- | Sora/Views/Post/Grid/PostGridView.swift | 1 |
2 files changed, 19 insertions, 12 deletions
diff --git a/Sora/Views/Generic/GenericListView.swift b/Sora/Views/Generic/GenericListView.swift index 5530567..723db9e 100644 --- a/Sora/Views/Generic/GenericListView.swift +++ b/Sora/Views/Generic/GenericListView.swift @@ -72,6 +72,20 @@ struct GenericListView<T: Identifiable & Hashable & GenericItem>: View { // swi private let uncategorisedUUID = UUID(uuidString: "00000000-0000-0000-0000-000000000000")! + @ViewBuilder private var listContent: some View { + List { + if filteredItems.isEmpty && (!searchText.isEmpty || !(selectedFolder == nil)) { + Text("No matching items found") + .foregroundColor(.secondary) + } + + ForEach(sortedFilteredItems, id: \.id) { item in + itemButtonContent(item: item) + } + .onDelete(perform: removeAction) + } + } + var body: some View { NavigationStack { VStack(spacing: 0) { @@ -109,18 +123,12 @@ struct GenericListView<T: Identifiable & Hashable & GenericItem>: View { // swi } #endif - List { - if filteredItems.isEmpty && (!searchText.isEmpty || !(selectedFolder == nil)) { - Text("No matching items found") - .foregroundColor(.secondary) - } - - ForEach(sortedFilteredItems, id: \.id) { item in - itemButtonContent(item: item) - } - .onDelete(perform: removeAction) + if allowBookmarking { + listContent + .searchable(text: $searchText, placement: .navigationBarDrawer) + } else { + listContent.searchable(text: $searchText) } - .searchable(text: $searchText) } } } diff --git a/Sora/Views/Post/Grid/PostGridView.swift b/Sora/Views/Post/Grid/PostGridView.swift index 6d40c7e..4aa4b39 100644 --- a/Sora/Views/Post/Grid/PostGridView.swift +++ b/Sora/Views/Post/Grid/PostGridView.swift @@ -184,7 +184,6 @@ struct PostGridView: View { selectedTab: $selectedTab, isPresented: $isSearchHistoryPresented ) - .frame(minHeight: 250) } #if os(iOS) .gesture( |