Merge pull request #219 from robertjpayne/patch-attribute-graph

apptekstudios · web-flow · commit 8698712621ec · 2021-09-22T11:00:52.000+10:00
Fix AttributeGraph Cycle Issues
diff --git a/Sources/ASCollectionView/Datasource/ASDiffableDataSourceCollectionView.swift b/Sources/ASCollectionView/Datasource/ASDiffableDataSourceCollectionView.swift
@@ -40,18 +40,15 @@ class ASDiffableDataSourceCollectionView<SectionID: Hashable>: ASDiffableDataSou
 				self.currentSnapshot = .init(sections: newSections)
 			}
 		}
-		CATransaction.begin()
-		CATransaction.setCompletionBlock(completion)
 		if firstLoad || !animated
 		{
-			CATransaction.setDisableActions(true)
-			apply()
+		        UIView.performWithoutAnimation(apply)
 		}
 		else
 		{
 			apply()
 		}
-		CATransaction.commit()
+                completion?()
 		firstLoad = false
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -40,18 +40,15 @@ class ASDiffableDataSourceCollectionView<SectionID: Hashable>: ASDiffableDataSou`
`40`	`40`	`self.currentSnapshot = .init(sections: newSections)`
`41`	`41`	`}`
`42`	`42`	`}`
`43`		`- CATransaction.begin()`
`44`		`- CATransaction.setCompletionBlock(completion)`
`45`	`43`	`if firstLoad \|\| !animated`
`46`	`44`	`{`
`47`		`- CATransaction.setDisableActions(true)`
`48`		`- apply()`
	`45`	`+ UIView.performWithoutAnimation(apply)`
`49`	`46`	`}`
`50`	`47`	`else`
`51`	`48`	`{`
`52`	`49`	`apply()`
`53`	`50`	`}`
`54`		`- CATransaction.commit()`
	`51`	`+ completion?()`
`55`	`52`	`firstLoad = false`
`56`	`53`	`}`
`57`	`54`