renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always updates the tree controller when collapsing and expanding. Fixes #3040

Browse Source
This commit is contained in:
Maurice Parker
2021-08-24 16:55:44 -05:00
parent 7e689d2eb1
commit 168020cba2
2 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
iOS/MasterFeed/MasterFeedViewController.swift
View File

@@ -511,33 +511,21 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
@objc func expandSelectedRows(_ sender: Any?) {
if let indexPath = coordinator.currentFeedIndexPath, let containerID = dataSource.itemIdentifier(for: indexPath)?.containerID {
coordinator.expand(containerID)
self.applyChanges(animated: true) {
self.reloadAllVisibleCells()
}
}
}
@objc func collapseSelectedRows(_ sender: Any?) {
if let indexPath = coordinator.currentFeedIndexPath, let containerID = dataSource.itemIdentifier(for: indexPath)?.containerID {
coordinator.collapse(containerID)
self.applyChanges(animated: true) {
self.reloadAllVisibleCells()
}
}
}
@objc func expandAll(_ sender: Any?) {
coordinator.expandAllSectionsAndFolders()
self.applyChanges(animated: true) {
self.reloadAllVisibleCells()
}
}
@objc func collapseAllExceptForGroupItems(_ sender: Any?) {
coordinator.collapseAllFolders()
self.applyChanges(animated: true) {
self.reloadAllVisibleCells()
}
}
@objc func markAllAsRead(_ sender: Any) {
@@ -917,11 +905,9 @@ private extension MasterFeedViewController {
if coordinator.isExpanded(sectionNode) {
headerView.disclosureExpanded = false
coordinator.collapse(sectionNode)
self.applyChanges(animated: true)
} else {
headerView.disclosureExpanded = true
coordinator.expand(sectionNode)
self.applyChanges(animated: true)
}
}
@@ -930,7 +916,6 @@ private extension MasterFeedViewController {
return
}
coordinator.expand(containerID)
applyChanges(animated: true)
}
func collapse(_ cell: MasterFeedTableViewCell) {
@@ -938,7 +923,6 @@ private extension MasterFeedViewController {
return
}
coordinator.collapse(containerID)
applyChanges(animated: true)
}
func makeWebFeedContextMenu(identifier: MasterFeedTableViewIdentifier, indexPath: IndexPath, includeDeleteRename: Bool) -> UIContextMenuConfiguration {