From 9dcc99fc200dab209a63a2a7a891a1c9a2f95cb6 Mon Sep 17 00:00:00 2001
From: johnnewman-square <johnnewman@squareup.com>
Date: Thu, 11 Dec 2025 09:41:16 -0500
Subject: [PATCH 1/2] Continuing to aggregate toasts when removed from the
 window.

---
 .../Sources/AnyModalToastContainer.swift      | 16 +++---
 .../Tests/ModalHostContainerTests.swift       | 53 +++++++++++++++++++
 2 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/WorkflowModals/Sources/AnyModalToastContainer.swift b/WorkflowModals/Sources/AnyModalToastContainer.swift
index ec021c37..08e19ff8 100644
--- a/WorkflowModals/Sources/AnyModalToastContainer.swift
+++ b/WorkflowModals/Sources/AnyModalToastContainer.swift
@@ -65,9 +65,9 @@ public final class AnyModalToastContainerViewController: ScreenViewController<An
     // the host of our modals once we're in one.
     private var needsModalHostUpdate: Bool
 
-    // When we're removed from the view (controller) hierarchy, we need to notify our modal host to update our
-    // modals with an empty modal list. This bool indicates that `aggregateModals` should return an empty array.
-    private var isBeingRemovedFromHierarchy = false
+    // This indicates that the controller's view has been removed from its window. When true, modals will
+    // not be aggregated. However, toasts will continue to aggregate.
+    private var wasRemovedFromWindow = false
 
     // The manager is lazily instantiated and updated when aggregateModals is first called so that it is more likely to
     // use a complete and valid environment during the initial modal list resolution. We may, for example, be in a
@@ -84,10 +84,6 @@ public final class AnyModalToastContainerViewController: ScreenViewController<An
     }
 
     public override func aggregateModals() -> ModalList {
-        if isBeingRemovedFromHierarchy {
-            return ModalList(modals: [])
-        }
-
         // Lazily instantiate and update the manager if needed.
         let manager: AnyPresentedModalsManager
         if let existingManager = self.manager {
@@ -108,8 +104,8 @@ public final class AnyModalToastContainerViewController: ScreenViewController<An
         }
 
         return ModalList(
-            modals: aggregateModals.modals
-                + presentedModalsAndAggregates.flatMap { [$0] + $1.modals },
+            modals: wasRemovedFromWindow ? [] : (aggregateModals.modals
+                + presentedModalsAndAggregates.flatMap { [$0] + $1.modals }),
             toasts: manager.presentedToasts.map { $0.toast }
                 + aggregateModals.toasts
                 + presentedModalsAndAggregates.flatMap { $1.toasts },
@@ -132,7 +128,7 @@ public final class AnyModalToastContainerViewController: ScreenViewController<An
 
     public override func loadView() {
         view = View(willMoveToWindow: { [weak self] window in
-            self?.isBeingRemovedFromHierarchy = window == nil
+            self?.wasRemovedFromWindow = window == nil
 
             if window == nil {
                 self?.setNeedsModalHostUpdate()
diff --git a/WorkflowModals/Tests/ModalHostContainerTests.swift b/WorkflowModals/Tests/ModalHostContainerTests.swift
index bc677472..c809fcd8 100644
--- a/WorkflowModals/Tests/ModalHostContainerTests.swift
+++ b/WorkflowModals/Tests/ModalHostContainerTests.swift
@@ -417,4 +417,57 @@ class ModalHostContainerTests: XCTestCase {
         hostContainer.view.layoutIfNeeded()
         XCTAssertEqual(hostContainer.preferredContentSize, CGSize(width: axisSize, height: axisSize))
     }
+
+    func test_aggregation_with_no_window() {
+        let screen = ModalContainer(
+            base: ToastContainer(
+                base: EmptyScreen(),
+                toasts: [
+                    Toast(
+                        key: "test-toast",
+                        style: ToastPresentationStyleFixture(),
+                        content: EmptyScreen(),
+                        accessibilityAnnouncement: "Test toast."
+                    ),
+                ]
+            ),
+            modals: [
+                Modal(
+                    key: "test-modal",
+                    style: FullScreenModalStyle(),
+                    content: EmptyScreen()
+                ),
+            ]
+        )
+
+        let viewController = ModalHostContainer.ViewController(
+            screen: .init(
+                content: screen,
+                toastContainerStyle: .fixture
+            ),
+            environment: .empty
+        )
+
+        show(vc: viewController) { viewController in
+            viewController.view.layoutIfNeeded()
+
+            do {
+                // When the presenting controller's view is attached to the window, its modals
+                // and toasts should be aggregated, as long as there is a modal host.
+                let aggregated = viewController.content.aggregateModals()
+                XCTAssertEqual(aggregated.modals.count, 1)
+                XCTAssertEqual(aggregated.toasts.count, 1)
+            }
+
+            do {
+                // After the presenting controller's view is removed from the window, its modals
+                // should not be aggregated, but toasts should continue to aggregate.
+                viewController.view.removeFromSuperview()
+
+                let aggregated = viewController.content.aggregateModals()
+                XCTAssertEqual(aggregated.modals.count, 0)
+                XCTAssertEqual(aggregated.toasts.count, 1)
+            }
+        }
+    }
 }

From d1f51e93ed345c899f33c2e14c66a81a3524b183 Mon Sep 17 00:00:00 2001
From: johnnewman-square <johnnewman@squareup.com>
Date: Thu, 11 Dec 2025 16:20:55 -0500
Subject: [PATCH 2/2] Updating Xcode and iOS versions.

---
 .github/workflows/validations.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/validations.yaml b/.github/workflows/validations.yaml
index 91bcbe01..8351c0f6 100644
--- a/.github/workflows/validations.yaml
+++ b/.github/workflows/validations.yaml
@@ -7,10 +7,10 @@ on:
   pull_request:
 
 env:
-  XCODE_VERSION: 16.1
+  XCODE_VERSION: 26.0.1
   TUIST_TEST_DEVICE: iPad (10th generation)
   TUIST_TEST_PLATFORM: iOS
-  TUIST_TEST_OS: 17.2
+  TUIST_TEST_OS: 18.6
 
 jobs:
   development-tests: