[WIP] [tvOS] Letter Picker / Filters

Shared/Components/SelectorView.swift

@@ -64,7 +64,7 @@ struct SelectorView<Element: Displayable & Hashable, Label: View>: View {
                             .backport
                             .fontWeight(.bold)
                             .aspectRatio(1, contentMode: .fit)
-                            .frame(width: 24, height: 24)
+                            .frame(width: 36, height: 36)
                             .symbolRenderingMode(.palette)
                             .foregroundStyle(accentColor.overlayColor, accentColor)
                     }

Shared/Coordinators/FilterCoordinator.swift

@@ -31,10 +31,6 @@ final class FilterCoordinator: NavigationCoordinatable {
 
     @ViewBuilder
     func makeStart() -> some View {
-        #if os(tvOS)
-        AssertionFailureView("Not implemented")
-        #else
         FilterView(viewModel: parameters.viewModel, type: parameters.type)
-        #endif
     }
 }

Shared/Coordinators/LibraryCoordinator.swift

@@ -24,6 +24,8 @@ final class LibraryCoordinator<Element: Poster>: NavigationCoordinatable {
     var item = makeItem
     @Route(.push)
     var library = makeLibrary
+    @Route(.fullScreen)
+    var filter = makeFilter
     #else
     @Route(.push)
     var item = makeItem
@@ -52,6 +54,10 @@ final class LibraryCoordinator<Element: Poster>: NavigationCoordinatable {
     func makeLibrary(viewModel: PagingLibraryViewModel<BaseItemDto>) -> NavigationViewCoordinator<LibraryCoordinator<BaseItemDto>> {
         NavigationViewCoordinator(LibraryCoordinator<BaseItemDto>(viewModel: viewModel))
     }
+
+    func makeFilter(parameters: FilterCoordinator.Parameters) -> NavigationViewCoordinator<FilterCoordinator> {
+        NavigationViewCoordinator(FilterCoordinator(parameters: parameters))
+    }
     #else
     func makeItem(item: BaseItemDto) -> ItemCoordinator {
         ItemCoordinator(item: item)

Shared/Coordinators/SearchCoordinator.swift

@@ -22,6 +22,8 @@ final class SearchCoordinator: NavigationCoordinatable {
     var item = makeItem
     @Route(.modal)
     var library = makeLibrary
+    @Route(.fullScreen)
+    var filter = makeFilter
     #else
     @Route(.push)
     var item = makeItem
@@ -39,6 +41,10 @@ final class SearchCoordinator: NavigationCoordinatable {
     func makeLibrary(viewModel: PagingLibraryViewModel<BaseItemDto>) -> NavigationViewCoordinator<LibraryCoordinator<BaseItemDto>> {
         NavigationViewCoordinator(LibraryCoordinator(viewModel: viewModel))
     }
+
+    func makeFilter(parameters: FilterCoordinator.Parameters) -> NavigationViewCoordinator<FilterCoordinator> {
+        NavigationViewCoordinator(FilterCoordinator(parameters: parameters))
+    }
     #else
     func makeItem(item: BaseItemDto) -> ItemCoordinator {
         ItemCoordinator(item: item)

Shared/Extensions/String.swift

@@ -156,6 +156,21 @@ extension String {
 
         return ceil(boundingBox.height)
     }
+
+    /// Calculates the width of the string with specified font size and weight
+    /// - Parameters:
+    ///   - font: UIFont.TextStyle to use (default is .body)
+    ///   - weight: Font weight to use (default is .regular)
+    /// - Returns: Width of string when rendered with specified parameters
+    func width(font textStyle: UIFont.TextStyle = .body, weight: UIFont.Weight = .regular) -> CGFloat {
+        let font = UIFont.systemFont(
+            ofSize: UIFont.preferredFont(forTextStyle: textStyle).pointSize,
+            weight: weight
+        )
+        let attributes = [NSAttributedString.Key.font: font]
+        let size = (self as NSString).size(withAttributes: attributes)
+        return size.width
+    }
 }
 
 extension CharacterSet {

Shared/Objects/ItemFilter/ItemFilterCollection.swift

@@ -44,8 +44,17 @@ struct ItemFilterCollection: Codable, Defaults.Serializable, Hashable {
         traits: ItemTrait.supportedCases
     )
 
+    // TODO: This is bad and inefficient
     var hasFilters: Bool {
-        self != Self.default
+        var selfCopy = self
+        let defaultCopy = Self.default
+
+        selfCopy.itemTypes = defaultCopy.itemTypes
+
+        return selfCopy != defaultCopy
+
+        // Previous version:
+        // self != Self.default
     }
 
     var activeFilterCount: Int {

Shared/Objects/ItemFilter/ItemFilterType.swift

@@ -48,7 +48,7 @@ enum ItemFilterType: String, CaseIterable, Defaults.Serializable {
     }
 }
 
-extension ItemFilterType: Displayable {
+extension ItemFilterType: Displayable, SystemImageable {
 
     var displayTitle: String {
         switch self {
@@ -68,4 +68,23 @@ extension ItemFilterType: Displayable {
             L10n.years
         }
     }
+
+    var systemImage: String {
+        switch self {
+        case .genres:
+            "theatermasks"
+        case .letter:
+            "character"
+        case .sortBy:
+            "line.3.horizontal.decrease"
+        case .sortOrder:
+            "arrow.up.arrow.down"
+        case .tags:
+            "tag"
+        case .traits:
+            "arrowtriangle.down"
+        case .years:
+            "calendar"
+        }
+    }
 }

Shared/ViewModels/FilterViewModel.swift

@@ -109,7 +109,8 @@ final class FilterViewModel: ViewModel, Stateful {
             if let type {
                 resetCurrentFilters(for: type)
             } else {
-                currentFilters = .default
+                // This is exclusively for tvOS ItemType libraries
+                currentFilters = .init(itemTypes: currentFilters.itemTypes)
             }
 
         case let .update(type, filters):

Shared/ViewModels/LibraryViewModel/PagingLibraryViewModel.swift

@@ -56,7 +56,7 @@ protocol LibraryIdentifiable: Identifiable {
  Note: if `rememberSort == true`, then will override given filters with stored sorts
        for parent ID. This was just easy. See `PagingLibraryView` notes for lack of
        `rememberSort` observation and `StoredValues.User.libraryFilters` for TODO
-       on remembering other filters.
+       on remembering other filters
  */
 
 class PagingLibraryViewModel<Element: Poster>: ViewModel, Eventful, Stateful {
@@ -92,25 +92,27 @@ class PagingLibraryViewModel<Element: Poster>: ViewModel, Eventful, Stateful {
     }
 
     @Published
-    var backgroundStates: Set<BackgroundState> = []
+    var backgroundStates: Set<BackgroundState>
     /// - Keys: the `hashValue` of the `Element.ID`
     @Published
-    var elements: IdentifiedArray<Int, Element>
+    final var elements: IdentifiedArray<Int, Element>
     @Published
-    var state: State = .initial
+    final var state: State = .initial
+    @Published
+    final var lastAction: Action? = nil
 
     final let filterViewModel: FilterViewModel?
     final let parent: (any LibraryParent)?
 
-    final var events: AnyPublisher<Event, Never> {
+    var events: AnyPublisher<Event, Never> {
         eventSubject
             .receive(on: RunLoop.main)
             .eraseToAnyPublisher()
     }
 
     let pageSize: Int
-    private(set) var currentPage = 0
-    private(set) var hasNextPage = true
+    private(set) final var currentPage = 0
+    private(set) final var hasNextPage = true
 
     private let eventSubject: PassthroughSubject<Event, Never> = .init()
     private let isStatic: Bool
@@ -120,6 +122,12 @@ class PagingLibraryViewModel<Element: Poster>: ViewModel, Eventful, Stateful {
     private var pagingTask: AnyCancellable?
     private var randomItemTask: AnyCancellable?
 
+    // Page loading queue management
+    private var isLoadingPage = false
+    private var pendingPageLoadRequests = 0
+    private let pageLoadQueue = DispatchQueue(label: "com.jellyfin.swiftfin.pageLoadQueue")
+    private var isRefreshing = false
+
     // MARK: init
 
     // static
@@ -134,6 +142,8 @@ class PagingLibraryViewModel<Element: Poster>: ViewModel, Eventful, Stateful {
         self.pageSize = DefaultPageSize
         self.parent = parent
 
+        self.backgroundStates = []
+
         super.init()
 
         Notifications[.didDeleteItem]
@@ -189,6 +199,8 @@ class PagingLibraryViewModel<Element: Poster>: ViewModel, Eventful, Stateful {
             self.filterViewModel = nil
         }
 
+        self.backgroundStates = []
+
         super.init()
 
         Notifications[.didDeleteItem]
@@ -206,6 +218,12 @@ class PagingLibraryViewModel<Element: Poster>: ViewModel, Eventful, Stateful {
                 .sink { [weak self] _ in
                     guard let self else { return }
 
+                    // Reset page loading queue state before refreshing
+                    self.pageLoadQueue.sync {
+                        self.isLoadingPage = false
+                        self.pendingPageLoadRequests = 0
+                    }
+
                     Task { @MainActor in
                         self.send(.refresh)
                     }
@@ -252,6 +270,12 @@ class PagingLibraryViewModel<Element: Poster>: ViewModel, Eventful, Stateful {
             pagingTask?.cancel()
             randomItemTask?.cancel()
 
+            // Reset page loading queue state
+            pageLoadQueue.sync {
+                isLoadingPage = false
+                pendingPageLoadRequests = 0
+            }
+
             filterViewModel?.send(.getQueryFilters)
 
             pagingTask = Task { [weak self] in
@@ -280,28 +304,8 @@ class PagingLibraryViewModel<Element: Poster>: ViewModel, Eventful, Stateful {
 
             guard hasNextPage else { return state }
 
-            backgroundStates.insert(.gettingNextPage)
-
-            pagingTask = Task { [weak self] in
-                do {
-                    try await self?.getNextPage()
-
-                    guard !Task.isCancelled else { return }
-
-                    await MainActor.run {
-                        self?.backgroundStates.remove(.gettingNextPage)
-                        self?.state = .content
-                    }
-                } catch {
-                    guard !Task.isCancelled else { return }
-
-                    await MainActor.run {
-                        self?.backgroundStates.remove(.gettingNextPage)
-                        self?.state = .error(.init(error.localizedDescription))
-                    }
-                }
-            }
-            .asAnyCancellable()
+            // Queue the page loading request
+            queueNextPageLoad()
 
             return .content
         case .getRandomItem:
@@ -324,18 +328,88 @@ class PagingLibraryViewModel<Element: Poster>: ViewModel, Eventful, Stateful {
         }
     }
 
+    // MARK: Page loading queue management
+
+    private func queueNextPageLoad() {
+        pageLoadQueue.async { [weak self] in
+            guard let self = self else { return }
+
+            if self.isLoadingPage {
+                // A page is currently loading, increment the pending requests counter
+                self.pendingPageLoadRequests += 1
+                return
+            }
+
+            // No page currently loading, start loading immediately
+            self.isLoadingPage = true
+            self.loadNextPage()
+        }
+    }
+
+    private func loadNextPage() {
+        Task { @MainActor in
+            self.backgroundStates.insert(.gettingNextPage)
+        }
+
+        pagingTask = Task { [weak self] in
+            guard let self = self else { return }
+
+            do {
+                try await self.getNextPage()
+
+                guard !Task.isCancelled else { return }
+
+                await MainActor.run {
+                    self.backgroundStates.remove(.gettingNextPage)
+                    self.state = .content
+                }
+            } catch {
+                guard !Task.isCancelled else { return }
+
+                await MainActor.run {
+                    self.backgroundStates.remove(.gettingNextPage)
+                    self.state = .error(.init(error.localizedDescription))
+                }
+            }
+
+            // Check if there are pending requests in the queue
+            self.pageLoadQueue.async { [weak self] in
+                guard let self = self else { return }
+
+                if self.pendingPageLoadRequests > 0 {
+                    self.pendingPageLoadRequests -= 1
+                    // Process the next request in the queue
+                    self.loadNextPage()
+                } else {
+                    // No more pending requests
+                    self.isLoadingPage = false
+                }
+            }
+        }
+        .asAnyCancellable()
+    }
+
     // MARK: refresh
 
     final func refresh() async throws {
+        // Set refreshing flag to track state
+        isRefreshing = true
 
         currentPage = -1
         hasNextPage = true
 
         await MainActor.run {
             elements.removeAll()
+            // Ensure visibleIndices are reset to avoid Range error
+            // This helps prevent the "Range requires lowerBound <= upperBound" crash
+            // when elements are cleared but visibleIndices still have old values
+            backgroundStates = []
         }
 
         try await getNextPage()
+
+        // Reset refreshing flag
+        isRefreshing = false
     }
 
     /// Gets the next page of items or immediately returns if