Merge pull request #3532 from Wevah/article-copy-order-fix

Return [Article] from articlesForIndexes() instead of Set<Article>
Ranchero-Software · Jun 8, 2022 · 6386a51 · 6386a51
2 parents d9d00b4 + ae09d52
commit 6386a51
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Mac/MainWindow/Timeline/TimelineViewController.swift b/Mac/MainWindow/Timeline/TimelineViewController.swift
@@ -85,7 +85,7 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
 
 	var showsSearchResults = false
 	var selectedArticles: [Article] {
-		return Array(articles.articlesForIndexes(tableView.selectedRowIndexes))
+		return articles.articlesForIndexes(tableView.selectedRowIndexes)
 	}
 
 	var hasAtLeastOneSelectedArticle: Bool {

diff --git a/Shared/Timeline/ArticleArray.swift b/Shared/Timeline/ArticleArray.swift
@@ -44,10 +44,10 @@ extension Array where Element == Article {
 		return nil
 	}
 
-	func articlesForIndexes(_ indexes: IndexSet) -> Set<Article> {
-		return Set(indexes.compactMap{ (oneIndex) -> Article? in
+	func articlesForIndexes(_ indexes: IndexSet) -> [Article] {
+		return indexes.compactMap{ (oneIndex) -> Article? in
 			return articleAtRow(oneIndex)
-		})
+		}
 	}
 
 	func sortedByDate(_ sortDirection: ComparisonResult, groupByFeed: Bool = false) -> ArticleArray {