Remove main actor isolated from Updating (#20)

FluidGroup · Nov 25, 2024 · ad662ac · ad662ac
1 parent 70d9e82
commit ad662ac
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 11 deletions.
diff --git a/Development/DataSourcesDemo/SingleSectionCollectionViewController.swift b/Development/DataSourcesDemo/SingleSectionCollectionViewController.swift
@@ -3,6 +3,19 @@ import RxSwift
 import SwiftUIHosting
 import UIKit
 
+enum NonIsolated {
+
+  func run(collectionView: UICollectionView) {
+
+    let dataSource: SectionDataController<ModelA, CollectionViewAdapter> = .init(
+      adapter: .init(collectionView: collectionView),
+      displayingSection: 0
+    )
+
+  }
+
+}
+
 final class SingleSectionCollectionViewController: UIViewController, UICollectionViewDataSource,
   UICollectionViewDelegateFlowLayout
 {

diff --git a/Sources/DataSources/CollectionViewAdapter.swift b/Sources/DataSources/CollectionViewAdapter.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-open class CollectionViewAdapter<Element>: Updating {
+public struct CollectionViewAdapter<Element>: Updating {
 
   public unowned let collectionView: UICollectionView
 
@@ -20,27 +20,27 @@ open class CollectionViewAdapter<Element>: Updating {
     self.collectionView = collectionView
   }
 
-  open func insertItems(at indexPaths: [IndexPath], in context: UpdateContext<Element>) {
+  public func insertItems(at indexPaths: [IndexPath], in context: UpdateContext<Element>) {
 
     collectionView.insertItems(at: indexPaths)
   }
 
-  open func deleteItems(at indexPaths: [IndexPath], in context: UpdateContext<Element>) {
+  public func deleteItems(at indexPaths: [IndexPath], in context: UpdateContext<Element>) {
 
     collectionView.deleteItems(at: indexPaths)
   }
 
-  open func reloadItems(at indexPaths: [IndexPath], in context: UpdateContext<Element>) {
+  public func reloadItems(at indexPaths: [IndexPath], in context: UpdateContext<Element>) {
 
     collectionView.reloadItems(at: indexPaths)
   }
 
-  open func moveItem(at indexPath: IndexPath, to newIndexPath: IndexPath, in context: UpdateContext<Element>) {
+  public func moveItem(at indexPath: IndexPath, to newIndexPath: IndexPath, in context: UpdateContext<Element>) {
 
     collectionView.moveItem(at: indexPath, to: newIndexPath)
   }
 
-  open func performBatch(in context: UpdateContext<Element>, animated: Bool, updates: @escaping () -> Void, completion: @escaping () -> Void) {
+  public func performBatch(in context: UpdateContext<Element>, animated: Bool, updates: @escaping () -> Void, completion: @escaping () -> Void) {
 
     if animated {
       collectionView.performBatchUpdates({
@@ -63,7 +63,7 @@ open class CollectionViewAdapter<Element>: Updating {
 
   }
 
-  open func reload(completion: @escaping () -> Void) {
+  public func reload(completion: @escaping () -> Void) {
 
     collectionView.reloadData()
     completion()

diff --git a/Sources/DataSources/SectionDataController.swift b/Sources/DataSources/SectionDataController.swift
@@ -103,7 +103,7 @@ public final class SectionDataController<T: Differentiable & Sendable, A: Updati
   ///   - adapter:
   ///   - displayingSection:
   ///   - isEqual: To use for decision that item should update.
-  public init(itemType: ItemType.Type? = nil, adapter: AdapterType, displayingSection: Int = 0) {
+  public init(itemType: ItemType.Type? = nil, adapter: consuming AdapterType, displayingSection: Int = 0) {
     self.adapter = adapter
     self.displayingSection = displayingSection
   }

diff --git a/Sources/DataSources/TableViewAdapter.swift b/Sources/DataSources/TableViewAdapter.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-open class TableViewAdapter<Element>: Updating {
+public struct TableViewAdapter<Element>: Updating {
 
   public unowned let tableView: UITableView
 

diff --git a/Sources/DataSources/Updating.swift b/Sources/DataSources/Updating.swift
@@ -50,23 +50,28 @@ extension UpdateContext: Sendable where Element: Sendable {
 }
 
 
-@MainActor
-public protocol Updating: AnyObject {
+public protocol Updating: ~Copyable, Sendable {
 
   associatedtype Target
   associatedtype Element
 
   var target: Target { get }
 
+  @MainActor
   func insertItems(at indexPaths: [IndexPath], in context: UpdateContext<Element>)
 
+  @MainActor
   func deleteItems(at indexPaths: [IndexPath], in context: UpdateContext<Element>)
 
+  @MainActor
   func reloadItems(at indexPaths: [IndexPath], in context: UpdateContext<Element>)
 
+  @MainActor
   func moveItem(at indexPath: IndexPath, to newIndexPath: IndexPath, in context: UpdateContext<Element>)
 
+  @MainActor
   func performBatch(in context: UpdateContext<Element>, animated: Bool, updates: @escaping () -> Void, completion: @escaping () -> Void)
 
+  @MainActor
   func reload(completion: @escaping () -> Void)
 }