FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clear selected articles when selected feeds changes

Browse Source
This commit is contained in:
Maurice Parker 2020-07-26 07:37:17 -05:00
parent 5a267485c3
commit bb1b7ad0b0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Multiplatform/Shared/Timeline/TimelineModel.swift
View File

@ -147,6 +147,13 @@ private extension TimelineModel {
func subscribeToReadFilterAndFeedChanges() { func subscribeToReadFilterAndFeedChanges() {
guard let selectedFeedsPublisher = delegate?.selectedFeedsPublisher else { return } guard let selectedFeedsPublisher = delegate?.selectedFeedsPublisher else { return }
selectedFeedsPublisher
.sink { [weak self] _ in
self?.selectedTimelineItemIDs = Set<String>()
self?.selectedTimelineItemID = nil
}
.store(in: &cancellables)
let toggledReadFilterPublisher = changeReadFilterSubject let toggledReadFilterPublisher = changeReadFilterSubject
.map { Optional($0) } .map { Optional($0) }
.withLatestFrom(selectedFeedsPublisher, resultSelector: { ($1, $0) }) .withLatestFrom(selectedFeedsPublisher, resultSelector: { ($1, $0) })
@ -178,7 +185,7 @@ private extension TimelineModel {
return (feeds, timelineFeed.defaultReadFilterType == .read) return (feeds, timelineFeed.defaultReadFilterType == .read)
} }
} }
readFilterAndFeedsPublisher = toggledReadFilterPublisher readFilterAndFeedsPublisher = toggledReadFilterPublisher
.merge(with: feedsReadFilterPublisher) .merge(with: feedsReadFilterPublisher)
.share(replay: 1) .share(replay: 1)