wip

Kondamon · Mar 7, 2023 · 79c64d2 · 79c64d2
1 parent f22eca1
commit 79c64d2
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 16 deletions.
diff --git a/Examples/Integration/Integration/PresentationTestCase.swift b/Examples/Integration/Integration/PresentationTestCase.swift
@@ -112,7 +112,11 @@ private struct PresentationTestCase: ReducerProtocol {
       case .destination(.presented(.alert(.showSheet))):
         state.destination = .sheet(ChildFeature.State())
         return .none
-      case .destination(.presented(.dialog(.showAlert))),
+      case
+          .destination(.presented(.dialog(.showAlert))),
+          .destination(.presented(.fullScreenCover(.dismissAndAlert))),
+          .destination(.presented(.popover(.dismissAndAlert))),
+          .destination(.presented(.navigationDestination(.dismissAndAlert))),
         .destination(.presented(.sheet(.dismissAndAlert))):
         state.destination = .alert(
           AlertState {
@@ -172,6 +176,7 @@ private struct ChildFeature: ReducerProtocol {
   struct State: Equatable, Identifiable {
     var id = UUID()
     var count = 0
+    var isDismissed = false
     @BindingState var text = ""
   }
   enum Action: BindableAction, Equatable {
@@ -192,13 +197,15 @@ private struct ChildFeature: ReducerProtocol {
       case .binding:
         return .none
       case .childDismissButtonTapped:
+        state.isDismissed = true
         return .fireAndForget { await self.dismiss() }
       case .dismissAndAlert:
         return .none
       case .incrementButtonTapped:
         state.count += 1
         return .none
       case .parentSendDismissActionButtonTapped:
+        state.isDismissed = true
         return .none
       case .resetIdentity:
         state.id = UUID()
@@ -326,6 +333,7 @@ struct PresentationTestCaseView: View {
 }
 
 private struct ChildView: View {
+  @Environment(\.dismiss) var dismiss
   let store: StoreOf<ChildFeature>
 
   var body: some View {
@@ -352,6 +360,9 @@ private struct ChildView: View {
           viewStore.send(.resetIdentity)
         }
       }
+      .onChange(of: viewStore.isDismissed) { _ in
+        self.dismiss()
+      }
     }
   }
 }

diff --git a/Examples/Integration/IntegrationUITests/PresentationTests.swift b/Examples/Integration/IntegrationUITests/PresentationTests.swift
@@ -251,4 +251,26 @@ final class PresentationTests: XCTestCase {
     self.app.buttons["Parent dismiss"].tap()
     XCTAssertEqual(self.app.staticTexts["Action sent while state nil."].exists, false)
   }
+
+
+  func testNavigationDestination_ChildDismiss() {
+    self.app.buttons["Open navigation destination"].tap()
+    XCTAssertEqual(true, self.app.staticTexts["Count: 0"].exists)
+
+    self.app.buttons["Increment"].tap()
+    XCTAssertEqual(true, self.app.staticTexts["Count: 1"].exists)
+    self.app.buttons["Increment"].tap()
+    XCTAssertEqual(true, self.app.staticTexts["Count: 2"].exists)
+
+    self.app.buttons["Child dismiss"].tap()
+    XCTAssertEqual(false, self.app.staticTexts["Count: 2"].exists)
+  }
+
+  func testNavigationDestination_ParentDismiss() {
+    self.app.buttons["Open navigation destination"].tap()
+    XCTAssertEqual(true, self.app.staticTexts["Count: 0"].exists)
+
+    self.app.buttons["Parent dismiss"].tap()
+    XCTAssertEqual(false, self.app.staticTexts["Count: 0"].exists)
+  }
 }
diff --git a/Sources/ComposableArchitecture/SwiftUI/NavigationDestination.swift b/Sources/ComposableArchitecture/SwiftUI/NavigationDestination.swift
@@ -67,7 +67,10 @@ import SwiftUI
     }
 
     func body(content: Content) -> some View {
-      content.navigationDestination(isPresented: self.viewStore.binding(send: .dismiss)) {
+      content.navigationDestination(
+        // TODO: do binding with ID check
+        isPresented: self.viewStore.binding(send: .dismiss)
+      ) {
         IfLetStore(
           self.store.scope(
             state: returningLastNonNilValue { $0.wrappedValue.flatMap(self.toDestinationState) },

diff --git a/Tests/ComposableArchitectureTests/PresentationReducerTests.swift b/Tests/ComposableArchitectureTests/PresentationReducerTests.swift
@@ -1049,21 +1049,23 @@ import XCTest
         }
       }
 
-      let store = TestStore(
-        initialState: Parent.State(),
-        reducer: Parent()
-      )
-      let childPresentationTask = await store.send(.presentChild) {
-        $0.child = Child.State()
-      }
-      let grandchildPresentationTask = await store.send(.child(.presented(.presentGrandchild))) {
-        $0.child?.grandchild = Grandchild.State()
+      await _withMainSerialExecutor {
+        let store = TestStore(
+          initialState: Parent.State(),
+          reducer: Parent()
+        )
+        let childPresentationTask = await store.send(.presentChild) {
+          $0.child = Child.State()
+        }
+        let grandchildPresentationTask = await store.send(.child(.presented(.presentGrandchild))) {
+          $0.child?.grandchild = Grandchild.State()
+        }
+        await store.send(.child(.presented(.startButtonTapped)))
+        await store.send(.child(.presented(.grandchild(.presented(.startButtonTapped)))))
+        await store.send(.stopButtonTapped)
+        await grandchildPresentationTask.cancel()
+        await childPresentationTask.cancel()
       }
-      await store.send(.child(.presented(.startButtonTapped)))
-      await store.send(.child(.presented(.grandchild(.presented(.startButtonTapped)))))
-      await store.send(.stopButtonTapped)
-      await grandchildPresentationTask.cancel()
-      await childPresentationTask.cancel()
     }
 
     func testNavigation_cancelID_parentCancelTwoChildren() async {