Remove unnecessary flag ignoreUpdateCurrentPage

Author: amirdew

Lib/CollectionViewPagingLayout.swift

@@ -65,7 +65,6 @@ public class CollectionViewPagingLayout: UICollectionViewLayout {
 
 
     // MARK: UICollectionViewLayout
-    var ignoreUpdateCurrentPage : Bool = false
 
     override public func shouldInvalidateLayout(forBoundsChange newBounds: CGRect) -> Bool {
         true
@@ -130,9 +129,7 @@ public class CollectionViewPagingLayout: UICollectionViewLayout {
 
     override public func invalidateLayout() {
         super.invalidateLayout()
-        if !ignoreUpdateCurrentPage{
-            updateCurrentPageIfNeeded()
-        }
+        updateCurrentPageIfNeeded()
     }
 
 
@@ -177,14 +174,14 @@ public class CollectionViewPagingLayout: UICollectionViewLayout {
         offset = max(0, offset)
         offset = min(offset, maxPossibleOffset)
         let contentOffset: CGPoint = scrollDirection == .horizontal ? CGPoint(x: offset, y: 0) : CGPoint(x: 0, y: offset)
-        ignoreUpdateCurrentPage = true
         CATransaction.begin()
-        CATransaction.setCompletionBlock({
-            self.ignoreUpdateCurrentPage = false
-            self.updateCurrentPageIfNeeded(basedOn: contentOffset)
-        })
+        CATransaction.setCompletionBlock { [weak self] in
+            self?.updateCurrentPageIfNeeded(basedOn: contentOffset)
+        }
+        if !animated {
+            updateCurrentPageIfNeeded(basedOn: contentOffset)
+        }
         collectionView?.setContentOffset(contentOffset, animated: animated)
         CATransaction.commit()
-        
     }
 }