Merge pull request #26 from iWECon/dev

dev

Author: iwecon

Sources/StackKit/HStackView.swift

@@ -148,7 +148,7 @@ open class HStackView: UIView, StackView {
     }
 
     open override func sizeToFit() {
-        frame.size = sizeThatFits(.zero)
+        _fitSize(with: self._stackKit_fitType)
     }
 
     open override var intrinsicContentSize: CGSize {

Sources/StackKit/UIView+StackKit/UIView+FitSize.swift

@@ -8,7 +8,9 @@ public enum FitType {
     case width
     case height
 
+    /// Set fixed height, width auto calculate
     case widthFlexible
+    /// Set fixed width, height auto calculate
     case heightFlexible
 
     var isFlexible: Bool {
@@ -88,22 +90,34 @@ extension UIView: FitSize {
         let sizeThatFits = sizeThatFits(CGSize(width: fitWidth, height: fitHeight))
 
         switch fitType {
-        case .width, .height, .widthFlexible, .heightFlexible:
+        case .width, .height:
             if fitWidth != .greatestFiniteMagnitude {
-                size.width = fitType.isFlexible ? sizeThatFits.width : fitWidth
+                size.width = fitWidth
             } else {
                 size.width = sizeThatFits.width
             }
 
             if fitHeight != .greatestFiniteMagnitude {
-                size.height = fitType.isFlexible ? sizeThatFits.height : fitHeight
+                size.height = fitHeight
             } else {
                 size.height = sizeThatFits.height
             }
+            
+        case .widthFlexible:
+            size.height = fitHeight
+            size.width = sizeThatFits.width
+            
+        case .heightFlexible:
+            size.height = fitType.isFlexible ? sizeThatFits.height : fitHeight
+            size.width = fitWidth
+            
         case .content:
             size = Size(width: sizeThatFits.width, height: sizeThatFits.height)
         }
 
+        // fix when set single width or height not working
+        _fixedSize(&size)
+        
         size.width = applyMinMax(toWidth: size.width)
         size.height = applyMinMax(toHeight: size.height)
 

Sources/StackKit/VStackView.swift

@@ -148,7 +148,7 @@ open class VStackView: UIView, StackView {
     }
 
     open override func sizeToFit() {
-        frame.size = sizeThatFits(.zero)
+        _fitSize(with: self._stackKit_fitType)
     }
 
     open override var intrinsicContentSize: CGSize {

Tests/StackKitTests/StackKitTests.swift

@@ -6,5 +6,42 @@ final class StackKitTests: XCTestCase {
         // This is an example of a functional test case.
         // Use XCTAssert and related functions to verify your tests produce the correct
         // results.
+        
+        let label = UILabel()
+        let container = VStackView(alignment: .center, distribution: .spacing(2), padding: UIEdgeInsets(top: 10, left: 0, bottom: 10, right: 0)) {
+            label.stack.then {
+                $0.text = "你好啊"
+            }
+        }
+        let v = VStackView(alignment: .center, distribution: .fillWidth(spacing: 0), padding: .zero) {
+            container.stack.height(50)
+        }
+        
+        v.layoutSubviews()
+        print(label.frame.size)
+        print(container.frame.size)
+        XCTAssertEqual(label.frame.minY, (container.frame.height - label.frame.height) / 2)
+    }
+    
+    func testCenter() throws {
+        
+        let label = UILabel()
+        let vcontainer  = VStackView(alignment: .center, distribution: .spacing(2)) {
+            label.stack.then {
+                $0.text = "你好啊"
+            }
+        }
+        let container = HStackView(alignment: .center, padding: UIEdgeInsets(top: 10, left: 0, bottom: 10, right: 0)) {
+            vcontainer
+        }
+        container.stack.height(50)
+        container.sizeToFit()
+        
+        XCTAssertEqual(vcontainer.center.x, container.center.x)
+        
+        container.stack.height(nil)
+        vcontainer.stack.height(50)
+        container.sizeToFit()
+        XCTAssertEqual(vcontainer.center.x, container.center.x)
     }
 }