Skip to content

Commit ef5bab2

Browse files
committed
Improve divider management
1 parent a3868a4 commit ef5bab2

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

WooCommerce/Classes/ViewRelated/Orders/Order Creation/OrderForm.swift

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,13 @@ struct OrderForm: View {
108108
ScrollView {
109109
VStack(spacing: Layout.noSpacing) {
110110

111-
NonEditableOrderBanner(width: geometry.size.width)
112-
.renderedIf(viewModel.shouldShowNonEditableBanner)
111+
Group {
112+
Divider() // Needed because `NonEditableOrderBanner` does not have a top divider
113+
NonEditableOrderBanner(width: geometry.size.width)
114+
}
115+
.renderedIf(viewModel.shouldShowNonEditableBanner)
113116

114-
OrderStatusSection(viewModel: viewModel)
117+
OrderStatusSection(viewModel: viewModel, topDivider: !viewModel.shouldShowNonEditableBanner)
115118

116119
Spacer(minLength: Layout.sectionSpacing)
117120

WooCommerce/Classes/ViewRelated/Orders/Order Creation/StatusSection/OrderStatusSection.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,19 @@ import Yosemite
44
/// Represents the Status section with date label, status badge and edit button.
55
///
66
struct OrderStatusSection: View {
7+
78
@ObservedObject var viewModel: EditableOrderViewModel
89

910
@Environment(\.safeAreaInsets) var safeAreaInsets: EdgeInsets
1011

12+
/// Set false to not render the top divider.
13+
/// Useful when there is a content on top that has its own divider.
14+
///
15+
private(set) var topDivider: Bool = true
16+
1117
var body: some View {
1218
Divider()
19+
.renderedIf(topDivider)
1320

1421
VStack(alignment: .leading, spacing: .zero) {
1522
Text(viewModel.dateString)

0 commit comments

Comments
 (0)