Revert change in PR: Fixed the invalidating heights animation wayfair…

…-archive#164. This fixes issue where scrolling in a carousel that used collection brick caused cells above to re-size to a smaller size than what was already calculated
wfsttam · Sep 15, 2017 · 14bfaf2 · 14bfaf2
1 parent 427b379
commit 14bfaf2
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Source/Layout/BrickFlowLayout.swift b/Source/Layout/BrickFlowLayout.swift
@@ -493,8 +493,14 @@ extension BrickFlowLayout: BrickLayoutSectionDataSource {
         var size: CGSize = .zero
         switch type {
         case .brick:
-            let height = _dataSource.brickLayout(self, estimatedHeightForItemAt: indexPath, containedIn: width)
-            size = CGSize(width: width, height: height)
+            // Check if the attributes already had a height. If so, use that height
+            if attributes.frame.height != 0 && _dataSource.brickLayout(self, isEstimatedHeightFor: indexPath) {
+                let height = attributes.frame.size.height
+                size = CGSize(width: width, height: height)
+            } else {
+                let height = _dataSource.brickLayout(self, estimatedHeightForItemAt: indexPath, containedIn: width)
+                size = CGSize(width: width, height: height)
+            }
         case .section(let section):
             let height = _dataSource.brickLayout(self, estimatedHeightForItemAt: indexPath, containedIn: width)
             if height == 0 {