VStack line spacing

tevelee · Aug 14, 2024 · 9798fa5 · 9798fa5
1 parent e19b92c
commit 9798fa5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/Sources/Flow/Internal/Layout.swift b/Sources/Flow/Internal/Layout.swift
@@ -66,7 +66,7 @@ struct FlowLayout: Sendable {
         var size = lines
             .map(\.size)
             .reduce(.zero, breadth: max, depth: +)
-        size[.vertical] += lines.sum(of: \.leadingSpace)
+        size.depth += lines.sum(of: \.leadingSpace)
         return CGSize(size: size, axis: axis)
     }
 

diff --git a/Tests/FlowTests/FlowTests.swift b/Tests/FlowTests/FlowTests.swift
@@ -253,6 +253,28 @@ final class FlowTests: XCTestCase {
         """)
     }
 
+    func test_VFlow_size_singleElement() throws {
+        // Given
+        let sut: FlowLayout = .vertical(alignment: .center, itemSpacing: 10, lineSpacing: 20)
+
+        // When
+        let size = sut.sizeThatFits(proposal: 100×100, subviews: [50×50])
+
+        // Then
+        XCTAssertEqual(size, 50×50)
+    }
+
+    func test_VFlow_size_multipleElements() throws {
+        // Given
+        let sut: FlowLayout = .vertical(alignment: .center, itemSpacing: 10, lineSpacing: 20)
+
+        // When
+        let size = sut.sizeThatFits(proposal: 130×130, subviews: repeated(50×50, times: 3))
+
+        // Then
+        XCTAssertEqual(size, 120×110)
+    }
+
     func test_VFlow_layout_leading() {
         // Given
         let sut: FlowLayout = .vertical(alignment: .leading, itemSpacing: 1, lineSpacing: 1)