Skip to content

Fix InsetViewLayout.childGeometry #748

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

Open
Dark-Existed wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −6
Open

Fix InsetViewLayout.childGeometry #748

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

@Test(.bug("https://github.com/OpenSwiftUIProject/OpenSwiftUI/issues/511"))
func safeAreaPaddingWithEdgeInsets() {
struct ContentView: View {
Expand All @@ -17,4 +18,26 @@ struct InsetViewModifierUITests {
}
openSwiftUIAssertSnapshot(of: ContentView())
}

@Test
func safeAreaInset() {
struct ContentView: View {
var body: some View {
Color.red
.safeAreaInset(edge: .leading) {
Color.green.frame(width: 10)
}
.safeAreaInset(edge: .top) {
Color.blue.frame(height: 20)
}
.safeAreaInset(edge: .trailing) {
Color.gray.frame(width: 30)
}
.safeAreaInset(edge: .bottom) {
Color.yellow.frame(height: 40)
}
}
}
openSwiftUIAssertSnapshot(of: ContentView())
}
}
13 changes: 7 additions & 6 deletions Sources/OpenSwiftUICore/Layout/Modifier/InsetViewModifier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,18 +541,19 @@ private struct InsetViewLayout {
id: alignmentKeyID,
axis: secondaryAxis)
]
let position = (primaryPlacement.anchorPosition[secondaryAxis] + primaryAlignmentValue) - (secondaryAlignmentValue + .zero)
var primaryGeometry = ViewGeometry(
placement: primaryPlacement,
dimensions: primaryDimensions
)

let position = (primaryGeometry.origin[secondaryAxis] + primaryAlignmentValue) - (secondaryAlignmentValue + .zero)

let secondaryAnchor = UnitPoint(edge: props.edge)
let secondaryPlacement = _Placement(
proposedSize: secondaryProposal,
aligning: secondaryAnchor,
in: parentSize.value
)

var primaryGeometry = ViewGeometry(
placement: primaryPlacement,
dimensions: primaryDimensions
)
var secondaryGeometry = ViewGeometry(
placement: secondaryPlacement,
dimensions: secondaryDimensions
Expand Down
Loading