Made NavigationControllerAdapter transactional

Fixed the [Issue 33](#33)
ekazaev · Aug 23, 2019 · 7b79492 · 7b79492
1 parent 1d2312d
commit 7b79492
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 20 deletions.
diff --git a/Example/RouteComposer/Base.lproj/TabBar.storyboard b/Example/RouteComposer/Base.lproj/TabBar.storyboard
@@ -4,7 +4,6 @@
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -166,19 +165,19 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="11" translatesAutoresizingMaskIntoConstraints="NO" id="qmT-KF-0TS">
-                                <rect key="frame" x="60" y="235.5" width="255" height="216"/>
+                                <rect key="frame" x="59.5" y="235.5" width="256.5" height="216"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cVV-nf-uxP">
-                                        <rect key="frame" x="0.0" y="0.0" width="255" height="31"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="256.5" height="31"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Can be dissmissed:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ydE-El-pE1">
-                                                <rect key="frame" x="0.0" y="0.0" width="206" height="31"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="207.5" height="31"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CSL-4b-ZSF">
-                                                <rect key="frame" x="206" y="0.0" width="51" height="31"/>
+                                                <rect key="frame" x="207.5" y="0.0" width="51" height="31"/>
                                                 <accessibility key="accessibilityConfiguration" identifier="dissmissalSwitchControl"/>
                                                 <connections>
                                                     <action selector="switchValueChangedWithSender:" destination="1IK-g0-E80" eventType="valueChanged" id="i1r-rl-4F6"/>
@@ -187,35 +186,35 @@
                                         </subviews>
                                     </stackView>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="stj-9m-zaF">
-                                        <rect key="frame" x="0.0" y="42" width="255" height="30"/>
+                                        <rect key="frame" x="0.0" y="42" width="256.5" height="30"/>
                                         <state key="normal" title="Go to Yellow color"/>
                                         <connections>
                                             <action selector="goToColorTapped" destination="1IK-g0-E80" eventType="touchUpInside" id="a6j-wA-zBy"/>
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Y3o-AY-MGp">
-                                        <rect key="frame" x="0.0" y="83" width="255" height="30"/>
+                                        <rect key="frame" x="0.0" y="83" width="256.5" height="30"/>
                                         <state key="normal" title="Go to Square Tab"/>
                                         <connections>
                                             <action selector="goToSquareTapped" destination="1IK-g0-E80" eventType="touchUpInside" id="K13-FY-jCo"/>
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ecO-Gb-PsB">
-                                        <rect key="frame" x="0.0" y="124" width="255" height="30"/>
+                                        <rect key="frame" x="0.0" y="124" width="256.5" height="30"/>
                                         <state key="normal" title="Go to Moscow*"/>
                                         <connections>
                                             <action selector="goToMoscowTapped" destination="1IK-g0-E80" eventType="touchUpInside" id="rIm-aL-VNK"/>
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XF5-FD-Qpt">
-                                        <rect key="frame" x="0.0" y="165" width="255" height="30"/>
+                                        <rect key="frame" x="0.0" y="165" width="256.5" height="30"/>
                                         <state key="normal" title="Go to New York*"/>
                                         <connections>
                                             <action selector="goToNewYorkUnexpectedTapped" destination="1IK-g0-E80" eventType="touchUpInside" id="JCY-HH-EeG"/>
                                         </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Navigation to New York will trigger unexpected animation as well" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mE6-aL-VMn">
-                                        <rect key="frame" x="0.0" y="206" width="255" height="10"/>
+                                        <rect key="frame" x="0.0" y="206" width="256.5" height="10"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="8"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -354,36 +353,43 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="11" translatesAutoresizingMaskIntoConstraints="NO" id="Gr7-65-ful">
-                                <rect key="frame" x="129.5" y="84.5" width="116" height="175"/>
+                                <rect key="frame" x="83" y="64" width="209" height="216"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ProductID:" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V9o-X3-gYi">
-                                        <rect key="frame" x="0.0" y="0.0" width="116" height="20.5"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="209" height="20.5"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gJM-YS-55p">
-                                        <rect key="frame" x="0.0" y="31.5" width="116" height="20.5"/>
+                                        <rect key="frame" x="0.0" y="31.5" width="209" height="20.5"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fPr-xC-PO0">
-                                        <rect key="frame" x="0.0" y="63" width="116" height="30"/>
+                                        <rect key="frame" x="0.0" y="63" width="209" height="30"/>
                                         <state key="normal" title="Go to Circle Tab"/>
                                         <connections>
                                             <action selector="goToCircleTapped" destination="xt5-6D-ZK0" eventType="touchUpInside" id="ZST-yb-sHk"/>
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Vd-qV-bLI">
-                                        <rect key="frame" x="0.0" y="104" width="116" height="30"/>
+                                        <rect key="frame" x="0.0" y="104" width="209" height="30"/>
                                         <state key="normal" title="Go to Product 01"/>
                                         <connections>
                                             <action selector="goToProductTapped" destination="xt5-6D-ZK0" eventType="touchUpInside" id="A9b-fT-Elz"/>
                                         </connections>
                                     </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="m22-30-L1f">
+                                        <rect key="frame" x="0.0" y="145" width="209" height="30"/>
+                                        <state key="normal" title="Go to next Product from Circle"/>
+                                        <connections>
+                                            <action selector="goToProductFromCircleTapped" destination="xt5-6D-ZK0" eventType="touchUpInside" id="vbs-Iu-6l4"/>
+                                        </connections>
+                                    </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dya-OG-PLs">
-                                        <rect key="frame" x="0.0" y="145" width="116" height="30"/>
+                                        <rect key="frame" x="0.0" y="186" width="209" height="30"/>
                                         <state key="normal" title="Go to Split*"/>
                                         <connections>
                                             <action selector="goToSplitTapped" destination="xt5-6D-ZK0" eventType="touchUpInside" id="R2S-1W-MAu"/>

diff --git a/Example/RouteComposer/View Controllers/Product/ProductConfiguration.swift b/Example/RouteComposer/View Controllers/Product/ProductConfiguration.swift
@@ -44,4 +44,13 @@ class ProductConfiguration {
                     }))
             .assemble()
 
+    // This path is used to test the transactions in presentations. Does not have any other purposes
+    static let productScreenFromCircle = StepAssembly(
+            finder: ClassWithContextFinder<ProductViewController, ProductContext>(),
+            factory: StoryboardFactory(name: "TabBar", identifier: "ProductViewController"))
+            .adding(ContextSettingTask())
+            .using(UINavigationController.push())
+            .from(ConfigurationHolder.configuration.circleScreen.expectingContainer())
+            .assemble()
+
 }
diff --git a/Example/RouteComposer/View Controllers/Product/ProductViewController.swift b/Example/RouteComposer/View Controllers/Product/ProductViewController.swift
@@ -82,6 +82,15 @@ class ProductViewController: UIViewController, ExampleAnalyticsSupport, ContextA
         try? router.navigate(to: ProductConfiguration.productScreen, with: ProductContext(productId: "01"))
     }
 
+    @IBAction func goToProductFromCircleTapped() {
+        guard let productId = productId,
+              var productIdAsInt = Int(productId) else {
+            return
+        }
+        productIdAsInt = productIdAsInt < 9 ? productIdAsInt + 1 : 0
+        try? router.navigate(to: ProductConfiguration.productScreenFromCircle, with: ProductContext(productId: "0\(productIdAsInt)"))
+    }
+
 }
 
 extension ProductViewController: ContextChecking {

diff --git a/Example/RouteComposer_ExampleUITests/ShortUITests.swift b/Example/RouteComposer_ExampleUITests/ShortUITests.swift
@@ -265,4 +265,29 @@ class ShortUITests: XCTestCase {
         XCTAssertTrue(app.otherElements["cityDetailsViewController+3"].exists)
     }
 
+    func testGoTProductFromCircle() {
+        app.launch()
+        XCTAssertTrue(app.otherElements["promptViewController"].exists)
+        app.buttons["Continue"].tap()
+        XCTAssertTrue(app.otherElements["homeViewController"].exists)
+
+        app.buttons["Go to Product 00"].tap()
+        XCTAssertTrue(app.otherElements["productViewController+00"].exists)
+
+        app.buttons["Go to next Product from Circle"].tap()
+        XCTAssertTrue(app.otherElements["productViewController+01"].exists)
+
+        app.buttons["Go to next Product from Circle"].tap()
+        XCTAssertTrue(app.otherElements["productViewController+02"].exists)
+
+        app.buttons["Go to Product 01"].tap()
+        XCTAssertTrue(app.otherElements["productViewController+01"].exists)
+
+        app.buttons["Go to next Product from Circle"].tap()
+        XCTAssertTrue(app.otherElements["productViewController+02"].exists)
+
+        app.buttons["Go to Circle Tab"].tap()
+        XCTAssertTrue(app.otherElements["circleViewController"].exists)
+    }
+
 }
diff --git a/README.md b/README.md
@@ -46,12 +46,12 @@ Can be used as the universal replacement for the [Coordinator](https://www.raywe
 
 There are 2 ways of implementing the navigation available in the iOS application:
 - Built-in mechanism provided by Apple using storyboards and segues
-- Pragmatical navigation directly in the code
+- Programmatic navigation directly in the code
 
 The downsides of these two solutions:
 - Built-in mechanism: navigation in the storyboards is relatively static and often requires the extra navigation code in the 
 `UIViewController`s and can lead to a lot of boilerplate code
-- Pragmatical navigation: forces `UIViewController`s coupling or can be complex depending on the chosen design 
+- Programmatic navigation: forces `UIViewController`s coupling or can be complex depending on the chosen design 
 pattern (Router, Coordinator) 
 
 ## RouteComposer helps

diff --git a/RouteComposer/Classes/Adapters/NavigationControllerAdapter.swift b/RouteComposer/Classes/Adapters/NavigationControllerAdapter.swift
@@ -41,16 +41,24 @@ public struct NavigationControllerAdapter<VC: UINavigationController>: ConcreteC
             completion(.failure(RoutingError.compositionFailed(.init("\(String(describing: navigationController)) does not contain \(String(describing: viewController))"))))
             return
         }
+        CATransaction.begin()
         navigationController.popToViewController(viewController, animated: animated)
-        completion(.success)
+        CATransaction.setCompletionBlock({
+                completion(.success)
+        })
+        CATransaction.commit()
     }
 
     public func setContainedViewControllers(_ containedViewControllers: [UIViewController], animated: Bool, completion: @escaping (_: RoutingResult) -> Void) {
         guard let navigationController = navigationController else {
             return completion(.failure(RoutingError.compositionFailed(.init("\(String(describing: VC.self)) has been deallocated"))))
         }
+        CATransaction.begin()
         navigationController.setViewControllers(containedViewControllers, animated: animated)
-        completion(.success)
+        CATransaction.setCompletionBlock({
+            completion(.success)
+        })
+        CATransaction.commit()
     }
 
 }