Remove search bolding. (#815)

bolsinga · Jun 16, 2024 · 7d98884 · 7d98884
1 parent 785104b
commit 7d98884
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 94 deletions.
diff --git a/Sources/Site/Music/UI/ArtistList.swift b/Sources/Site/Music/UI/ArtistList.swift
@@ -19,8 +19,7 @@ struct ArtistList: View {
       items: digests, sectioner: sectioner,
       title: String(localized: "Artists", bundle: .module),
       associatedRankName: String(localized: "Sort By Venue Count", bundle: .module),
-      associatedRankSectionHeader: { $0.venuesCountView },
-      itemLabelView: { Text($0.name.emphasizedAttributed(matching: searchString)) }, sort: $sort
+      associatedRankSectionHeader: { $0.venuesCountView }, sort: $sort
     )
     .archiveSearchable(
       searchPrompt: String(localized: "Artist Names", bundle: .module),

diff --git a/Sources/Site/Music/UI/RankableSortList.swift b/Sources/Site/Music/UI/RankableSortList.swift
@@ -7,14 +7,12 @@
 
 import SwiftUI
 
-struct RankableSortList<T, SectionHeaderContent: View, LabelContent: View>: View
-where T: Rankable, T.ID == String {
+struct RankableSortList<T, SectionHeaderContent: View>: View where T: Rankable, T.ID == String {
   let items: [T]
   let sectioner: LibrarySectioner
   let title: String
   let associatedRankName: String
   @ViewBuilder let associatedRankSectionHeader: (Ranking) -> SectionHeaderContent
-  @ViewBuilder let itemLabelView: ((T) -> LabelContent)
 
   @Binding var sort: RankingSort
 
@@ -28,14 +26,14 @@ where T: Rankable, T.ID == String {
         items: items,
         rankingMapBuilder: { sectioner.sectionMap(for: $0) },
         itemContentView: { showCount(for: $0) },
-        sectionHeaderView: { $0.representingView }, itemLabelView: itemLabelView)
+        sectionHeaderView: { $0.representingView })
     } else if sort.isFirstSeen {
       RankingList(
         items: items,
         rankingMapBuilder: { $0.firstSeen },
         rankSorted: PartialDate.compareWithUnknownsMuted(lhs:rhs:),
         itemContentView: { Text($0.firstSet.rank.formatted(.hash)) },
-        sectionHeaderView: { Text($0.formatted(.compact)) }, itemLabelView: itemLabelView)
+        sectionHeaderView: { Text($0.formatted(.compact)) })
     } else {
       RankingList(
         items: items,
@@ -48,7 +46,7 @@ where T: Rankable, T.ID == String {
           default:
             $0.sectionHeader(for: sort)
           }
-        }, itemLabelView: itemLabelView)
+        })
     }
   }
 
@@ -71,8 +69,7 @@ where T: Rankable, T.ID == String {
     RankableSortList(
       items: vaultPreviewData.venueDigests, sectioner: vaultPreviewData.sectioner,
       title: "Venues", associatedRankName: "Sort By Artist Count",
-      associatedRankSectionHeader: { $0.artistsCountView }, itemLabelView: { Text($0.name) },
-      sort: .constant(.alphabetical)
+      associatedRankSectionHeader: { $0.artistsCountView }, sort: .constant(.alphabetical)
     )
     .musicDestinations(vaultPreviewData)
   }

diff --git a/Sources/Site/Music/UI/RankingList.swift b/Sources/Site/Music/UI/RankingList.swift
@@ -7,14 +7,13 @@
 
 import SwiftUI
 
-struct RankingList<T, R, ItemContent: View, SectionHeader: View, LabelContent: View>: View
+struct RankingList<T, R, ItemContent: View, SectionHeader: View>: View
 where T: LibraryComparable, T: Hashable, T: PathRestorable, R: Comparable, R: Hashable {
   let items: [T]
   let rankingMapBuilder: ([T]) -> [R: [T]]
   var rankSorted: ((R, R) -> Bool)?
   @ViewBuilder let itemContentView: (T) -> ItemContent
   @ViewBuilder let sectionHeaderView: (R) -> SectionHeader
-  @ViewBuilder let itemLabelView: ((T) -> LabelContent)
 
   var body: some View {
     let rankingMap = rankingMapBuilder(items)
@@ -27,7 +26,7 @@ where T: LibraryComparable, T: Hashable, T: PathRestorable, R: Comparable, R: Ha
                 LabeledContent {
                   itemContentView(item)
                 } label: {
-                  itemLabelView(item)
+                  Text(item.name)
                 }
               }
             }
@@ -54,8 +53,7 @@ where T: LibraryComparable, T: Hashable, T: PathRestorable, R: Comparable, R: Ha
       },
       sectionHeaderView: { section in
         Text("Artists")
-      },
-      itemLabelView: { Text($0.name) }
+      }
     )
     .navigationTitle("Artists")
     .musicDestinations(vaultPreviewData)
@@ -72,8 +70,7 @@ where T: LibraryComparable, T: Hashable, T: PathRestorable, R: Comparable, R: Ha
       itemContentView: { _ in },
       sectionHeaderView: { section in
         Text("Venues")
-      },
-      itemLabelView: { Text($0.name) }
+      }
     )
     .navigationTitle("Venues")
     .musicDestinations(vaultPreviewData)

diff --git a/Sources/Site/Music/UI/VenueList.swift b/Sources/Site/Music/UI/VenueList.swift
@@ -19,8 +19,7 @@ struct VenueList: View {
       items: digests, sectioner: sectioner,
       title: String(localized: "Venues", bundle: .module),
       associatedRankName: String(localized: "Sort By Artist Count", bundle: .module),
-      associatedRankSectionHeader: { $0.artistsCountView },
-      itemLabelView: { Text($0.name.emphasizedAttributed(matching: searchString)) }, sort: $sort
+      associatedRankSectionHeader: { $0.artistsCountView }, sort: $sort
     )
     .archiveSearchable(
       searchPrompt: String(localized: "Venue Names", bundle: .module),

diff --git a/Sources/Site/Utility/String+EmphasizedMatching.swift b/Sources/Site/Utility/String+EmphasizedMatching.swift
diff --git a/Tests/SiteTests/EmphasizedMatchingTests.swift b/Tests/SiteTests/EmphasizedMatchingTests.swift