diff options
Diffstat (limited to 'Hutch/Views/Tickets')
| -rw-r--r-- | Hutch/Views/Tickets/TicketListView.swift | 6 | ||||
| -rw-r--r-- | Hutch/Views/Tickets/TicketListViewModel.swift | 20 |
2 files changed, 19 insertions, 7 deletions
diff --git a/Hutch/Views/Tickets/TicketListView.swift b/Hutch/Views/Tickets/TicketListView.swift index 8f7d348..e58d194 100644 --- a/Hutch/Views/Tickets/TicketListView.swift +++ b/Hutch/Views/Tickets/TicketListView.swift @@ -290,6 +290,7 @@ struct TicketListView: View { ticket: ticket, isSelected: viewModel.selectedTicketIDs.contains(ticket.id) ) + .equatable() } .buttonStyle(.plain) } else { @@ -303,6 +304,7 @@ struct TicketListView: View { ) } label: { TicketRowView(ticket: ticket) + .equatable() } .contextMenu { if let url = SRHTWebURL.ticket(ownerUsername: ownerUsername(for: tracker), trackerName: tracker.name, ticketId: ticket.id) { @@ -1180,7 +1182,7 @@ private struct BulkAssignSheet: View { } } -private struct SelectableTicketRow: View { +private struct SelectableTicketRow: View, Equatable { let ticket: TicketSummary let isSelected: Bool @@ -1200,7 +1202,7 @@ private struct SelectableTicketRow: View { // MARK: - Ticket Row -private struct TicketRowView: View { +private struct TicketRowView: View, Equatable { let ticket: TicketSummary var body: some View { diff --git a/Hutch/Views/Tickets/TicketListViewModel.swift b/Hutch/Views/Tickets/TicketListViewModel.swift index e7cc565..e23cc52 100644 --- a/Hutch/Views/Tickets/TicketListViewModel.swift +++ b/Hutch/Views/Tickets/TicketListViewModel.swift @@ -83,7 +83,9 @@ final class TicketListViewModel { let trackerId: Int let trackerRid: String - private(set) var tickets: [TicketSummary] = [] + private(set) var tickets: [TicketSummary] = [] { + didSet { updateFilteredTickets() } + } private(set) var isLoading = false private(set) var isLoadingMore = false private(set) var isCreatingTicket = false @@ -97,15 +99,21 @@ final class TicketListViewModel { var filter: TicketFilter = .open { didSet { persistFilterState() + updateFilteredTickets() } } var selectedLabelIDs: Set<Int> = [] { didSet { persistFilterState() + updateFilteredTickets() } } - var searchText = "" + var searchText = "" { + didSet { updateFilteredTickets() } + } private(set) var activeSavedFilterID: SavedTicketFilter.ID? + // Cached filtered result. See updateFilteredTickets(). + private(set) var filteredTickets: [TicketSummary] = [] private var cursor: String? private var hasMore = true @@ -268,9 +276,11 @@ final class TicketListViewModel { !currentFilterState.isDefault } - /// Tickets filtered by the selected status and label filters. - var filteredTickets: [TicketSummary] { - Self.filterTickets(tickets, state: currentFilterState, query: searchText) + private func updateFilteredTickets() { + let updated = Self.filterTickets(tickets, state: currentFilterState, query: searchText) + if updated != filteredTickets { + filteredTickets = updated + } } // MARK: - Public API |
