From b64689020742bbf5891b5cc8a2998b12265ec1a5 Mon Sep 17 00:00:00 2001
From: Nico Hinderling <NicoHinderling@users.noreply.github.com>
Date: Mon, 26 Aug 2024 11:20:02 -0700
Subject: [PATCH 1/2] kick off updateScrollViewHeight after layout pass
 completes

---
 Sources/SnapshotPreviewsCore/ExpandingViewController.swift | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Sources/SnapshotPreviewsCore/ExpandingViewController.swift b/Sources/SnapshotPreviewsCore/ExpandingViewController.swift
index e3b4228f..d00a588f 100644
--- a/Sources/SnapshotPreviewsCore/ExpandingViewController.swift
+++ b/Sources/SnapshotPreviewsCore/ExpandingViewController.swift
@@ -78,7 +78,11 @@ public final class ExpandingViewController: UIHostingController<EmergeModifierVi
 
   public override func viewDidLayoutSubviews() {
     super.viewDidLayoutSubviews()
-    self.updateScrollViewHeight()
+
+    // Kick off in next run loop cycle to let the layout pass complete first
+    DispatchQueue.main.async {
+      self.updateScrollViewHeight()
+    }
   }
 
   public func updateScrollViewHeight() {

From 99f5c25789b1b5f991ed04824490d8d21d475d84 Mon Sep 17 00:00:00 2001
From: Nico Hinderling <NicoHinderling@users.noreply.github.com>
Date: Mon, 26 Aug 2024 12:43:10 -0700
Subject: [PATCH 2/2] more reliable logic

---
 .../ExpandingViewController.swift                     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Sources/SnapshotPreviewsCore/ExpandingViewController.swift b/Sources/SnapshotPreviewsCore/ExpandingViewController.swift
index d00a588f..a18c945d 100644
--- a/Sources/SnapshotPreviewsCore/ExpandingViewController.swift
+++ b/Sources/SnapshotPreviewsCore/ExpandingViewController.swift
@@ -78,11 +78,7 @@ public final class ExpandingViewController: UIHostingController<EmergeModifierVi
 
   public override func viewDidLayoutSubviews() {
     super.viewDidLayoutSubviews()
-
-    // Kick off in next run loop cycle to let the layout pass complete first
-    DispatchQueue.main.async {
-      self.updateScrollViewHeight()
-    }
+    updateScrollViewHeight()
   }
 
   public func updateScrollViewHeight() {
@@ -91,6 +87,11 @@ public final class ExpandingViewController: UIHostingController<EmergeModifierVi
       return
     }
 
+    // Verify scrollview has no pending layout updates
+    if let firstScrollView = firstScrollView as? UIScrollView {
+        firstScrollView.layoutIfNeeded()
+    }
+
     updateHeight {
       runCallback()
     }