Fix hwrap/vwrap on macos

Author: psharanda

Sources/CALayer+LX.swift

@@ -14,21 +14,18 @@ private var key: UInt8 = 0
 private var viewPortInsetsKey: UInt8 = 0
 
 extension CALayer: Layoutable {
-    public var lx_bounds: CGRect {
-        return bounds
-    }
 
     public var lx_frame: CGRect {
         get {
             #if os(macOS)
-                return frame.flipped(in: superlayer?.bounds ?? bounds)
+                return frame.flipped(in: superlayer?.bounds)
             #else
                 return frame
             #endif
         }
         set {
             #if os(macOS)
-                frame = newValue.flipped(in: superlayer?.bounds ?? bounds)
+                frame = newValue.flipped(in: superlayer?.bounds)
             #else
                 frame = newValue
             #endif

Sources/LX.swift

@@ -13,13 +13,17 @@ import UIKit
 
 public protocol Layoutable: class {
     var lx_parent: Layoutable? {get}
-    var lx_bounds: CGRect {get}
     var lx_frame: CGRect {get set}
     var lx_viewport: CGRect? {get set}
     func lx_sizeThatFits(_ size: CGSize) -> CGSize
 }
 
 extension Layoutable {
+    
+    public var lx_bounds: CGRect {
+        return CGRect(x: 0, y: 0, width: lx_frame.width, height: lx_frame.height)
+    }
+    
     func updateFrame(_ newValue: CGRect) {
         lx_frame = CGRect(x: newValue.origin.x.pixelPerfect, y: newValue.origin.y.pixelPerfect, width: newValue.size.width.ceilPixelPerfect, height: newValue.size.height.ceilPixelPerfect)
     }

Sources/Node.swift

@@ -41,9 +41,6 @@ public protocol NodeContainer: Layoutable {
 open class Node<T: NodeContainer>: NodeProtocol {
 
     //MARK: - confirm layoutable
-    public var lx_bounds: CGRect {
-        return bounds
-    }
 
     public var lx_frame: CGRect {
         get {

Sources/PutWrap.swift

@@ -248,15 +248,25 @@ private func putOperation<T: BoxDimension>(_ superview: Layoutable, intentions:
 
     var totalSizeForFlexs = T.getDimension(bounds).size
 
+    
+    var totalFix: CGFloat = 0.0
+    
     for i in intentions {
         switch (i) {
         case .flex(_, let weight):
             totalWeight += weight
         case .fix(let views, let value):
-            totalSizeForFlexs -= value.calculateValue(forViews: views, dimension: dimension)
+            let v = value.calculateValue(forViews: views, dimension: dimension)
+            totalFix += v
+            totalSizeForFlexs -= v
         }
     }
 
+    if wrapParent {
+        let dim = T.getDimension(superview.lx_frame)
+        superview.lx_frame = T.setDimension(Dimension(origin: dim.origin, size: totalFix - dim.origin), inRect: superview.lx_frame)
+    }
+    
     let unoSize = totalSizeForFlexs/totalWeight
 
     var start = T.getDimension(bounds).origin
@@ -267,7 +277,7 @@ private func putOperation<T: BoxDimension>(_ superview: Layoutable, intentions:
             let newSize = weight * unoSize
 
             if let views = views {
-                views.forEach {view in
+                views.forEach { view in
                     let fr = view.lx_frame
                     view.updateFrame(T.setDimension(Dimension(origin: start, size: newSize), inRect: fr))
                 }
@@ -289,10 +299,7 @@ private func putOperation<T: BoxDimension>(_ superview: Layoutable, intentions:
         }
     }
 
-    if wrapParent {
-        let dim = T.getDimension(superview.lx_frame)
-        superview.lx_frame = T.setDimension(Dimension(origin: dim.origin, size: start - T.getDimension(bounds).origin), inRect: superview.lx_frame)
-    }
+    
 }
 
 extension Layouting where Base: Layoutable {

Sources/RootNode.swift

@@ -13,9 +13,6 @@ import Foundation
 public final class RootNode: Layoutable {
 
     //MARK: - confirm layoutable
-    public var lx_bounds: CGRect {
-        return bounds
-    }
 
     public var lx_frame: CGRect {
         get {

Sources/UIKit/NSView+LX.swift

@@ -17,23 +17,19 @@ extension NSView: Layoutable {
         return superview
     }
 
-    public var lx_bounds: CGRect {
-        return bounds
-    }
-    
     public var lx_frame: CGRect {
         get {
             if superview?.isFlipped ?? false {
                 return frame
             } else {                
-                return frame.flipped(in: superview?.bounds ?? bounds)
+                return frame.flipped(in: superview?.bounds)
             }
         }
         set {
             if superview?.isFlipped ?? false {
                 frame = newValue
             } else {
-                frame = newValue.flipped(in: superview?.bounds ?? bounds)
+                frame = newValue.flipped(in: superview?.bounds)
             }
 
         }

Sources/UIKit/UIView+LX.swift

@@ -14,10 +14,6 @@ private var viewPortInsetsKey: UInt8 = 0
 
 extension UIView: Layoutable {
 
-    public var lx_bounds: CGRect {
-        return bounds
-    }
-    
     public var lx_frame: CGRect {
         get {
             return frame

Sources/Utils.swift

@@ -32,7 +32,7 @@ extension CGFloat {
 
 extension CGRect {
     //convert from cartesian <-> flipped coordinate space
-    func flipped(in rect: CGRect) -> CGRect {
-        return CGRect(x: minX, y: rect.height - maxY, width: width, height: height)
+    func flipped(in rect: CGRect?) -> CGRect {
+        return CGRect(x: minX, y: (rect?.height ?? 0) - maxY, width: width, height: height)
     }
 }