Merge pull request #60 from quickbirdstudios/fix/splitCoordinator-set…

…ViewControllers-transaction

Ensure presented(from:) is called at the correct time in TabBarTransition and SplitCoordinator

XCoordinator.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name         = 'XCoordinator'
-    spec.version      = '1.2.2'
+    spec.version      = '1.2.3'
     spec.license      = { :type => 'MIT' }
     spec.homepage     = 'https://github.com/quickbirdstudios/XCoordinator'
     spec.authors      = { 'Stefan Kofler' => 'stefan.kofler@quickbirdstudios.com', 'Paul Kraft' => 'pauljohannes.kraft@quickbirdstudios.com' }

XCoordinator/Classes/SplitCoordinator.swift

@@ -6,16 +6,11 @@
 //  Copyright © 2018 QuickBird Studios. All rights reserved.
 //
 
-public typealias SplitTransition = Transition<UISplitViewController>
-
 open class SplitCoordinator<RouteType: Route>: BaseCoordinator<RouteType, SplitTransition> {
 
     // MARK: - Init
 
     public init(master: Presentable, detail: Presentable?) {
-        super.init(initialRoute: nil)
-        rootViewController.viewControllers = [master.viewController, detail?.viewController].compactMap { $0 }
-        master.presented(from: self)
-        detail?.presented(from: self)
+        super.init(initialTransition: .set([master, detail].compactMap { $0 }))
     }
 }

XCoordinator/Classes/SplitTransition.swift

@@ -0,0 +1,22 @@
+//
+//  SplitTransition.swift
+//  Action
+//
+//  Created by Paul Kraft on 10.01.19.
+//
+
+public typealias SplitTransition = Transition<UISplitViewController>
+
+extension Transition where RootViewController: UISplitViewController {
+    static func set(_ presentables: [Presentable]) -> Transition {
+        return Transition(presentables: presentables, animation: nil) { _, performer, completion in
+            CATransaction.begin()
+            CATransaction.setCompletionBlock {
+                presentables.forEach { $0.presented(from: performer) }
+                completion?()
+            }
+            performer.rootViewController.viewControllers = presentables.map { $0.viewController }
+            CATransaction.commit()
+        }
+    }
+}

XCoordinator/Classes/TabBarTransition.swift

@@ -16,7 +16,10 @@ extension Transition where RootViewController: UITabBarController {
             performer.set(presentables.map { $0.viewController },
                           with: options,
                           animation: animation,
-                          completion: completion)
+                          completion: {
+                            presentables.forEach { $0.presented(from: performer) }
+                            completion?()
+            })
         }
     }