POS Modularization: Use FormattableAmountTextField through type-erased adaptor

staskus · staskus · commit 88974ef391fa · 2025-09-17T10:12:59.000+03:00
Provide access to FormattableAmountTextField and ViewModel for POS without making it as an explicit type dependency. FormattableAmountTextField cannot be easily moved and reused in a shared module due to multiple dependencies. This is used as a workaround to enable POS modularization without requiring a larger refactoring effort.
diff --git a/WooCommerce/Classes/POS/Adaptors/POSServiceLocatorAdaptor.swift b/WooCommerce/Classes/POS/Adaptors/POSServiceLocatorAdaptor.swift
@@ -84,4 +84,10 @@ private struct POSExternalViewAdaptor: POSExternalViewProviding {
                                                         defaultSite: ServiceLocator.stores.sessionManager.defaultSite))
         )
     }
+
+    func createFormattableAmountTextField(preset: Decimal?,
+                                          onSubmit: @escaping () -> Void,
+                                          onChange: @escaping (String) -> Void) -> AnyView {
+        AnyView(POSFormattableAmountTextFieldAdaptor(preset: preset, onSubmit: onSubmit, onChange: onChange))
+    }
 }
diff --git a/WooCommerce/Classes/POS/Adaptors/View Adaptors/POSFormattableAmountTextFieldAdaptor.swift b/WooCommerce/Classes/POS/Adaptors/View Adaptors/POSFormattableAmountTextFieldAdaptor.swift
@@ -0,0 +1,40 @@
+import SwiftUI
+
+/// Provide access to FormattableAmountTextField and ViewModel for POS without making it as an explicit type dependency
+/// FormattableAmountTextField cannot be easily moved and reused in a shared module due to multiple dependencies
+/// This is used as a workaround to enable POS modularization without requiring a larger refactoring effort
+///
+struct POSFormattableAmountTextFieldAdaptor: View {
+    @StateObject private var textFieldViewModel: FormattableAmountTextFieldViewModel
+    let preset: Decimal?
+    let onSubmit: () -> Void
+    let onChange: (String) -> Void
+
+    init(preset: Decimal?, onSubmit: @escaping () -> Void, onChange: @escaping (String) -> Void) {
+        self._textFieldViewModel = StateObject(wrappedValue: FormattableAmountTextFieldViewModel(
+            size: .extraLarge,
+            locale: Locale.autoupdatingCurrent,
+            storeCurrencySettings: ServiceLocator.currencySettings,
+            allowNegativeNumber: false)
+        )
+        self.preset = preset
+        self.onSubmit = onSubmit
+        self.onChange = onChange
+    }
+
+    var body: some View {
+        FormattableAmountTextField(viewModel: textFieldViewModel, style: .pos)
+            .dynamicTypeSize(...DynamicTypeSize.accessibility1)
+            .onSubmit {
+                onSubmit()
+            }
+            .onChange(of: textFieldViewModel.amount) { _, newValue in
+                onChange(newValue)
+            }
+            .onAppear {
+                if let preset {
+                    textFieldViewModel.presetAmount(preset)
+                }
+            }
+    }
+}
diff --git a/WooCommerce/Classes/POS/Presentation/PointOfSaleCollectCashView.swift b/WooCommerce/Classes/POS/Presentation/PointOfSaleCollectCashView.swift
@@ -5,6 +5,7 @@ import WooFoundation
 struct PointOfSaleCollectCashView: View {
     @Environment(\.dynamicTypeSize) var dynamicTypeSize
     @Environment(\.posAnalytics) var analytics
+    @Environment(\.posExternalViews) var externalViews
     @Environment(\.floatingControlAreaSize) private var floatingControlAreaSize: CGSize
     @Environment(PointOfSaleAggregateModel.self) private var posModel
     @FocusState private var isTextFieldFocused: Bool
@@ -32,13 +33,7 @@ struct PointOfSaleCollectCashView: View {
                                           isLoading: isLoading)
     }
 
-    @StateObject private var textFieldViewModel: FormattableAmountTextFieldViewModel
-
     init(orderTotal: String, currencySettings: CurrencySettings) {
-        self._textFieldViewModel = StateObject(wrappedValue: FormattableAmountTextFieldViewModel(size: .extraLarge,
-                                                                                                 locale: Locale.autoupdatingCurrent,
-                                                                                                 storeCurrencySettings: currencySettings,
-                                                                                                 allowNegativeNumber: false))
         self.viewHelper = CollectCashViewHelper(currencySettings: currencySettings)
         self.orderTotal = orderTotal
     }
@@ -61,18 +56,19 @@ struct PointOfSaleCollectCashView: View {
                         Spacer()
 
                         VStack(alignment: .center, spacing: conditionalPadding(POSSpacing.xSmall)) {
-                            FormattableAmountTextField(viewModel: textFieldViewModel, style: .pos)
-                                .focused($isTextFieldFocused)
-                                .dynamicTypeSize(...DynamicTypeSize.accessibility1)
-                                .onSubmit {
+                            externalViews.createFormattableAmountTextField(
+                                preset: viewHelper.parseCurrency(orderTotal),
+                                onSubmit: {
                                     Task { @MainActor in
                                         await submitCashAmount()
                                     }
-                                }
-                                .onChange(of: textFieldViewModel.amount) { _, newValue in
+                                },
+                                onChange: { newValue in
                                     textFieldAmountInput = newValue
                                     updateChangeDueMessage()
                                 }
+                            )
+                            .focused($isTextFieldFocused)
 
                             if let changeDue = changeDueMessage {
                                 Text(changeDue)
@@ -124,7 +120,7 @@ struct PointOfSaleCollectCashView: View {
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .onAppear {
-            prefillOrderTotal()
+            isTextFieldFocused = true
         }
     }
 
@@ -153,13 +149,6 @@ private extension PointOfSaleCollectCashView {
             orderTotal: orderTotal,
             textFieldAmountInput: textFieldAmountInput)
     }
-
-    private func prefillOrderTotal() {
-        if let orderDecimal = viewHelper.parseCurrency(orderTotal) {
-            textFieldViewModel.presetAmount(orderDecimal)
-        }
-        isTextFieldFocused = true
-    }
 }
 
 private extension PointOfSaleCollectCashView {
diff --git a/WooCommerce/Classes/POS/Protocols/POSDependencyProviding.swift b/WooCommerce/Classes/POS/Protocols/POSDependencyProviding.swift
@@ -39,9 +39,15 @@ protocol POSExternalNavigationProviding {
     func navigateToCreateOrder()
 }
 
-/// Protocol that provides external view creation capabilities for POS
+/// Protocol that provides access to complex Woo application views that depend on a lot of Woo app target dependencies
+/// and cannot be easily moved and reused in a shared module
+/// This is used as a workaround to enable POS modularization without requiring a larger refactoring effort
+///
 protocol POSExternalViewProviding {
     func createSupportFormView(isPresented: Binding<Bool>, sourceTag: String) -> AnyView
+    func createFormattableAmountTextField(preset: Decimal?,
+                                          onSubmit: @escaping () -> Void,
+                                          onChange: @escaping (String) -> Void) -> AnyView
 }
 
 /// Main protocol that combines all POS dependency providers
diff --git a/WooCommerce/Classes/POS/Utils/POSEnvironmentKeys.swift b/WooCommerce/Classes/POS/Utils/POSEnvironmentKeys.swift
@@ -122,5 +122,10 @@ struct EmptyPOSAnalytics: POSAnalyticsProviding {
 
 struct EmptyPOSExternalView: POSExternalViewProviding {
     func createSupportFormView(isPresented: Binding<Bool>, sourceTag: String) -> AnyView { AnyView(EmptyView()) }
+    func createFormattableAmountTextField(preset: Decimal?,
+                                          onSubmit: @escaping () -> Void,
+                                          onChange: @escaping (String) -> Void) -> AnyView {
+        AnyView(EmptyView())
+    }
     init() {}
 }
diff --git a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj
@@ -25,6 +25,7 @@
 		0105865E2E426FDC002FADD1 /* UIKitBarcodeObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0105865D2E426FDB002FADD1 /* UIKitBarcodeObserver.swift */; };
 		01058DD02E42716A002FADD1 /* BarcodeScannerContainerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01058DCF2E42716A002FADD1 /* BarcodeScannerContainerTests.swift */; };
 		01058DD22E4273F2002FADD1 /* UIKitBarcodeObserverTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01058DD12E4273F2002FADD1 /* UIKitBarcodeObserverTests.swift */; };
+		010F7D872E79B39E002B02EA /* POSFormattableAmountTextFieldAdaptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 010F7D862E79B39E002B02EA /* POSFormattableAmountTextFieldAdaptor.swift */; };
 		011D396F2D09FCD200DB1445 /* CardPresentModalLocationRequired.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011D396E2D09FCCB00DB1445 /* CardPresentModalLocationRequired.swift */; };
 		011D39712D0A324200DB1445 /* LocationServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011D39702D0A324100DB1445 /* LocationServiceTests.swift */; };
 		011D7A332CEC877A0007C187 /* CardPresentModalNonRetryableErrorEmailSent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011D7A322CEC87770007C187 /* CardPresentModalNonRetryableErrorEmailSent.swift */; };
@@ -3234,6 +3235,7 @@
 		0105865D2E426FDB002FADD1 /* UIKitBarcodeObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIKitBarcodeObserver.swift; sourceTree = "<group>"; };
 		01058DCF2E42716A002FADD1 /* BarcodeScannerContainerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BarcodeScannerContainerTests.swift; sourceTree = "<group>"; };
 		01058DD12E4273F2002FADD1 /* UIKitBarcodeObserverTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIKitBarcodeObserverTests.swift; sourceTree = "<group>"; };
+		010F7D862E79B39E002B02EA /* POSFormattableAmountTextFieldAdaptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = POSFormattableAmountTextFieldAdaptor.swift; sourceTree = "<group>"; };
 		011D396E2D09FCCB00DB1445 /* CardPresentModalLocationRequired.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardPresentModalLocationRequired.swift; sourceTree = "<group>"; };
 		011D39702D0A324100DB1445 /* LocationServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationServiceTests.swift; sourceTree = "<group>"; };
 		011D7A322CEC87770007C187 /* CardPresentModalNonRetryableErrorEmailSent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardPresentModalNonRetryableErrorEmailSent.swift; sourceTree = "<group>"; };
@@ -6475,6 +6477,14 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		010F7D852E79B39A002B02EA /* View Adaptors */ = {
+			isa = PBXGroup;
+			children = (
+				010F7D862E79B39E002B02EA /* POSFormattableAmountTextFieldAdaptor.swift */,
+			);
+			path = "View Adaptors";
+			sourceTree = "<group>";
+		};
 		014BD4B62C64E26B0011A66E /* Order Messages */ = {
 			isa = PBXGroup;
 			children = (
@@ -6522,6 +6532,7 @@
 		01654EB02E786223001DBB6F /* Adaptors */ = {
 			isa = PBXGroup;
 			children = (
+				010F7D852E79B39A002B02EA /* View Adaptors */,
 				016582D42E78715B001DBB6F /* Card Present Payments */,
 				016582D52E78715B001DBB6F /* POSCollectOrderPaymentAnalyticsAdaptor.swift */,
 				01654EAF2E786223001DBB6F /* POSServiceLocatorAdaptor.swift */,
@@ -16880,6 +16891,7 @@
 				DA41043A2C247B6900E8456A /* PointOfSalePreviewOrderController.swift in Sources */,
 				20F6A46C2DE5FCEF0066D8CB /* POSItemFetchAnalytics.swift in Sources */,
 				B933CCB02AA6220E00938F3F /* TaxRateRow.swift in Sources */,
+				010F7D872E79B39E002B02EA /* POSFormattableAmountTextFieldAdaptor.swift in Sources */,
 				57532CAC24BFF4DA0032B84E /* MessageComposerPresenter.swift in Sources */,
 				DE4D23AE29B1B0EF003A4B5D /* WPCom2FALoginViewModel.swift in Sources */,
 				0270F47824D006F60005210A /* ProductFormPresentationStyle.swift in Sources */,

Original file line number	Diff line number	Diff line change
`@@ -84,4 +84,10 @@ private struct POSExternalViewAdaptor: POSExternalViewProviding {`
`84`	`84`	`defaultSite: ServiceLocator.stores.sessionManager.defaultSite))`
`85`	`85`	`)`
`86`	`86`	`}`
	`87`	`+`
	`88`	`+ func createFormattableAmountTextField(preset: Decimal?,`
	`89`	`+ onSubmit: @escaping () -> Void,`
	`90`	`+ onChange: @escaping (String) -> Void) -> AnyView {`
	`91`	`+ AnyView(POSFormattableAmountTextFieldAdaptor(preset: preset, onSubmit: onSubmit, onChange: onChange))`
	`92`	`+ }`
`87`	`93`	`}`