Skip to content

Add padding support #373

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 6, 2025
+570 −9
Merged

Add padding support #373

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
87e06c6
Add PaddingLayout support
Kyle-Ye Jul 6, 2025
0170217
Add missing deprecated API for background and overlay
Kyle-Ye Jul 6, 2025
8559990
Add PaddingLayoutUITests
Kyle-Ye Jul 6, 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
246 changes: 246 additions & 0 deletions Example/OpenSwiftUIUITests/Layout/Modifier/PaddingLayoutUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,246 @@
//
// PaddingLayoutUITests.swift
// OpenSwiftUIUITests

import SnapshotTesting
import Testing

@MainActor
@Suite(.snapshots(record: .never, diffTool: diffTool))
struct PaddingLayoutUITests {
// MARK: - Basic Padding

@Test
func defaultPadding() {
struct ContentView: View {
var body: some View {
Color.blue
.frame(width: 50, height: 30)
.padding()
.background(Color.red)
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}

@Test
func specificAmountPadding() {
struct ContentView: View {
var body: some View {
Color.blue
.frame(width: 50, height: 30)
.padding(20)
.background(Color.red)
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}

@Test
func zeroPadding() {
struct ContentView: View {
var body: some View {
Color.blue
.frame(width: 50, height: 30)
.padding(0)
.background(Color.red)
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}

// MARK: - Edge-Specific Padding

@Test
func topPadding() {
struct ContentView: View {
var body: some View {
Color.blue
.frame(width: 50, height: 30)
.padding(.top, 30)
.background(Color.red)
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}

@Test
func bottomPadding() {
struct ContentView: View {
var body: some View {
Color.blue
.frame(width: 50, height: 30)
.padding(.bottom, 30)
.background(Color.red)
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}

@Test
func leadingPadding() {
struct ContentView: View {
var body: some View {
Color.blue
.frame(width: 50, height: 30)
.padding(.leading, 30)
.background(Color.red)
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}

@Test
func trailingPadding() {
struct ContentView: View {
var body: some View {
Color.blue
.frame(width: 50, height: 30)
.padding(.trailing, 30)
.background(Color.red)
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}

@Test
func horizontalPadding() {
struct ContentView: View {
var body: some View {
Color.blue
.frame(width: 50, height: 30)
.padding(.horizontal, 40)
.background(Color.red)
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}

@Test
func verticalPadding() {
struct ContentView: View {
var body: some View {
Color.blue
.frame(width: 50, height: 30)
.padding(.vertical, 40)
.background(Color.red)
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}

@Test
func multipleEdgesPadding() {
struct ContentView: View {
var body: some View {
Color.blue
.frame(width: 50, height: 30)
.padding([.top, .trailing], 25)
.background(Color.red)
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}

// MARK: - EdgeInsets Padding

@Test
func edgeInsetsPadding() {
struct ContentView: View {
var body: some View {
Color.blue
.frame(width: 50, height: 30)
.padding(EdgeInsets(top: 10, leading: 20, bottom: 30, trailing: 15))
.background(Color.red)
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}

@Test
func asymmetricEdgeInsets() {
struct ContentView: View {
var body: some View {
Color.blue
.frame(width: 50, height: 30)
.padding(EdgeInsets(top: 5, leading: 50, bottom: 10, trailing: 5))
.background(Color.red)
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}

// MARK: - Nested Padding

@Test
func nestedPadding() {
struct ContentView: View {
var body: some View {
Color.blue
.frame(width: 50, height: 30)
.padding(10)
.background(Color.green)
.padding(20)
.background(Color.red)
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}

@Test
func multiplePaddingEdges() {
struct ContentView: View {
var body: some View {
Color.blue
.frame(width: 50, height: 30)
.padding(.leading, 30)
.background(Color.green)
.padding(.top, 20)
.background(Color.red)
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}

// MARK: - Padding with HVStack

@Test
func paddingInVStack() {
struct ContentView: View {
var body: some View {
VStack(spacing: 0) {
Color.blue
.frame(height: 30)
.padding(.bottom, 20)
.background(Color.red)

Color.green
.frame(height: 30)
.padding(.top, 15)
.background(Color.yellow)
}
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}

@Test
func paddingInHStack() {
struct ContentView: View {
var body: some View {
HStack(spacing: 0) {
Color.blue
.frame(width: 50)
.padding(.trailing, 25)
.background(Color.red)

Color.green
.frame(width: 50)
.padding(.leading, 15)
.background(Color.yellow)
}
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}
}
35 changes: 35 additions & 0 deletions Sources/OpenSwiftUICore/Layout/Modifier/DefaultPadding.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
//
// DefaultPadding.swift
// OpenSwiftUICore
//
// Audited for 6.5.4
// Status: WIP
// ID: 47C1BD8C61550BB60F4F3D12F752D53D (SwiftUICore)

private struct DefaultPaddingKey: EnvironmentKey {
static let defaultValue: EdgeInsets = .init(_all: 16.0)
}

@available(OpenSwiftUI_v3_0, *)
extension EnvironmentValues {
@_spi(_)
public var defaultPadding: EdgeInsets {
get { self[DefaultPaddingKey.self] }
set { self[DefaultPaddingKey.self] = newValue }
}
}

@available(OpenSwiftUI_v2_0, *)
extension View {
/// For use by children in containers to disable the automatic padding that
/// those containers apply.
public func _ignoresAutomaticPadding(_ ignoresPadding: Bool) -> some View {
_openSwiftUIUnimplementedFailure()
}

/// Applies explicit padding to a view that allows being disabled by that
/// view using `_ignoresAutomaticPadding`.
public func _automaticPadding(_ edgeInsets: EdgeInsets? = nil) -> some View {
_openSwiftUIUnimplementedFailure()
}
}
Loading