From bb1b7ad0b0029c2dc50854793ae768bf0cfb8446 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 26 Jul 2020 07:37:17 -0500 Subject: [PATCH] Clear selected articles when selected feeds changes --- Multiplatform/Shared/Timeline/TimelineModel.swift | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Multiplatform/Shared/Timeline/TimelineModel.swift b/Multiplatform/Shared/Timeline/TimelineModel.swift index a28aabd55..1f690e859 100644 --- a/Multiplatform/Shared/Timeline/TimelineModel.swift +++ b/Multiplatform/Shared/Timeline/TimelineModel.swift @@ -147,6 +147,13 @@ private extension TimelineModel { func subscribeToReadFilterAndFeedChanges() { guard let selectedFeedsPublisher = delegate?.selectedFeedsPublisher else { return } + selectedFeedsPublisher + .sink { [weak self] _ in + self?.selectedTimelineItemIDs = Set() + self?.selectedTimelineItemID = nil + } + .store(in: &cancellables) + let toggledReadFilterPublisher = changeReadFilterSubject .map { Optional($0) } .withLatestFrom(selectedFeedsPublisher, resultSelector: { ($1, $0) }) @@ -178,7 +185,7 @@ private extension TimelineModel { return (feeds, timelineFeed.defaultReadFilterType == .read) } } - + readFilterAndFeedsPublisher = toggledReadFilterPublisher .merge(with: feedsReadFilterPublisher) .share(replay: 1)