From 2b0f6f4e77d527cb350305ddb3665291c10e089c Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Thu, 16 Jul 2020 12:27:40 -0500
Subject: [PATCH] Deselect articles when switching selected feeds

---
 Multiplatform/Shared/Timeline/TimelineModel.swift | 3 +++
 Multiplatform/Shared/Timeline/TimelineView.swift  | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Multiplatform/Shared/Timeline/TimelineModel.swift b/Multiplatform/Shared/Timeline/TimelineModel.swift
index 552ec7ca9..f0310d7c0 100644
--- a/Multiplatform/Shared/Timeline/TimelineModel.swift
+++ b/Multiplatform/Shared/Timeline/TimelineModel.swift
@@ -303,6 +303,9 @@ private extension TimelineModel {
 	func replaceArticles(with unsortedArticles: Set<Article>) {
 		articles = Array(unsortedArticles).sortedByDate(sortDirection ? .orderedDescending : .orderedAscending, groupByFeed: groupByFeed)
 		rebuildTimelineItems()
+		
+		selectedArticleIDs = Set<String>()
+		selectedArticleID = nil
 		// TODO: Update unread counts and other item done in didSet on AppKit
 	}
 	
diff --git a/Multiplatform/Shared/Timeline/TimelineView.swift b/Multiplatform/Shared/Timeline/TimelineView.swift
index b028f4b46..9bfd6c5f5 100644
--- a/Multiplatform/Shared/Timeline/TimelineView.swift
+++ b/Multiplatform/Shared/Timeline/TimelineView.swift
@@ -11,7 +11,7 @@ import SwiftUI
 struct TimelineView: View {
 	
 	@EnvironmentObject private var timelineModel: TimelineModel
-	@State var navigate = false
+	@State var navigate = true
 
 	@ViewBuilder var body: some View {
 		#if os(macOS)
@@ -43,9 +43,6 @@ struct TimelineView: View {
 					TimelineItemView(timelineItem: timelineItem)
 				}
 			}
-			.onChange(of: timelineModel.selectedArticleIDs) { ids in
-				navigate = !ids.isEmpty
-			}
 		}
 		.navigationTitle(Text(verbatim: timelineModel.nameForDisplay))
 		#else