Avoid setting the frame on every step view

joshheald · joshheald · commit b180138edecf · 2025-07-10T11:40:00.000+01:00
diff --git a/WooCommerce/Classes/POS/Presentation/Barcode Scanner Setup/PointOfSaleBarcodeScannerSetup.swift b/WooCommerce/Classes/POS/Presentation/Barcode Scanner Setup/PointOfSaleBarcodeScannerSetup.swift
@@ -18,6 +18,7 @@ struct PointOfSaleBarcodeScannerSetup: View {
 
             VStack {
                 currentContent
+                    .frame(maxWidth: .infinity, maxHeight: .infinity)
                 Spacer()
             }
             .scrollVerticallyIfNeeded()
diff --git a/WooCommerce/Classes/POS/Presentation/Barcode Scanner Setup/PointOfSaleBarcodeScannerSetupStepViews.swift b/WooCommerce/Classes/POS/Presentation/Barcode Scanner Setup/PointOfSaleBarcodeScannerSetupStepViews.swift
@@ -15,7 +15,6 @@ struct PointOfSaleBarcodeScannerWelcomeView: View {
                 .foregroundColor(.posOnSurfaceVariantHighest)
                 .multilineTextAlignment(.center)
         }
-        .frame(maxWidth: .infinity, maxHeight: .infinity)
     }
 }
 
@@ -40,7 +39,6 @@ struct PointOfSaleBarcodeScannerBarcodeView: View {
 
             Image(barcode.imageName)
         }
-        .frame(maxWidth: .infinity, maxHeight: .infinity)
     }
 }
 
@@ -76,7 +74,6 @@ struct PointOfSaleBarcodeScannerPairingView: View {
             }
             .buttonStyle(POSOutlinedButtonStyle(size: .extraSmall))
         }
-        .frame(maxWidth: .infinity, maxHeight: .infinity)
     }
 
     private var instruction: String {

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ struct PointOfSaleBarcodeScannerSetup: View {`
`18`	`18`
`19`	`19`	`VStack {`
`20`	`20`	`currentContent`
	`21`	`+ .frame(maxWidth: .infinity, maxHeight: .infinity)`
`21`	`22`	`Spacer()`
`22`	`23`	`}`
`23`	`24`	`.scrollVerticallyIfNeeded()`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ struct PointOfSaleBarcodeScannerWelcomeView: View {`
`15`	`15`	`.foregroundColor(.posOnSurfaceVariantHighest)`
`16`	`16`	`.multilineTextAlignment(.center)`
`17`	`17`	`}`
`18`		`- .frame(maxWidth: .infinity, maxHeight: .infinity)`
`19`	`18`	`}`
`20`	`19`	`}`
`21`	`20`
`@@ -40,7 +39,6 @@ struct PointOfSaleBarcodeScannerBarcodeView: View {`
`40`	`39`
`41`	`40`	`Image(barcode.imageName)`
`42`	`41`	`}`
`43`		`- .frame(maxWidth: .infinity, maxHeight: .infinity)`
`44`	`42`	`}`
`45`	`43`	`}`
`46`	`44`
`@@ -76,7 +74,6 @@ struct PointOfSaleBarcodeScannerPairingView: View {`
`76`	`74`	`}`
`77`	`75`	`.buttonStyle(POSOutlinedButtonStyle(size: .extraSmall))`
`78`	`76`	`}`
`79`		`- .frame(maxWidth: .infinity, maxHeight: .infinity)`
`80`	`77`	`}`
`81`	`78`
`82`	`79`	`private var instruction: String {`