From 82912305611811747acdc2b4320868400b3685f8 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 18 Jul 2020 21:02:38 -0500 Subject: [PATCH] Fix the iPad which seems to like to set the selected value to nil after setting it to the correct selection --- Multiplatform/Shared/Sidebar/SidebarModel.swift | 4 ++-- Multiplatform/Shared/Timeline/TimelineModel.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Multiplatform/Shared/Sidebar/SidebarModel.swift b/Multiplatform/Shared/Sidebar/SidebarModel.swift index bd63f87f9..4da083269 100644 --- a/Multiplatform/Shared/Sidebar/SidebarModel.swift +++ b/Multiplatform/Shared/Sidebar/SidebarModel.swift @@ -91,11 +91,11 @@ private extension SidebarModel { } .assign(to: $selectedFeeds) - $selectedFeedIdentifier.map { [weak self] feedID in + $selectedFeedIdentifier.compactMap { [weak self] feedID in if let feedID = feedID, let feed = self?.findFeed(feedID) { return [feed] } else { - return [Feed]() + return nil } } .assign(to: $selectedFeeds) diff --git a/Multiplatform/Shared/Timeline/TimelineModel.swift b/Multiplatform/Shared/Timeline/TimelineModel.swift index 12ef8d117..2368cbf28 100644 --- a/Multiplatform/Shared/Timeline/TimelineModel.swift +++ b/Multiplatform/Shared/Timeline/TimelineModel.swift @@ -131,11 +131,11 @@ class TimelineModel: ObservableObject, UndoableCommandRunner { } .assign(to: $selectedArticles) - $selectedArticleID.map { [weak self] articleID in + $selectedArticleID.compactMap { [weak self] articleID in if let articleID = articleID, let article = self?.idToArticleDictionary[articleID] { return [article] } else { - return [Article]() + return nil } } .assign(to: $selectedArticles)