Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use UITableView reconfigureRows and UICollectionView reconfigureItems #159

Closed
wants to merge 1 commit into from
Closed

Use UITableView reconfigureRows and UICollectionView reconfigureItems #159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 40 additions & 2 deletions Sources/Extensions/UIKitExtension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ public extension UITableView {
/// - Parameters:
/// - stagedChangeset: A staged set of changes.
/// - animation: An option to animate the updates.
/// - reconfigure: A closure that takes an index path as its argument and returns true if the cell for that index path can be reconfigured instead of reloading
/// - interrupt: A closure that takes an changeset as its argument and returns `true` if the animated
/// updates should be stopped and performed reloadData. Default is nil.
/// - setData: A closure that takes the collection as a parameter.
/// The collection should be set to data-source of UITableView.
func reload<C>(
using stagedChangeset: StagedChangeset<C>,
with animation: @autoclosure () -> RowAnimation,
reconfigure: ((IndexPath) -> Bool)? = nil,
interrupt: ((Changeset<C>) -> Bool)? = nil,
setData: (C) -> Void
) {
Expand All @@ -29,6 +31,7 @@ public extension UITableView {
deleteRowsAnimation: animation(),
insertRowsAnimation: animation(),
reloadRowsAnimation: animation(),
reconfigure: reconfigure,
interrupt: interrupt,
setData: setData
)
Expand All @@ -48,6 +51,7 @@ public extension UITableView {
/// - deleteRowsAnimation: An option to animate the row deletion.
/// - insertRowsAnimation: An option to animate the row insertion.
/// - reloadRowsAnimation: An option to animate the row reload.
/// - reconfigure: A closure that takes an index path as its argument and returns true if the cell for that index path can be reconfigured instead of reloading
/// - interrupt: A closure that takes an changeset as its argument and returns `true` if the animated
/// updates should be stopped and performed reloadData. Default is nil.
/// - setData: A closure that takes the collection as a parameter.
Expand All @@ -60,6 +64,7 @@ public extension UITableView {
deleteRowsAnimation: @autoclosure () -> RowAnimation,
insertRowsAnimation: @autoclosure () -> RowAnimation,
reloadRowsAnimation: @autoclosure () -> RowAnimation,
reconfigure: ((IndexPath) -> Bool)? = nil,
interrupt: ((Changeset<C>) -> Bool)? = nil,
setData: (C) -> Void
) {
Expand Down Expand Up @@ -102,7 +107,18 @@ public extension UITableView {
}

if !changeset.elementUpdated.isEmpty {
reloadRows(at: changeset.elementUpdated.map { IndexPath(row: $0.element, section: $0.section) }, with: reloadRowsAnimation())
var indexPaths = changeset.elementUpdated.map { IndexPath(row: $0.element, section: $0.section) }
if #available(iOS 15.0, tvOS 15.0, *), let reconfigure {
let partitioned = indexPaths.partitionReconfigurable(by: reconfigure)
if !partitioned.reconfiguredIndexPaths.isEmpty {
reconfigureRows(at: partitioned.reconfiguredIndexPaths)
}
if !partitioned.reloadedIndexPaths.isEmpty {
reloadRows(at: partitioned.reloadedIndexPaths, with: reloadRowsAnimation())
}
} else {
laevandus marked this conversation as resolved.
Show resolved Hide resolved
reloadRows(at: indexPaths, with: reloadRowsAnimation())
}
}

for (source, target) in changeset.elementMoved {
Expand Down Expand Up @@ -133,12 +149,14 @@ public extension UICollectionView {
///
/// - Parameters:
/// - stagedChangeset: A staged set of changes.
/// - reconfigure: A closure that takes an index path as its argument and returns true if the cell for that index path can be reconfigured instead of reloading
/// - interrupt: A closure that takes an changeset as its argument and returns `true` if the animated
/// updates should be stopped and performed reloadData. Default is nil.
/// - setData: A closure that takes the collection as a parameter.
/// The collection should be set to data-source of UICollectionView.
func reload<C>(
using stagedChangeset: StagedChangeset<C>,
reconfigure: ((IndexPath) -> Bool)? = nil,
interrupt: ((Changeset<C>) -> Bool)? = nil,
setData: (C) -> Void
) {
Expand Down Expand Up @@ -181,7 +199,19 @@ public extension UICollectionView {
}

if !changeset.elementUpdated.isEmpty {
reloadItems(at: changeset.elementUpdated.map { IndexPath(item: $0.element, section: $0.section) })
var indexPaths = changeset.elementUpdated.map { IndexPath(row: $0.element, section: $0.section) }

if #available(iOS 15.0, tvOS 15.0, *), let reconfigure {
let partitioned = indexPaths.partitionReconfigurable(by: reconfigure)
if !partitioned.reconfiguredIndexPaths.isEmpty {
reconfigureItems(at: partitioned.reconfiguredIndexPaths)
}
if !partitioned.reloadedIndexPaths.isEmpty {
reloadItems(at: partitioned.reloadedIndexPaths)
}
} else {
laevandus marked this conversation as resolved.
Show resolved Hide resolved
reloadItems(at: indexPaths)
}
}

for (source, target) in changeset.elementMoved {
Expand All @@ -191,4 +221,12 @@ public extension UICollectionView {
}
}
}

private extension Array where Element == IndexPath {
mutating func partitionReconfigurable(by reconfigurable: (Element) -> Bool) -> (reloadedIndexPaths: [Element], reconfiguredIndexPaths: [Element]) {
let reconfigureFirstIndex = partition(by: reconfigurable)
return (Array(self[..<reconfigureFirstIndex]), Array(self[reconfigureFirstIndex...]))
}
}

#endif