Revert "Revert "Force layout before appear, to avoid animated updates (…

…#505)"" This reverts commit 989bf10.
square · Dec 8, 2023 · d11bb07 · d11bb07
1 parent 5d989dc
commit d11bb07
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ### Fixed
 
+- Fixed an issue where animations would occur when dequeuing / reusing cells. A layout is now forced without animation before presentation.
+
 ### Added
 
 ### Removed

diff --git a/ListableUI/Sources/Internal/PresentationState/PresentationState.HeaderFooterState.swift b/ListableUI/Sources/Internal/PresentationState/PresentationState.HeaderFooterState.swift
@@ -150,11 +150,15 @@ extension PresentationState
                 HeaderFooterContentView<Content>(frame: frame)
             }
 
-            self.applyTo(
-                view: view,
-                for: .willDisplay,
-                with: .init(environment: environment)
-            )
+            UIView.performWithoutAnimation {
+                self.applyTo(
+                    view: view,
+                    for: .willDisplay,
+                    with: .init(environment: environment)
+                )
+
+                view.layoutIfNeeded()
+            }
 
             return view
         }

diff --git a/ListableUI/Sources/Internal/PresentationState/PresentationState.ItemState.swift b/ListableUI/Sources/Internal/PresentationState/PresentationState.ItemState.swift
@@ -259,12 +259,16 @@ extension PresentationState
 
             let itemState = ListableUI.ItemState(cell: cell, isReordering: false)
 
-            self.applyTo(
-                cell: cell,
-                itemState: itemState,
-                reason: .willDisplay,
-                environment: environment
-            )
+            UIView.performWithoutAnimation {
+                self.applyTo(
+                    cell: cell,
+                    itemState: itemState,
+                    reason: .willDisplay,
+                    environment: environment
+                )
+
+                cell.layoutIfNeeded()
+            }
 
             return cell
         }