Update life-cycle on fluidPush (#88)

* Add Tests

* First adding child, then load view

Author: muukii

Sources/FluidInterfaceKit/Helper/FluidExtentionViewController.swift

@@ -19,6 +19,7 @@ extension FluidExtentionViewController {
     _ viewController: UIViewController,
     target strategy: UIViewController.FluidStackFindStrategy,
     transition: AnyAddingTransition? = nil,
+    afterViewDidLoad: @escaping () -> Void = {},
     completion: ((AddingTransitionContext.CompletionEvent) -> Void)? = nil
   ) {
 
@@ -40,6 +41,7 @@ extension FluidExtentionViewController {
       .addContentViewController(
         controller,
         transition: transition,
+        afterViewDidLoad: afterViewDidLoad,
         completion: completion
       )
 
@@ -59,16 +61,14 @@ extension FluidExtentionViewController {
     transition: AnyAddingTransition? = nil,
     completion: ((AddingTransitionContext.CompletionEvent) -> Void)? = nil
   ) {
-    
-    /// to trigger `viewDidLoad` before calling `willTransition`.
-    viewController.loadViewIfNeeded()
-    
-    viewController.willTransition(with: relation)
-    
+     
     fluidPushUnsafely(
       viewController,
       target: strategy,
-      transition: transition
+      transition: transition,
+      afterViewDidLoad: { [weak viewController] in
+        viewController?.willTransition(with: relation)
+      }
     )
 
   }
@@ -83,7 +83,8 @@ extension FluidExtentionViewController {
     fluidPushUnsafely(
       viewController,
       target: strategy,
-      transition: transition
+      transition: transition,
+      afterViewDidLoad: {}
     )
 
   }

Sources/FluidInterfaceKit/ViewController/FluidStackController.swift

@@ -215,6 +215,7 @@ open class FluidStackController: UIViewController {
   public func addContentViewController(
     _ viewControllerToAdd: UIViewController,
     transition: AnyAddingTransition?,
+    afterViewDidLoad: @escaping () -> Void = {},
     completion: ((AddingTransitionContext.CompletionEvent) -> Void)? = nil
   ) {
 
@@ -225,16 +226,20 @@ open class FluidStackController: UIViewController {
 
     assert(Thread.isMainThread)
 
-    /// Save current first-responder from the current displaying view controller.
-    /// To restore it when back to this view controller as the top - ``FluidStackController/StackingPlatterView/restoreResponderState()``
-    topItem?.saveResponderState()
-    
-    // Trigger `viewDidLoad` explicitly.
-    viewControllerToAdd.loadViewIfNeeded()
-    
-    // propagate after `viewDidLoad`
-    viewControllerToAdd.propagateStackAction(.willPush)
-          
+    // Construct view controller chain
+    if viewControllerToAdd.parent != self {
+      
+      addChild(viewControllerToAdd)
+      
+      viewControllerToAdd.view.resetToVisible()
+      
+      viewControllerToAdd.didMove(toParent: self)
+      
+    } else {
+      // case of adding while removing
+      // TODO: might something needed
+    }
+        
     // set a context if not set
     if viewControllerToAdd.fluidStackContext == nil {
       let context = FluidStackContext(
@@ -245,6 +250,18 @@ open class FluidStackController: UIViewController {
       viewControllerToAdd.fluidStackContext = context
     }
 
+    /// Save current first-responder from the current displaying view controller.
+    /// To restore it when back to this view controller as the top - ``FluidStackController/StackingPlatterView/restoreResponderState()``
+    topItem?.saveResponderState()
+    
+    // Trigger `viewDidLoad` explicitly.
+    viewControllerToAdd.loadViewIfNeeded()
+    
+    afterViewDidLoad()
+    
+    // propagate after `viewDidLoad`
+    viewControllerToAdd.propagateStackAction(.willPush)
+    
     let wrapperView: StackingPlatterView = {
       if let currentWrapperView = viewControllerToAdd.view.superview as? StackingPlatterView {
         // reuse
@@ -258,19 +275,6 @@ open class FluidStackController: UIViewController {
         return containerView
       }
     }()
-
-    if viewControllerToAdd.parent != self {
-      
-      addChild(viewControllerToAdd)
-      
-      viewControllerToAdd.view.resetToVisible()
-      
-      viewControllerToAdd.didMove(toParent: self)
-      
-    } else {
-      // case of adding while removing
-      // TODO: might something needed
-    }
 
     view.addSubview(wrapperView)
 

Sources/FluidInterfaceKit/ViewController/FluidViewController.swift

@@ -108,9 +108,14 @@ open class FluidViewController: FluidGestureHandlingViewController, UINavigation
     fluidPop(transition: nil)
   }
 
+  /**
+   Triggers by `fluidPush`, not trigger in case of adding directly into FluidStackController.
+   Receives `StackingRelation` that specified in fluidPush parameter.
+   Opportunities to set up according to the relation.
+   */
   open func willTransition(with relation: StackingRelation?) {
 
-    assert(isViewLoaded, "library is broke.")
+    assert(isViewLoaded, "library is broke. To be done operations in here, should be run after view-did-load")
 
     switch configuration.topBar {
     case .navigation(let navigation):
@@ -120,8 +125,7 @@ open class FluidViewController: FluidGestureHandlingViewController, UINavigation
     case .hidden:
       break
     }
-    
-    
+        
     // setting transitions and interactions accroding to the relation
     // TODO: Make here letting the consumer passing as a parameter.
     if let relation = relation {

Sources/FluidInterfaceKitTests/FluidViewControllerTests.swift

@@ -154,6 +154,40 @@ final class FluidViewControllerTests: XCTestCase {
     }
 
   }
+  
+  func testFluidPush() {
+    
+    let exp = expectation(description: "viewDidLoad")
+    exp.assertForOverFulfill = true
+    exp.expectedFulfillmentCount = 1
+    
+    let stack = FluidStackController()
+    let controller = FluidViewController()
+    
+    controller.lifecycleEventHandler = { controller, event in
+      switch event {
+      case .viewDidLoad:
+        
+        XCTAssertNotNil(controller.parent)
+        XCTAssertEqual(controller.parent, stack)
+        
+        exp.fulfill()
+      case .viewWillAppear:
+        break
+      case .viewDidAppear:
+        break
+      case .viewWillDisappear:
+        break
+      case .viewDidDisappear:
+        break
+      }
+    }
+    
+    stack.fluidPush(controller, target: .current, relation: nil)
+    
+    wait(for: [exp], timeout: 1)
+    
+  }
 
   private func prepare(_ viewController: UIViewController) {
     viewController.loadViewIfNeeded()