Skip to content

Fix SafeAreaPaddingModifier #792

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

Closed
Dark-Existed wants to merge 1 commit into from
Closed

Fix SafeAreaPaddingModifier #792

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
5 changes: 1 addition & 4 deletions Example/OpenSwiftUIUITests/Layout/Modifier/InsetViewModifierUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ import Testing
@Suite(.snapshots(record: .never, diffTool: diffTool))
struct InsetViewModifierUITests {

@Test(
.bug("https://github.com/OpenSwiftUIProject/OpenSwiftUI/issues/511"),
.disabled("Extra spacing value is taken into account. Disable the test case before we fix it.")
)
@Test(.bug("https://github.com/OpenSwiftUIProject/OpenSwiftUI/issues/511"))
func safeAreaPaddingWithEdgeInsets() {
struct ContentView: View {
var body: some View {
Expand Down
10 changes: 5 additions & 5 deletions Sources/OpenSwiftUICore/Layout/Modifier/InsetViewModifier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,20 +253,20 @@ struct SafeAreaPaddingModifier: ViewModifier {

@usableFromInline
func body(content: SafeAreaPaddingModifier.Content) -> some View {
content.safeAreaInset(edge: .top) {
content.safeAreaInset(edge: .top, spacing: 0) {
insetView(edge: .top)
}.safeAreaInset(edge: .bottom) {
}.safeAreaInset(edge: .bottom, spacing: 0) {
insetView(edge: .bottom)
}.safeAreaInset(edge: .leading) {
}.safeAreaInset(edge: .leading, spacing: 0) {
insetView(edge: .leading)
}.safeAreaInset(edge: .trailing) {
}.safeAreaInset(edge: .trailing, spacing: 0) {
insetView(edge: .trailing)
}
}

private func insetView(edge: Edge) -> some View {
let axis = Axis(edge: edge)
let inset = (insets ?? defaultPadding)[edge]
let inset = edges.contains(edge) ? (insets ?? defaultPadding)[edge] : 0
return axis == .horizontal
? Color.clear.frame(width: inset)
: Color.clear.frame(height: inset)
Expand Down
Loading