Fix wrap content calculation by filter hidden views

Sources/Extensions/CALayer+PinLayout.swift

@@ -22,6 +22,10 @@ import QuartzCore
 extension CALayer: Layoutable {
     public typealias PinView = CALayer
 
+    public var alpha: CGFloat {
+        CGFloat(opacity)
+    }
+
     public var superview: CALayer? {
         return superlayer
     }

Sources/Layoutable.swift

@@ -29,6 +29,9 @@ public protocol Layoutable: AnyObject, Equatable, CustomDebugStringConvertible {
     var superview: PinView? { get }
     var subviews: [PinView] { get }
 
+    var isHidden: Bool { get }
+    var alpha: CGFloat { get }
+
     func getRect(keepTransform: Bool) -> CGRect
     func setRect(_ rect: CGRect, keepTransform: Bool)
 

Sources/PinLayout+WrapContent.swift

@@ -26,21 +26,25 @@ import AppKit
 extension PinLayout {
     /**
      Adjust the view's width & height to wrap all its subviews. The method also adjust subviews position to create a tight wrap.
+
+     - Parameters:
+     - viewFilter: Specify whether to include all views or only visible ones.
      */
     @discardableResult
-    public func wrapContent() -> PinLayout {
-        return wrapContent(.all, padding: PEdgeInsets(top: 0, left: 0, bottom: 0, right: 0), { return "wrapContent()" })
+    public func wrapContent(viewFilter: ViewFilter = .none) -> PinLayout {
+        return wrapContent(.all, padding: PEdgeInsets(top: 0, left: 0, bottom: 0, right: 0), viewFilter: viewFilter, { return "wrapContent()" })
     }
 
     /**
      Adjust the view's width & height to wrap all its subviews. The method also adds a padding around all subviews.
 
      - Parameters:
      - padding: Specify a padding value.
+     - viewFilter: Specify whether to include all views or only visible ones.
      */
     @discardableResult
-    public func wrapContent(padding: CGFloat) -> PinLayout {
-        return wrapContent(.all, padding: PEdgeInsets(top: padding, left: padding, bottom: padding, right: padding), { return "wrapContent(padding: \(padding)" })
+    public func wrapContent(padding: CGFloat, viewFilter: ViewFilter = .none) -> PinLayout {
+        return wrapContent(.all, padding: PEdgeInsets(top: padding, left: padding, bottom: padding, right: padding), viewFilter: viewFilter, { return "wrapContent(padding: \(padding)" })
     }
 
     /**
@@ -51,10 +55,11 @@ extension PinLayout {
 
      - Parameters:
      - padding: Specify a padding using an UIEdgeInsets.
+     - viewFilter: Specify whether to include all views or only visible ones.
      */
     @discardableResult
-    public func wrapContent(padding: PEdgeInsets) -> PinLayout {
-        return wrapContent(.all, padding: padding, { return "wrapContent(padding: \(insetsDescription(padding))" })
+    public func wrapContent(padding: PEdgeInsets, viewFilter: ViewFilter = .none) -> PinLayout {
+        return wrapContent(.all, padding: padding, viewFilter: viewFilter, { return "wrapContent(padding: \(insetsDescription(padding))" })
     }
 
     /**
@@ -64,10 +69,11 @@ extension PinLayout {
 
      - Parameters:
      - type: Specify the wrap type (.all, .horizontally, .vertically)
+     - viewFilter: Specify whether to include all views or only visible ones.
      */
     @discardableResult
-    public func wrapContent(_ type: WrapType) -> PinLayout {
-        return wrapContent(type, padding: PEdgeInsets(top: 0, left: 0, bottom: 0, right: 0), { return "wrapContent(\(type.description)" })
+    public func wrapContent(_ type: WrapType, viewFilter: ViewFilter = .none) -> PinLayout {
+        return wrapContent(type, padding: PEdgeInsets(top: 0, left: 0, bottom: 0, right: 0), viewFilter: viewFilter, { return "wrapContent(\(type.description)" })
     }
 
     /**
@@ -79,10 +85,11 @@ extension PinLayout {
      - Parameters:
      - type: Specify the wrap type (.all, .horizontally, .vertically)
      - padding: Specify a padding value.
+     - viewFilter: Specify whether to include all views or only visible ones.
      */
     @discardableResult
-    public func wrapContent(_ type: WrapType, padding: CGFloat) -> PinLayout {
-        return wrapContent(type, padding: PEdgeInsets(top: padding, left: padding, bottom: padding, right: padding), { return "wrapContent(\(type.description), padding: \(padding)" })
+    public func wrapContent(_ type: WrapType, padding: CGFloat, viewFilter: ViewFilter = .none) -> PinLayout {
+        return wrapContent(type, padding: PEdgeInsets(top: padding, left: padding, bottom: padding, right: padding), viewFilter: viewFilter, { return "wrapContent(\(type.description), padding: \(padding)" })
     }
 
     /**
@@ -94,14 +101,22 @@ extension PinLayout {
      - Parameters:
      - type: Specify the wrap type (.all, .horizontally, .vertically)
      - padding: Specify a padding using an UIEdgeInsets.
+     - viewFilter: Specify whether to include all views or only visible ones.
      */
     @discardableResult
-    public func wrapContent(_ type: WrapType, padding: PEdgeInsets) -> PinLayout {
-        return wrapContent(type, padding: padding, { return "wrapContent(\(type.description), padding: \(insetsDescription(padding))" })
+    public func wrapContent(_ type: WrapType, padding: PEdgeInsets, viewFilter: ViewFilter = .none) -> PinLayout {
+        return wrapContent(type, padding: padding, viewFilter: viewFilter, { return "wrapContent(\(type.description), padding: \(insetsDescription(padding))" })
     }
 
-    private func wrapContent(_ type: WrapType, padding: PEdgeInsets, _ context: Context) -> PinLayout {
-        let subviews = view.subviews
+    private func wrapContent(_ type: WrapType, padding: PEdgeInsets, viewFilter: ViewFilter, _ context: Context) -> PinLayout {
+        let subviews: [PinView.PinView]
+        switch viewFilter {
+        case .visibleOnly:
+            subviews = view.subviews.filter { !$0.isHidden && $0.alpha > 0 }
+        case .none:
+            subviews = view.subviews
+        }
+
         guard !subviews.isEmpty else { return self }
 
         let firstViewRect = subviews[0].getRect(keepTransform: keepTransform)

Sources/Types.swift

@@ -194,6 +194,13 @@ public enum FitType {
     case vertically
 }
 
+@objc public enum ViewFilter: Int {
+    /// No filter, use all views
+    case none
+    /// Consider only visible views (isHidden is false and alpha is > 0)
+    case visibleOnly
+}
+
 @objc public enum LayoutDirection: Int {
     case auto
     case ltr