Skip to content

Add spacing support for HVStack #368

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

Merged
merged 3 commits into from
Jul 5, 2025
Merged

Add spacing support for HVStack #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
559b5e3
Update AbsoluteEdge code format
Kyle-Ye Jul 5, 2025
485de23
Update StackLayout.UnmanagedImplementation
Kyle-Ye Jul 5, 2025
d4e7bd0
Add HVStack spacing support
Kyle-Ye Jul 5, 2025
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
70 changes: 56 additions & 14 deletions Example/OpenSwiftUIUITests/Layout/Stack/HVStackUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ import SnapshotTesting
@MainActor
@Suite(.snapshots(record: .never, diffTool: diffTool))
struct HVStackUITests {
// MARK: - Stack Frame + Element Frame

@Test
func fixFrameForHStack() {
func stackFrameElementFrameHStack() {
struct ContentView: View {
var body: some View {
HStack {
Expand All @@ -26,7 +28,7 @@ struct HVStackUITests {
}

@Test
func fixFrameForVStack() {
func stackFrameElementFrameVStack() {
struct ContentView: View {
var body: some View {
VStack {
Expand All @@ -43,7 +45,7 @@ struct HVStackUITests {
}

@Test
func fixFrameForHVStack() {
func stackFrameElementFrameHVStack() {
struct ContentView: View {
var body: some View {
VStack {
Expand All @@ -58,15 +60,15 @@ struct HVStackUITests {
.background { Color.black }
}
}
withKnownIssue("Spacing is not implemented") {
openSwiftUIAssertSnapshot(
of: ContentView()
)
}
openSwiftUIAssertSnapshot(
of: ContentView()
)
}

// MARK: - Element Frame

@Test
func fixElementForHVStack() {
func elementFrameHVStack() {
struct ContentView: View {
var body: some View {
VStack {
Expand All @@ -80,15 +82,55 @@ struct HVStackUITests {
.background { Color.black }
}
}
withKnownIssue("Spacing is not implemented") {
openSwiftUIAssertSnapshot(
of: ContentView()
)
openSwiftUIAssertSnapshot(
of: ContentView()
)
}

@Test
func elementFrameSpacingHVStack() {
struct ContentView: View {
var body: some View {
VStack(spacing: 20) {
Color.red.frame(width: 40, height: 40)
Color.blue.frame(width: 40, height: 40)
HStack(spacing: 30) {
Color.green.frame(width: 40, height: 40)
Color.yellow.frame(width: 40, height: 40)
}
}
.background { Color.black }
}
}
openSwiftUIAssertSnapshot(
of: ContentView()
)
}

@Test
func equalSizeForHVStack() {
func elementFrameAlignmentHVStack() {
struct ContentView: View {
var body: some View {
VStack(alignment: .leading) {
Color.red.frame(width: 30, height: 30)
Color.blue.frame(width: 40, height: 40)
HStack(alignment: .top) {
Color.green.frame(width: 50, height: 50)
Color.yellow.frame(width: 60, height: 60)
}
}
.background { Color.black }
}
}
openSwiftUIAssertSnapshot(
of: ContentView()
)
}

// MARK: - No frame constraint

@Test
func defaultHVStack() {
struct ContentView: View {
var body: some View {
VStack {
Expand Down
30 changes: 20 additions & 10 deletions Sources/OpenSwiftUICore/Layout/Edge/AbsoluteEdge.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,30 @@

package enum AbsoluteEdge: Int8, CaseIterable, Hashable {
case top, left, bottom, right

package struct Set: OptionSet {
package let rawValue: Int8

package init(rawValue: Int8) { self.rawValue = rawValue }

package static let top: AbsoluteEdge.Set = .init(.top)

package static let left: AbsoluteEdge.Set = .init(.left)

package static let bottom: AbsoluteEdge.Set = .init(.bottom)

package static let right: AbsoluteEdge.Set = .init(.right)

package static let all: AbsoluteEdge.Set = [.top, .left, .bottom, .right]

package static let horizontal: AbsoluteEdge.Set = [.left, .right]

package static let vertical: AbsoluteEdge.Set = [.top, .bottom]

package init(_ e: AbsoluteEdge) {
self.init(rawValue: 1 << e.rawValue)
}

package func contains(_ e: AbsoluteEdge) -> Bool {
self.contains(.init(e))
}
Expand All @@ -35,17 +45,17 @@ extension AbsoluteEdge.Set {
}
if edges.contains(.leading) {
switch layoutDirection {
case .leftToRight: result.insert(.left)
case .rightToLeft: result.insert(.right)
case .leftToRight: result.insert(.left)
case .rightToLeft: result.insert(.right)
}
}
if edges.contains(.bottom) {
result.insert(.bottom)
}
if edges.contains(.trailing) {
switch layoutDirection {
case .leftToRight: result.insert(.right)
case .rightToLeft: result.insert(.left)
case .leftToRight: result.insert(.right)
case .rightToLeft: result.insert(.left)
}
}
self = result
Expand All @@ -56,13 +66,13 @@ extension AbsoluteEdge {
package var horizontal: Bool {
self == .left || self == .right
}

package var opposite: AbsoluteEdge {
switch self {
case .top: .bottom
case .left: .right
case .bottom: .top
case .right: .left
case .top: .bottom
case .left: .right
case .bottom: .top
case .right: .left
}
}
}
Loading