Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft for generic support #263

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Draft for generic support #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions Sources/Swift/FlexLayout.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import FlexLayoutYogaKit
label.flex.margin(10)
```
*/
public final class Flex {
public final class Flex<Base: UIView> {

//
// MARK: Properties
Expand All @@ -35,20 +35,22 @@ public final class Flex {
/**
Flex items's UIView.
*/
public private(set) weak var view: UIView?
public private(set) weak var base: Base?
private let yoga: YGLayout

public var view: UIView? { base }

/**
Item natural size, considering only properties of the view itself. Independent of the item frame.
*/
public var intrinsicSize: CGSize {
return yoga.intrinsicSize
}

init(view: UIView) {
self.view = view
self.yoga = view.yoga
init(_ base: Base) {
self.base = base
self.yoga = base.yoga

// Enable flexbox and overwrite Yoga default values.
yoga.isEnabled = true
}
Expand All @@ -66,7 +68,7 @@ public final class Flex {
- Returns: The flex interface corresponding to the added view.
*/
@discardableResult
public func addItem() -> Flex {
public func addItem() -> Flex<UIView> {
let view = UIView()
return addItem(view)
}
Expand All @@ -80,8 +82,8 @@ public final class Flex {
- Returns: The flex interface corresponding to the added view.
*/
@discardableResult
public func addItem(_ view: UIView) -> Flex {
if let host = self.view {
public func addItem<Item: UIView>(_ view: Item) -> Flex<Item> {
if let host = base {
host.addSubview(view)
return view.flex
} else {
Expand Down Expand Up @@ -1278,7 +1280,7 @@ public final class Flex {
*/
@discardableResult
public func backgroundColor(_ color: UIColor) -> Flex {
if let host = self.view {
if let host = base {
host.backgroundColor = color
return self
} else {
Expand All @@ -1295,7 +1297,7 @@ public final class Flex {
*/
@discardableResult
public func cornerRadius(_ value: CGFloat) -> Flex {
if let host = self.view {
if let host = base {
host.layer.cornerRadius = value
return self
} else {
Expand All @@ -1313,7 +1315,7 @@ public final class Flex {
*/
@discardableResult
public func border(_ width: CGFloat, _ color: UIColor) -> Flex {
if let host = self.view {
if let host = base {
host.layer.borderWidth = width
host.layer.borderColor = color.cgColor
return self
Expand Down
13 changes: 9 additions & 4 deletions Sources/Swift/Impl/UIView+FlexLayout.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@ import UIKit

private var flexLayoutAssociatedObjectHandle = 72_399_923

extension UIView {
public var flex: Flex {
if let flex = objc_getAssociatedObject(self, &flexLayoutAssociatedObjectHandle) as? Flex {
public protocol FlexLayoutCompatible: UIView { }

extension FlexLayoutCompatible {

public var flex: Flex<Self> {
if let flex = objc_getAssociatedObject(self, &flexLayoutAssociatedObjectHandle) as? Flex<Self> {
return flex
} else {
let flex = Flex(view: self)
let flex = Flex(self)
objc_setAssociatedObject(self, &flexLayoutAssociatedObjectHandle, flex, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
return flex
}
Expand All @@ -31,3 +34,5 @@ extension UIView {
(objc_getAssociatedObject(self, &flexLayoutAssociatedObjectHandle) as? Flex) != nil
}
}

extension UIView: FlexLayoutCompatible { }
Loading