From 628f3494487413bbb1a76368f9ee84ee6088285a Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 25 Jul 2020 16:33:40 -0500 Subject: [PATCH] Fix previous and next article API's --- .../Shared/Timeline/TimelineModel.swift | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/Multiplatform/Shared/Timeline/TimelineModel.swift b/Multiplatform/Shared/Timeline/TimelineModel.swift index fb3e9a8c3..beef15bd8 100644 --- a/Multiplatform/Shared/Timeline/TimelineModel.swift +++ b/Multiplatform/Shared/Timeline/TimelineModel.swift @@ -98,19 +98,17 @@ class TimelineModel: ObservableObject, UndoableCommandRunner { } func findPrevArticle(_ article: Article) -> Article? { - return nil -// guard let index = articles.firstIndex(of: article), index > 0 else { -// return nil -// } -// return articles[index - 1] + guard let index = timelineItems.index[article.articleID], index > 0 else { + return nil + } + return timelineItems.items[index - 1].article } func findNextArticle(_ article: Article) -> Article? { - return nil -// guard let index = articles.firstIndex(of: article), index + 1 != articles.count else { -// return nil -// } -// return articles[index + 1] + guard let index = timelineItems.index[article.articleID], index + 1 != timelineItems.items.count else { + return nil + } + return timelineItems.items[index + 1].article } func selectArticle(_ article: Article) { @@ -313,13 +311,6 @@ private extension TimelineModel { } // MARK: Timeline Management - - func sortParametersDidChange() { -// performBlockAndRestoreSelection { -// articles = articles.sortedByDate(sortDirection ? .orderedDescending : .orderedAscending, groupByFeed: groupByFeed) -// rebuildTimelineItems() -// } - } func performBlockAndRestoreSelection(_ block: (() -> Void)) { // let savedArticleIDs = selectedArticleIDs