Update

Author: iwecon

Demo/Demo/WrapStackLayerDemoViewController.swift

@@ -40,7 +40,7 @@ class WrapStackLayerDemoViewController: UIViewController {
         // Do any additional setup after loading the view.
         let widths: [CGFloat] = [20, 30, 50, 120, 40, 230, 50, 60, 10]
         fixedWrapStackLayer.addContent {
-            for _ in (0 ... 2) {
+            for _ in (0 ... 20) {
                 makeUIView(size: CGSize(width: widths.randomElement() ?? 10, height: 30))
             }
         }
@@ -74,7 +74,7 @@ class WrapStackLayerDemoViewController: UIViewController {
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
 
-        fixedWrapStackLayer.pin.top(120).horizontally().sizeToFit(.content)
+        fixedWrapStackLayer.pin.top(120).maxWidth(220).sizeToFit(.width)
         adaptiveWrapStackLayer.pin.top(to: fixedWrapStackLayer.edge.bottom).marginTop(50).horizontally().sizeToFit(.width)
         autoWrapStackLayer.pin.top(to: adaptiveWrapStackLayer.edge.bottom).marginTop(50).horizontally().sizeToFit(.width)
     }

Sources/StackKit/WrapStackLayer.swift

@@ -222,12 +222,7 @@ open class WrapStackLayer: CALayer {
     }
 
     public func sizeThatFits(_ size: CGSize) -> CGSize {
-        if size.width != .greatestFiniteMagnitude {
-            self.frame.size.width = size.width
-        }
-        if size.height != .greatestFiniteMagnitude {
-            self.frame.size.height = size.height
-        }
+        self.frame.size = size
         self.layoutSublayers()
 
         let effectiveViewsSize = effectiveSublayers.map({ $0.frame }).reduce(CGRect.zero) { result, rect in
@@ -242,10 +237,6 @@ open class WrapStackLayer: CALayer {
         return _size
     }
 
-    public func sizeToFit() {
-        frame.size = sizeThatFits(.zero)
-    }
-    
     public func layoutSizeToFit(_ layout: WrapStackLayout) {
         let size: CGSize
         switch layout {

Sources/StackKit/WrapStackView.swift

@@ -215,18 +215,9 @@ open class WrapStackView: UIView {
     }
 
     open override func sizeThatFits(_ size: CGSize) -> CGSize {
-        if size.width != .greatestFiniteMagnitude {
-            self.frame.size.width = size.width
-        }
-        if size.height != .greatestFiniteMagnitude {
-            self.frame.size.height = size.height
-        }
         layoutSubviews()
 
-        let effectiveViewsSize = effectiveSubviews.map({ $0.frame }).reduce(CGRect.zero) { result, rect in
-            result.union(rect)
-        }.size
-        
+        let effectiveViewsSize = effectiveSubviews.map({ $0.frame }).reduce(CGRect.zero, { $0.union($1) }).size
         var _size = effectiveViewsSize
         if !effectiveSubviews.isEmpty {
             _size.height += contentInsets.bottom