Skip to content

[Woo POS] Don't ignore safe area at the root of POS modal #16121

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 1 commit into from
Sep 15, 2025
Merged

[Woo POS] Don't ignore safe area at the root of POS modal #16121

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
48 changes: 47 additions & 1 deletion WooCommerce/Classes/POS/Presentation/Reusable Views/POSModalViewModifier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ struct POSRootModalViewModifier: ViewModifier {
}
}
.animation(.easeInOut(duration: animationDuration), value: modalManager.isPresented)
.ignoresSafeArea()
}

private func updateModalParentSize(with size: CGSize) {
Expand Down Expand Up @@ -212,3 +211,50 @@ extension EnvironmentValues {
set { self[POSModalParentSizeKey.self] = newValue }
}
}

// MARK: - Previews for testing popular modals

#if DEBUG
#Preview("Card Present Alert") {
@Previewable @StateObject var modalManager = POSModalManager()
@Previewable @StateObject var coverManager = POSFullScreenCoverManager()
@Previewable @State var showModal = false

return VStack {
Color.blue
.ignoresSafeArea(.all)
.onAppear {
showModal = true
}
}
.posModal(isPresented: $showModal) {
PointOfSaleCardPresentPaymentAlert(alertType: .connectionSuccess(
viewModel: PointOfSaleCardPresentPaymentConnectionSuccessAlertViewModel(doneAction: {
})
))
}
.posRootModal()
.environmentObject(modalManager)
.environmentObject(coverManager)
}

#Preview("Barcode Scanner Setup") {
@Previewable @StateObject var modalManager = POSModalManager()
@Previewable @StateObject var coverManager = POSFullScreenCoverManager()
@Previewable @State var showModal = false

return VStack {
Color.blue
.ignoresSafeArea(.all)
.onAppear {
showModal = true
}
}
.posModal(isPresented: $showModal) {
PointOfSaleBarcodeScannerSetup(isPresented: $showModal)
}
.posRootModal()
.environmentObject(modalManager)
.environmentObject(coverManager)
}
#endif
Loading