Merge pull request #158 from layoutBox/sizeToFit

Add method sizeToFit()

Author: lucdion

Example/PinLayoutSample/UI/Common/BasicView.swift

@@ -64,4 +64,8 @@ class BasicView: UIView {
 
         return newSize
     }
+
+    override func sizeToFit() {
+        pin.width(35).height(45)
+    }
 }

README.md

@@ -39,6 +39,7 @@ Extremely Fast views layouting without auto layout. No magic, pure code, full co
 
 ### Recent changes/features
 * :star: PinLayout can now layout CALayer. See [CALayer Support](#calayer_support) for more information.
+* :star: PinLayout is in the Top 10 of Swift Layout frameworks on [Awesome Swift](https://swift.libhunt.com/categories/714-layout) 
 * :star: PinLayout has moved to the **[layoutBox](https://github.com/layoutBox)** organization. See other **[layoutBox](https://github.com/layoutBox)** projects.
 * :star: Add `wrapContent()` methods that adjust view's width and height to wrap all its subviews. See [wrapContent](#wrapContent) for more information.
 * :star: PinLayout now support macOS. See [macOS Support](#macos_support) for more information.
@@ -58,6 +59,7 @@ Extremely Fast views layouting without auto layout. No magic, pure code, full co
   * [Anchors](#anchors)
   * [Relative positioning](#relative_positioning)
   * [Width, height and size](#width_height_size)
+  * [Adjusting size](#adjusting_size)
   * [minWidth, maxWidth, minHeight, maxHeight](#minmax_width_height_size)
   * [Aspect Ratio](#aspect_ratio)
   * [Margins](#margins)
@@ -705,18 +707,23 @@ Set the view’s size to match the referenced view’s size
 
 <br/>
 
-<a name="sizeToFit"></a>
-### sizeToFit
+<a name="adjusting_size"></a>
+### Adjusting size
 
-**Method:**
+PinLayout has methods to adjust the view’s size based on their content. 
 
-* **`sizeToFit(_ fitType: FitType)`**  
-The method adjust the view's size based on the view's `sizeThatFits()` method result.  
-     PinLayout will adjust either the view's width or height based on the `fitType` parameter value.
-     
-     Notes:
-     * If margin rules apply, margins will be applied when determining the reference dimension (width/height).
-     * The resulting size will always respect `minWidth` / `maxWidth` / `minHeight` / `maxHeight`.
+The resulting size will always respect [`minWidth`/`maxWidth`/`minHeight`/`maxHeight`](#minmax_width_height_size) values.
+ 
+
+**Methods:**
+
+* **`sizeToFit()`**  
+The method adjust the view's size based on the result of the method `UIView.sizeToFit()`. Particularly useful for controls/views that have an intrinsic size (label, button, ...).
+
+* **`sizeToFit(: FitType)`**  
+The method adjust the view's size based on the result of the method `sizeThatFits(:CGSize)`.  
+     PinLayout will adjust either the view's width or height based on the `fitType` parameter value.  
+     If margins are specified, they will be applied before calling the view's `sizeThatFits(:CGSize)` method.
 
 	**Parameter `fitType`:** Identify the reference dimension (width / height) that will be used to adjust the view's size.  
 
@@ -736,6 +743,9 @@ The method adjust the view's size based on the view's `sizeThatFits()` method re
 ###### Usage examples:
 
 ```swift
+     // Adjust the view's size based on the result of `UIView.sizeToFit()` and center it.
+     view.pin.center().sizeToFit()
+
      // Adjust the view's size based on a width of 100 pixels.
      // The resulting width will always match the pinned property `width(100)`.
      view.pin.width(100).sizeToFit(.width)

Sources/Impl/PinLayout+Layouting.swift

@@ -201,6 +201,8 @@ extension PinLayout {
             switch adjustSizeType {
             case .fitTypeWidth, .fitTypeHeight, .fitTypeWidthFlexible, .fitTypeHeightFlexible:
                 size = computeSizeToFit(adjustSizeType: adjustSizeType, size: size)
+            case .sizeToFit:
+                size = computeSizeToFit(size: size)
             case .fitSizeLegacy:
                 size = computeLegacyFitSize(size: size)
             case .aspectRatio(let ratio):
@@ -236,6 +238,17 @@ extension PinLayout {
         return size
     }
 
+    private func computeSizeToFit(size: Size) -> Size {
+        guard let sizeCalculableView = view as? SizeCalculable else {
+            assertionFailure("Should not occurs, protocol conformance is checked before assigning adjustSizeType")
+            return size
+        }
+        sizeCalculableView.sizeToFit()
+
+        let viewRect = view.getRect(keepTransform: keepTransform)
+        return Size(width: viewRect.width, height: viewRect.height)
+    }
+
     private func computeLegacyFitSize(size: Size) -> Size {
         guard let sizeCalculableView = view as? SizeCalculable else {
             assertionFailure("Should not occurs, protocol conformance is checked before assigning adjustSizeType")

Sources/PinLayout+Size.swift

@@ -29,6 +29,8 @@ enum AdjustSizeType {
     case fitTypeWidthFlexible
     case fitTypeHeightFlexible
 
+    case sizeToFit
+
     case fitSizeLegacy
     case aspectRatio(CGFloat)
 
@@ -44,7 +46,9 @@ enum AdjustSizeType {
 
     internal var requiresSizeCalculable: Bool {
         switch self {
-        case .fitTypeWidth, .fitTypeHeight, .fitTypeWidthFlexible, .fitTypeHeightFlexible, .fitSizeLegacy:
+        case .fitTypeWidth, .fitTypeHeight,
+             .fitTypeWidthFlexible, .fitTypeHeightFlexible,
+             .sizeToFit, .fitSizeLegacy:
             return true
         case .aspectRatio(_):
             return false
@@ -217,6 +221,11 @@ extension PinLayout {
         return setAdjustSizeType(fitType.toAdjustSizeType(), { return "sizeToFit(\(fitType.description))" })
     }
 
+    @discardableResult
+    public func sizeToFit() -> PinLayout {
+        return setAdjustSizeType(.sizeToFit, { return "sizeToFit()" })
+    }
+
     #if os(iOS) || os(tvOS)
     @available(*, deprecated, message: "fitSize() is deprecated, please use sizeToFit(fitType: FitType)")
     @discardableResult
@@ -246,7 +255,7 @@ extension PinLayout {
                 warnWontBeApplied("the aspectRatio (\(ratio)) must be greater than zero.", context)
                 return self
             } else if type.requiresSizeCalculable, !(view is SizeCalculable) {
-                warnWontBeApplied("the view must conform to protocol SizeCalculable for it's size to be computed.", context)
+                warnWontBeApplied("PinLayout cannot comptute this view's size. This type of views doesn't conform to the protocol SizeCalculable.", context)
                 return self
             }
         }
@@ -262,6 +271,8 @@ extension PinLayout {
         switch adjustSizeType {
         case .fitTypeWidth, .fitTypeHeight, .fitTypeWidthFlexible, .fitTypeHeightFlexible:
             conflict = "sizeToFit(\(adjustSizeType.toFitType()!.description))."
+        case .sizeToFit:
+            conflict = "sizeToFit()"
         case .fitSizeLegacy:
             conflict = "fitSize()"
         case .aspectRatio(let ratio):

Tests/BasicView.swift

@@ -55,6 +55,10 @@ class BasicView: PView {
     override func sizeThatFits(_ size: CGSize) -> CGSize {
         return _sizeThatFits(size)
     }
+
+    override func sizeToFit() {
+        pin.width(35).height(45)
+    }
     #endif
 
     fileprivate func _sizeThatFits(_ size: CGSize) -> CGSize {
@@ -81,7 +85,7 @@ extension BasicView: SizeCalculable {
     }
 
     func sizeToFit() {
-        // Do nothing
+        pin.width(35).height(45)
     }
 }
 #endif

Tests/Common/AdjustSizeSpec.swift

@@ -44,11 +44,8 @@ class AdjustSizeSpec: QuickSpec {
                  - bViewChild
         */
 
-        beforeSuite {
-            _pinlayoutSetUnitTest(scale: 2)
-        }
-
         beforeEach {
+            _pinlayoutSetUnitTest(scale: 2)
             Pin.lastWarningText = nil
 
             viewController = PViewController()
@@ -862,6 +859,18 @@ class AdjustSizeSpec: QuickSpec {
                 expect(aView.frame).to(beCloseTo(CGRect(x: 140.0, y: 100.0, width: 50.0, height: 32.0), within: 0.5))
             }
         }
+
+        //
+        // sizeToFit()
+        //
+        describe("the result of the sizeToFit()") {
+            it("should adjust the aView") {
+                _pinlayoutSetUnitTest(scale: 3)
+
+                aView.pin.sizeToFit().center()
+                expect(aView.frame).to(beCloseTo(CGRect(x: 182.6667, y: 177.6667, width: 35.0, height: 45.0), within: 0.1))
+            }
+        }
         #endif
     }
 }

Tests/Common/AspectRatioTests.swift

@@ -40,11 +40,8 @@ class AspectRatioTests: QuickSpec {
          - imageView
          */
 
-        beforeSuite {
-            _pinlayoutSetUnitTest(scale: 2)
-        }
-        
         beforeEach {
+            _pinlayoutSetUnitTest(scale: 2)
             Pin.lastWarningText = nil
 
             viewController = PViewController()

Tests/Common/JustifyAlignSpec.swift

@@ -32,12 +32,9 @@ class JustifyAlignSpec: QuickSpec {
            |
             - aView
         */
-        
-        beforeSuite {
-            _pinlayoutSetUnitTest(scale: 2)
-        }
 
         beforeEach {
+            _pinlayoutSetUnitTest(scale: 2)
             Pin.lastWarningText = nil
 
             viewController = PViewController()

Tests/Common/LayoutMethodSpec.swift

@@ -33,11 +33,8 @@ class LayoutMethodSpec: QuickSpec {
             - aView
         */
 
-        beforeSuite {
-            _pinlayoutSetUnitTest(scale: 2)
-        }
-
         beforeEach {
+            _pinlayoutSetUnitTest(scale: 2)
             Pin.lastWarningText = nil
             Pin.logMissingLayoutCalls = false
 

Tests/Common/MinMaxWidthHeightSpec.swift

@@ -33,11 +33,8 @@ class MinMaxWidthHeightSpec: QuickSpec {
             - aView
         */
 
-        beforeSuite {
-            _pinlayoutSetUnitTest(scale: 2)
-        }
-
         beforeEach {
+            _pinlayoutSetUnitTest(scale: 2)
             Pin.lastWarningText = nil
 
             viewController = PViewController()