Spread

Author: maxg-square

ListableUI/Sources/ListView/ListView.swift

@@ -537,7 +537,10 @@ public final class ListView : UIView
         guard let toIndexPath = self.storage.allContent.firstIndexPathForItem(with: item) else {
             return false
         }
-        
+
+        // If user is performing this in a `UIView.performWithoutAnimation` block, respect that and don't animate, regardless of what the animated parameter is.
+        let shouldAnimate = animated && UIView.areAnimationsEnabled
+
         return self.preparePresentationStateForScroll(to: toIndexPath) {
 
             /// `preparePresentationStateForScroll(to:)` is asynchronous in some
@@ -557,9 +560,6 @@ public final class ListView : UIView
                 return
             }
 
-            // If user is performing this in a `UIView.performWithoutAnimation` block, respect that and don't animate, regardless of what the animated parameter is.
-            let shouldAnimate = animated && UIView.areAnimationsEnabled
-
             let sectionHeader = self.collectionViewLayout.layout.content.sections[toIndexPath.section].header
 
             // Prevent the item from appearing underneath a sticky section header.
@@ -690,9 +690,12 @@ public final class ListView : UIView
 
         // The rect we scroll to must have an area – an empty rect will result in no scrolling.
         let rect = CGRect(origin: .zero, size: CGSize(width: 1.0, height: 1.0))
-        
+
+        // If user is performing this in a `UIView.performWithoutAnimation` block, respect that and don't animate, regardless of what the animated parameter is.
+        let shouldAnimate = animated && UIView.areAnimationsEnabled
+
         return self.preparePresentationStateForScroll(to: IndexPath(item: 0, section: 0))  {
-            self.collectionView.scrollRectToVisible(rect, animated: animated)
+            self.collectionView.scrollRectToVisible(rect, animated: shouldAnimate)
         }
     }
 
@@ -708,6 +711,9 @@ public final class ListView : UIView
             return false
         }
 
+        // If user is performing this in a `UIView.performWithoutAnimation` block, respect that and don't animate, regardless of what the animated parameter is.
+        let shouldAnimate = animated && UIView.areAnimationsEnabled
+
         // Perform scrolling.
 
         return self.preparePresentationStateForScroll(to: toIndexPath)  {
@@ -721,7 +727,7 @@ public final class ListView : UIView
             let contentOffsetY = contentHeight - contentFrameHeight - self.collectionView.adjustedContentInset.top
             let contentOffset = CGPoint(x: self.collectionView.contentOffset.x, y: contentOffsetY)
 
-            self.collectionView.setContentOffset(contentOffset, animated: animated)
+            self.collectionView.setContentOffset(contentOffset, animated: shouldAnimate)
         }
     }
 
@@ -1274,6 +1280,9 @@ public final class ListView : UIView
             return
         }
 
+        // If user is performing this in a `UIView.performWithoutAnimation` block, respect that and don't animate, regardless of what the animated parameter is.
+        let shouldAnimate = animated && UIView.areAnimationsEnabled
+
         let topInset = collectionView.adjustedContentInset.top
         let contentFrameHeight = collectionView.visibleContentFrame.height
         let adjustedOriginY = targetFrame.origin.y - topInset
@@ -1298,7 +1307,7 @@ public final class ListView : UIView
 
         resultOffset.y = max(resultOffset.y, -topInset)
 
-        self.collectionView.setContentOffset(resultOffset, animated: animated)
+        self.collectionView.setContentOffset(resultOffset, animated: shouldAnimate)
     }
 
     private func preparePresentationStateForScroll(to toIndexPath: IndexPath, scroll: @escaping () -> Void) -> Bool {

Package.resolved

@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/square/Blueprint",
       "state" : {
-        "revision" : "93ccf388f656db030750ac2a895dc80205e5ae20",
-        "version" : "4.0.0"
+        "revision" : "976cdea520ce0f8404124b7e4780c46dc2d98212",
+        "version" : "5.2.0"
       }
     }
   ],