diff --git a/Sources/Layout/LayoutItem.swift b/Sources/Layout/LayoutItem.swift index 0f516bf8..832a07e7 100644 --- a/Sources/Layout/LayoutItem.swift +++ b/Sources/Layout/LayoutItem.swift @@ -52,14 +52,6 @@ extension LayoutItem { return self } - private func addingSuperviewConstraints( - @ConstraintsBuilder constraints: @escaping SuperviewConstraints - ) -> LayoutItem { - ViewLayoutItem(layoutItemView: layoutItemView) { [superviewConstraints] layoutItem in - superviewConstraints(layoutItem) + constraints(layoutItem) - } - } - public func size( width: CGFloat, height: CGFloat, @@ -411,10 +403,28 @@ extension LayoutItem { } } + private func constraint( + to edge: DirectionalEdge, + of boundary: LayoutBoundary, + inset: CGFloat, + priority: UILayoutPriority + ) -> NSLayoutConstraint { + constraint(to: edge, of: boundary, insets: NSDirectionalEdgeInsets(inset), priority: priority) + } + private func constraint( to edge: CanonicalEdge, of boundary: LayoutBoundary, - insets: UIEdgeInsets, + inset: CGFloat, + priority: UILayoutPriority + ) -> NSLayoutConstraint { + constraint(to: edge, of: boundary, insets: UIEdgeInsets(inset), priority: priority) + } + + private func constraint( + to edge: DirectionalEdge, + of boundary: LayoutBoundary, + insets: NSDirectionalEdgeInsets, priority: UILayoutPriority ) -> NSLayoutConstraint { switch edge { @@ -428,23 +438,23 @@ extension LayoutItem { .bottom .constraint(equalTo: boundary.bottom, constant: insets.constant(for: .bottom)) .withPriority(priority) - case .left: + case .leading: return layoutItemView - .left - .constraint(equalTo: boundary.left, constant: insets.constant(for: .left)) + .leading + .constraint(equalTo: boundary.leading, constant: insets.constant(for: .leading)) .withPriority(priority) - case .right: + case .trailing: return layoutItemView - .right - .constraint(equalTo: boundary.right, constant: insets.constant(for: .right)) + .trailing + .constraint(equalTo: boundary.trailing, constant: insets.constant(for: .trailing)) .withPriority(priority) } } private func constraint( - to edge: DirectionalEdge, + to edge: CanonicalEdge, of boundary: LayoutBoundary, - insets: NSDirectionalEdgeInsets, + insets: UIEdgeInsets, priority: UILayoutPriority ) -> NSLayoutConstraint { switch edge { @@ -458,34 +468,24 @@ extension LayoutItem { .bottom .constraint(equalTo: boundary.bottom, constant: insets.constant(for: .bottom)) .withPriority(priority) - case .leading: + case .left: return layoutItemView - .leading - .constraint(equalTo: boundary.leading, constant: insets.constant(for: .leading)) + .left + .constraint(equalTo: boundary.left, constant: insets.constant(for: .left)) .withPriority(priority) - case .trailing: + case .right: return layoutItemView - .trailing - .constraint(equalTo: boundary.trailing, constant: insets.constant(for: .trailing)) + .right + .constraint(equalTo: boundary.right, constant: insets.constant(for: .right)) .withPriority(priority) } } - private func constraint( - to edge: CanonicalEdge, - of boundary: LayoutBoundary, - inset: CGFloat, - priority: UILayoutPriority - ) -> NSLayoutConstraint { - constraint(to: edge, of: boundary, insets: UIEdgeInsets(inset), priority: priority) - } - - private func constraint( - to edge: DirectionalEdge, - of boundary: LayoutBoundary, - inset: CGFloat, - priority: UILayoutPriority - ) -> NSLayoutConstraint { - constraint(to: edge, of: boundary, insets: NSDirectionalEdgeInsets(inset), priority: priority) + private func addingSuperviewConstraints( + @ConstraintsBuilder constraints: @escaping SuperviewConstraints + ) -> LayoutItem { + ViewLayoutItem(layoutItemView: layoutItemView) { [superviewConstraints] layoutItem in + superviewConstraints(layoutItem) + constraints(layoutItem) + } } }