Merge pull request #551 from adevinta/refacto/switch/space

[Fix] Switch: Remove the space when there is no text
adevinta · Oct 27, 2023 · da1fe9d · da1fe9d
2 parents 2b28332 + 1321c0e
commit da1fe9d
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 12 deletions.
diff --git a/core/Sources/Components/Switch/View/SwiftUI/SubviewType/SwitchSubviewType.swift b/core/Sources/Components/Switch/View/SwiftUI/SubviewType/SwitchSubviewType.swift
@@ -13,13 +13,23 @@ enum SwitchSubviewType {
     case text
     case toggle
 
-    // MARK: - Properties
+    // MARK: - Methods
 
-    static var leftAlignmentCases: [Self] {
-        return [.toggle, .space, .text]
-    }
+    static func allCases(isLeftAlignment: Bool, showSpace: Bool) -> [Self] {
+        var cases: [Self]
+
+        // Left or right alignement ?
+        if isLeftAlignment {
+            cases = [.toggle, .text]
+        } else {
+            cases = [.text, .toggle]
+        }
+
+        // Add spaces ?
+        if showSpace {
+            cases.insert(.space, at: 1)
+        }
 
-    static var rightAlignmentCases: [Self] {
-        return [.text, .space, .toggle]
+        return cases
     }
 }
diff --git a/core/Sources/Components/Switch/View/SwiftUI/SubviewType/SwitchSubviewTypeTests.swift b/core/Sources/Components/Switch/View/SwiftUI/SubviewType/SwitchSubviewTypeTests.swift
@@ -13,9 +13,26 @@ final class SwitchSubviewTypeTests: XCTestCase {
 
     // MARK: - Tests
 
-    func test_leftAlignmentCases() {
+    func test_allCases_when_isLeftAlignment_is_true_and_showSpace_is_false() {
         // GIVEN / WHEN
-        let allCases = SwitchSubviewType.leftAlignmentCases
+        let allCases = SwitchSubviewType.allCases(
+            isLeftAlignment: true,
+            showSpace: false
+        )
+
+        // THEN
+        XCTAssertEqual(
+            allCases,
+            [.toggle, .text]
+        )
+    }
+
+    func test_allCases_when_isLeftAlignment_is_true_and_showSpace_is_true() {
+        // GIVEN / WHEN
+        let allCases = SwitchSubviewType.allCases(
+            isLeftAlignment: true,
+            showSpace: true
+        )
 
         // THEN
         XCTAssertEqual(
@@ -24,9 +41,26 @@ final class SwitchSubviewTypeTests: XCTestCase {
         )
     }
 
-    func test_rightAlignmentCases() {
+    func test_allCases_when_isLeftAlignment_is_false_and_showSpace_is_false() {
         // GIVEN / WHEN
-        let allCases = SwitchSubviewType.rightAlignmentCases
+        let allCases = SwitchSubviewType.allCases(
+            isLeftAlignment: false,
+            showSpace: false
+        )
+
+        // THEN
+        XCTAssertEqual(
+            allCases,
+            [.text, .toggle]
+        )
+    }
+
+    func test_allCases_when_isLeftAlignment_is_false_and_showSpace_is_true() {
+        // GIVEN / WHEN
+        let allCases = SwitchSubviewType.allCases(
+            isLeftAlignment: false,
+            showSpace: true
+        )
 
         // THEN
         XCTAssertEqual(

diff --git a/core/Sources/Components/Switch/View/SwiftUI/SwitchView.swift b/core/Sources/Components/Switch/View/SwiftUI/SwitchView.swift
@@ -52,7 +52,7 @@ public struct SwitchView: View {
     }
 
     // MARK: - View
-    
+
     public var body: some View {
         HStack(alignment: .top) {
             ForEach(self.subviewsTypes(), id: \.self) {
@@ -68,7 +68,10 @@ public struct SwitchView: View {
     // MARK: - Subview Maker
 
     private func subviewsTypes() -> [SwitchSubviewType] {
-        return (self.viewModel.isToggleOnLeft == true) ? SwitchSubviewType.leftAlignmentCases : SwitchSubviewType.rightAlignmentCases
+        return SwitchSubviewType.allCases(
+            isLeftAlignment: self.viewModel.isToggleOnLeft == true,
+            showSpace: self.viewModel.horizontalSpacing ?? 0 > 0
+        )
     }
 
     @ViewBuilder