thread fix

arnauddorgans · Jan 4, 2018 · 9468de3 · 9468de3
1 parent e95b550
commit 9468de3
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 3 deletions.
diff --git a/Example/InfiniteLayout/Base.lproj/Main.storyboard b/Example/InfiniteLayout/Base.lproj/Main.storyboard
@@ -203,6 +203,9 @@
                                 </cells>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="boolean" keyPath="isItemPagingEnabled" value="YES"/>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="velocityMultiplier">
+                                        <real key="value" value="500"/>
+                                    </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                                 <connections>
                                     <outlet property="dataSource" destination="ctO-Ld-yhL" id="bXu-Jz-K7t"/>
@@ -421,9 +424,6 @@
                         </cells>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="boolean" keyPath="isItemPagingEnabled" value="YES"/>
-                            <userDefinedRuntimeAttribute type="number" keyPath="velocityMultiplier">
-                                <real key="value" value="1"/>
-                            </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                         <connections>
                             <outlet property="dataSource" destination="CU7-Hg-6kG" id="BOZ-dL-WLG"/>

diff --git a/Example/InfiniteLayout/BaseCollectionViewController.swift b/Example/InfiniteLayout/BaseCollectionViewController.swift
@@ -22,4 +22,8 @@ class BaseCollectionViewController: InfiniteCollectionViewController {
     override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         return 20
     }
+
+    override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        collectionView.scrollToItem(at: indexPath, at: self.infiniteCollectionView!.infiniteLayout.scrollDirection == .vertical ? .centeredVertically : .centeredHorizontally, animated: true)
+    }
 }
diff --git a/Example/InfiniteLayout/CustomViewController.swift b/Example/InfiniteLayout/CustomViewController.swift
@@ -31,6 +31,13 @@ extension CustomViewController: UICollectionViewDataSource {
     }
 }
 
+extension CustomViewController: UICollectionViewDelegate {
+
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        collectionView.scrollToItem(at: indexPath, at: .centeredVertically, animated: true)
+    }
+}
+
 extension CustomViewController: UICollectionViewDelegateFlowLayout {
 
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {

diff --git a/Example/InfiniteLayout/PickerController.swift b/Example/InfiniteLayout/PickerController.swift
@@ -30,6 +30,13 @@ extension PickerController: UICollectionViewDataSource {
     }
 }
 
+extension PickerController: UICollectionViewDelegate {
+
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        collectionView.scrollToItem(at: indexPath, at: .centeredHorizontally, animated: true)
+    }
+}
+
 extension PickerController: InfiniteCollectionViewDelegate {
 
     func infiniteCollectionView(_ infiniteCollectionView: InfiniteCollectionView, didChangeCenteredIndexPath centeredIndexPath: IndexPath?) {

diff --git a/Example/InfiniteLayout/RxBaseCollectionViewController.swift b/Example/InfiniteLayout/RxBaseCollectionViewController.swift
@@ -35,5 +35,11 @@ class RxBaseCollectionViewController: UIViewController {
                 }
                 print("centered: \(current + 1)")
             }).disposed(by: disposeBag)
+
+        infiniteCollectionView.rx.itemSelected
+            .asDriver()
+            .drive(onNext: { [unowned self] indexPath in
+                self.infiniteCollectionView.scrollToItem(at: indexPath, at: .centeredVertically, animated: true)
+            }).disposed(by: disposeBag)
     }
 }
diff --git a/InfiniteLayout/Classes/InfiniteLayout.swift b/InfiniteLayout/Classes/InfiniteLayout.swift
@@ -143,6 +143,7 @@ open class InfiniteLayout: UICollectionViewFlowLayout {
         let offset = self.preferredContentOffset(forContentOffset: collectionView.contentOffset)
         if (page < 2 || page > self.multiplier - 2) && collectionView.contentOffset != offset {
             collectionView.contentOffset = offset
+            DispatchQueue.main.async(execute: self.invalidateLayout)
         }
     }
 
@@ -249,6 +250,7 @@ open class InfiniteLayout: UICollectionViewFlowLayout {
                 return
         }
         collectionView.contentOffset = offset
+        DispatchQueue.main.async(execute: self.invalidateLayout)
     }
 
     // MARK: Copy