Merge pull request #12 from amirdew/fix/current-page-not-updated

Fix currentPage not updated issue

Author: amirdew

Lib/CollectionViewPagingLayout.swift

@@ -135,15 +135,16 @@ public class CollectionViewPagingLayout: UICollectionViewLayout {
 
     // MARK: Private functions
 
-    private func updateCurrentPageIfNeeded() {
+    private func updateCurrentPageIfNeeded(basedOn contentOffset: CGPoint? = nil) {
         var currentPage: Int = 0
         if let collectionView = collectionView {
+            let contentOffset = contentOffset ?? collectionView.contentOffset
             let pageSize = scrollDirection == .horizontal ? collectionView.frame.width : collectionView.frame.height
-            let contentOffset = scrollDirection == .horizontal ?
-                (collectionView.contentOffset.x + collectionView.contentInset.left) :
-                (collectionView.contentOffset.y + collectionView.contentInset.top)
+            let offset = scrollDirection == .horizontal ?
+                (contentOffset.x + collectionView.contentInset.left) :
+                (contentOffset.y + collectionView.contentInset.top)
             if pageSize > 0 {
-                currentPage = Int(round(contentOffset / pageSize))
+                currentPage = Int(round(offset / pageSize))
             }
         }
         if currentPage != self.currentPage {
@@ -174,5 +175,6 @@ public class CollectionViewPagingLayout: UICollectionViewLayout {
         offset = min(offset, maxPossibleOffset)
         let contentOffset: CGPoint = scrollDirection == .horizontal ? CGPoint(x: offset, y: 0) : CGPoint(x: 0, y: offset)
         collectionView?.setContentOffset(contentOffset, animated: animated)
+        updateCurrentPageIfNeeded(basedOn: contentOffset)
     }
 }