Merge pull request #14 from clutter/single-selection-preselection

Fix bugs in SingleSelection preselection

Author: Erik Strottmann

Example/Podfile.lock

@@ -1,7 +1,7 @@
 PODS:
   - SwiftLint (0.34.0)
-  - TiltUp (0.4.3)
-  - TiltUpTest (0.4.3)
+  - TiltUp (0.5.0)
+  - TiltUpTest (0.5.0)
 
 DEPENDENCIES:
   - SwiftLint
@@ -20,8 +20,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   SwiftLint: 79d48a17c6565dc286c37efb8322c7b450f95c67
-  TiltUp: 2b6d8db8ee1152dd4a95b38fc6b391cd791dc936
-  TiltUpTest: 7cbd1a189fa2055d561105a92c23af6867b2a1ed
+  TiltUp: 3d2960016f9e2ff4cee3201b9418d1a76470a5cd
+  TiltUpTest: 151fd6ff45b85f41ba5d3b5845c29464422e8914
 
 PODFILE CHECKSUM: c3ad4c36e5d17d3b4a90d5cf5f5b66d3221db5dd
 

Example/Tests/Screens/SingleSelection/SingleSelectionViewModelTests.swift

@@ -24,7 +24,7 @@ final class SingleSelectionViewModelTests: XCTestCase {
 
     func testCheckmarks() {
         let viewModel = SingleSelectionViewModel<TestRow>(rows: [.row1, .row2], navTitle: "Test")
-        viewModel.selectedRow(at: IndexPath(row: 0, section: 0))
+        viewModel.preselectRow(at: IndexPath(row: 0, section: 0))
     }
 
     func testCancel() {
@@ -43,7 +43,7 @@ final class SingleSelectionViewModelTests: XCTestCase {
         var confirmedRow: TestRow?
         viewModel.coordinatorObservers.tappedConfirm = { confirmedRow = $0 }
 
-        viewModel.selectedRow(at: IndexPath(row: 0, section: 0))
+        viewModel.preselectRow(at: IndexPath(row: 0, section: 0))
         viewModel.tappedConfirmButton()
         XCTAssertEqual(confirmedRow, .row1)
     }

TiltUp.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'TiltUp'
-  s.version          = '0.4.3'
+  s.version          = '0.5.0'
   s.summary          = 'Official Clutter SDK in Swift to access core iOS features.'
 
 # This description is used to generate tags and improve search results.

TiltUp/Classes/Screens/SingleSelection/SingleSelectionController.swift

@@ -26,6 +26,8 @@ public final class SingleSelectionController<Value: SingleSelectionableRow>: UIT
     public override func viewDidLoad() {
         super.viewDidLoad()
 
+        clearsSelectionOnViewWillAppear = false
+
         if navigationController?.viewControllers.first == self {
             navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Cancel", style: .plain, target: self, action: #selector(tappedCancelButton))
         }

TiltUp/Classes/Screens/SingleSelection/SingleSelectionViewModel.swift

@@ -143,7 +143,7 @@ public final class SingleSelectionViewModel<Value: SingleSelectionableRow> {
 
     // MARK: - Actions
 
-    public func selectedRow(at indexPath: IndexPath) {
+    private func updateSelection(to indexPath: IndexPath) {
         for (sectionIndex, section) in sections.enumerated() {
             for (rowIndex, row) in section.rows.enumerated() where row.isSelected {
                 sections[sectionIndex].rows[rowIndex].isSelected = false
@@ -155,6 +155,14 @@ public final class SingleSelectionViewModel<Value: SingleSelectionableRow> {
 
         viewObservers.confirmButtonEnabled?(selectedIndexPath != nil)
         viewObservers.confirmButtonTitle?(confirmButtonTitle)
+    }
+
+    public func preselectRow(at indexPath: IndexPath) {
+        updateSelection(to: indexPath)
+    }
+
+    func selectedRow(at indexPath: IndexPath) {
+        updateSelection(to: indexPath)
 
         let value = sections[indexPath.section].rows[indexPath.row].value
         if value.singleSelectionableRow.hasNextStep {

TiltUpTest.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'TiltUpTest'
-  s.version          = '0.4.3'
+  s.version          = '0.5.0'
   s.summary          = 'Official Clutter SDK in Swift to access core iOS test helpers.'
 
 # This description is used to generate tags and improve search results.