@jimrising/easymerchantsdk-react-native 1.3.3 → 1.3.5

package/.idea/caches/deviceStreaming.xml

@@ -47,17 +47,6 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2160" />
         </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="Lenovo" />
-          <option name="codename" value="TB370FU" />
-          <option name="id" value="TB370FU" />
-          <option name="manufacturer" value="Lenovo" />
-          <option name="name" value="Tab P12" />
-          <option name="screenDensity" value="340" />
-          <option name="screenX" value="1840" />
-          <option name="screenY" value="2944" />
-        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
@@ -69,6 +58,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2340" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a15x" />
+          <option name="id" value="a15x" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A15 5G" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />

package/README.md

@@ -7,7 +7,7 @@ To add the path of sdk in your project. Open your `package.json` file and inside
 
 ```json
 "dependencies": {
-  "@jimrising/easymerchantsdk-react-native": "^1.3.3"
+  "@jimrising/easymerchantsdk-react-native": "^1.3.5"
 },
 ```
 
@@ -120,11 +120,9 @@ import {
   StyleSheet,
   Platform,
   NativeModules,
-  NativeEventEmitter
 } from 'react-native';
 
 const { RNEasymerchantsdk, EasyMerchantSdk } = NativeModules;
-const sdkEvents = Platform.OS === 'ios' ? new NativeEventEmitter(EasyMerchantSdk) : null;
 
 const App = () => {
   const [version, setVersion] = useState('');
@@ -136,38 +134,18 @@ const App = () => {
         if (Platform.OS === 'ios') {
           await EasyMerchantSdk.setViewController();
           EasyMerchantSdk.configureEnvironment(
-            'staging', // sandbox , staging , production
-            'apiKey',
-            'secretKey'
+            'staging', // Options: sandbox, staging, production
+            '14fbf8a186091763e59c289c1',
+            'f90863e7a853539f8ace8d6de'
           );
         }
-
-        // Add listeners for iOS
-        if (sdkEvents) {
-          sdkEvents.addListener('EasyPaySuccess', (data) => {
-            setResponse(`✅ Success: ${JSON.stringify(data)}`);
-          });
-          sdkEvents.addListener('EasyPayCancelled', () => {
-            setResponse('⚠️ Payment Cancelled');
-          });
-          sdkEvents.addListener('EasyPayError', (err) => {
-            setResponse(`❌ Error: ${JSON.stringify(err)}`);
-          });
-        }
       } catch (err) {
-        console.error('Initialization Error:', err.message || err);
+        console.error('Initialization Error:', err);
+        setResponse(`❌ Initialization Error: ${err.message || err}`);
       }
     };
 
     setup();
-
-    return () => {
-      if (sdkEvents) {
-        sdkEvents.removeAllListeners('EasyPaySuccess');
-        sdkEvents.removeAllListeners('EasyPayCancelled');
-        sdkEvents.removeAllListeners('EasyPayError');
-      }
-    };
   }, []);
 
   const getPlatformVersion = async () => {
@@ -179,11 +157,12 @@ const App = () => {
       setVersion(ver);
     } catch (err) {
       setVersion('Error fetching version');
+      console.error(err);
     }
   };
 
   const handleBilling = async () => {
-    const amount = '72';
+    const amount = '64';
     const billingInfo = {
       address: 'Test',
       country: 'test',
@@ -193,36 +172,44 @@ const App = () => {
       additional_info: {
         name: 'Test User',
         email: 'test@gmail.com',
-        phone_number: '7888821587',
+        phone_number: '234983789',
         country_code: '91',
-        description: 'SDK Test'
-      }
+        description: 'SDK Test',
+      },
     };
 
-   const themeConfiguration = {
-     bodyBackgroundColor: '#FFEEEE', 
-     containerBackgroundColor: '#FFCCCC', 
-     primaryFontColor: '#B30000', 
-     secondaryFontColor: '#660000',
-     primaryButtonBackgroundColor: '#D50000', 
-     primaryButtonHoverColor: '#9C0000', 
-     primaryButtonFontColor: '#FFFFFF', 
-     secondaryButtonBackgroundColor: '#FF6666', 
-     secondaryButtonHoverColor: '#FF4D4D',
-     secondaryButtonFontColor: '#FFFFFF', 
-     borderRadius: '12', 
-     fontSize: '16' 
-   };
-
-
+    const themeConfiguration = {
+      bodyBackgroundColor: '#FFEEEE',
+      containerBackgroundColor: '#FFCCCC',
+      primaryFontColor: '#B30000',
+      secondaryFontColor: '#660000',
+      primaryButtonBackgroundColor: '#D50000',
+      primaryButtonHoverColor: '#9C0000',
+      primaryButtonFontColor: '#FFFFFF',
+      secondaryButtonBackgroundColor: '#FF6666',
+      secondaryButtonHoverColor: '#FF4D4D',
+      secondaryButtonFontColor: '#FFFFFF',
+      borderRadius: '12',
+      fontSize: '16',
+    };
 
+    const authConfig = {
+      accessToken: '251|uTijpDGfrS88UR2V1cZNMQ8S4hUJA0sVzsnsoUZF',
+      vendorId: '251',
+      role: 'business',
+      timeout: 10,
+      isSandbox: true,
+      brandingName: 'Lyfecycle Payments',
+      finderSubtitle: 'Search for your bank',
+      searchPlaceholder: 'Enter bank name',
+    };
 
-    try {
-      if (Platform.OS === 'android') {
-        const result = await RNEasymerchantsdk.billing(amount, null);
-        setResponse(`✅ Android Payment Success: ${result}`);
-      } else {
-       await EasyMerchantSdk.billing(
+   try {
+     if (Platform.OS === 'android') {
+       const result = await RNEasymerchantsdk.billing(amount, null);
+       setResponse(`✅ Android Payment Success: ${result}`);
+     } else {
+       const result = await EasyMerchantSdk.billing(
          amount,
          JSON.stringify(billingInfo),
          ['card', 'bank', 'crypto'],
@@ -231,34 +218,30 @@ const App = () => {
          false, // saveCard
          false, // saveAccount
          true,  // authenticatedACH
-         {
-           accessToken: "251|uTijpDGfrS88UR2V1cZNMQ8S4hUJA0sVzsnsoUZF",
-           vendorId: "251",
-           role: "business",
-           timeout: 10,
-           isSandbox: true,
-           brandingName: "Lyfecycle Payments",
-           finderSubtitle: "Search for your bank",
-           searchPlaceholder: "Enter bank name"
-         }
+         authConfig
        );
 
-        setResponse('🔁 Billing started on iOS. Awaiting response...');
-      }
-    } catch (error) {
-      setResponse(`❌ Billing Error: ${error.message || error}`);
-    }
+       console.log("Billing success:", result);
+       setResponse(`✅ iOS Payment Success: ${JSON.stringify(result)}`);
+     }
+   } catch (error) {
+     console.error('Billing Error:', error);
+     setResponse(`❌ Billing Error: ${error.message || JSON.stringify(error)}`);
+   }
+
   };
 
   return (
     <View style={styles.container}>
       <Text style={styles.title}>EasyMerchant SDK</Text>
       <Text style={styles.version}>Platform Version: {version}</Text>
+
       <Button title="Get Platform Version" onPress={getPlatformVersion} />
       <View style={styles.space} />
       <Button title="Start Billing" onPress={handleBilling} />
       <View style={styles.space} />
-      {response ? <Text style={styles.response}>{response}</Text> : null}
+
+      <Text style={styles.response}>{response}</Text>
     </View>
   );
 };
@@ -271,30 +254,31 @@ const styles = StyleSheet.create({
     backgroundColor: '#F9FAFB',
     alignItems: 'center',
     justifyContent: 'center',
-    padding: 24
+    padding: 24,
   },
   title: {
     fontSize: 20,
     fontWeight: 'bold',
-    marginBottom: 16
+    marginBottom: 16,
   },
   version: {
     fontSize: 14,
-    marginBottom: 8
+    marginBottom: 8,
   },
   response: {
     marginTop: 20,
     paddingHorizontal: 12,
     textAlign: 'center',
     fontSize: 14,
-    color: '#333'
+    color: '#333',
   },
   space: {
-    height: 16
-  }
+    height: 16,
+  },
 });
 
 
+
 ```
 
 You can send `null` if billing info not available.

package/ios/Classes/EasyMerchantSdk.m

@@ -2,66 +2,83 @@
 #import <React/RCTLog.h>
 #import <React/RCTBridgeModule.h>
 #import <easymerchantsdk/easymerchantsdk-Swift.h>
+
 //#import <easymerchantsdk-Swift.h>
 
+@interface EasyMerchantSdk()
+@property (nonatomic, strong) EasyMerchantSdkPlugin *sdkPluginInstance;
+@end
+
 @implementation EasyMerchantSdk
 
 RCT_EXPORT_MODULE()
 
-
 RCT_EXPORT_METHOD(configureEnvironment:(NSString *)env
-        apiKey:(NSString *)apiKey
-        apiSecret:(NSString *)apiSecret)
+                  apiKey:(NSString *)apiKey
+                  apiSecret:(NSString *)apiSecret)
 {
-    EasyMerchantSdkPlugin *sdkPlugin = [[EasyMerchantSdkPlugin alloc] init];
-    [sdkPlugin configureEnvironment:env apiKey:apiKey apiSecret:apiSecret];
+    if (!self.sdkPluginInstance) {
+        self.sdkPluginInstance = [[EasyMerchantSdkPlugin alloc] init];
+    }
+    [self.sdkPluginInstance configureEnvironment:env apiKey:apiKey apiSecret:apiSecret];
 }
 
 RCT_EXPORT_METHOD(
-        billing:(NSString *)amount
-        billingInfo:(NSString *)billingInfo
-        paymentMethods:(NSArray *)paymentMethods
-        themeConfiguration:(NSDictionary *)themeConfiguration
-        tokenOnly:(BOOL)tokenOnly
-        saveCard:(BOOL)saveCard
-        saveAccount:(BOOL)saveAccount
-        authenticatedACH:(BOOL)authenticatedACH
-        grailPayParams:(NSDictionary *)grailPayParams
-        resolver:(RCTPromiseResolveBlock)resolve
-        rejecter:(RCTPromiseRejectBlock)reject
+    billing:(NSString *)amount
+    billingInfo:(NSString *)billingInfo
+    paymentMethods:(NSArray *)paymentMethods
+    themeConfiguration:(NSDictionary *)themeConfiguration
+    tokenOnly:(BOOL)tokenOnly
+    saveCard:(BOOL)saveCard
+    saveAccount:(BOOL)saveAccount
+    authenticatedACH:(BOOL)authenticatedACH
+    grailPayParams:(NSDictionary *)grailPayParams
+    resolver:(RCTPromiseResolveBlock)resolve
+    rejecter:(RCTPromiseRejectBlock)reject
 )
 {
-    EasyMerchantSdkPlugin *sdkPlugin = [[EasyMerchantSdkPlugin alloc] init];
+    if (!self.sdkPluginInstance) {
+        self.sdkPluginInstance = [[EasyMerchantSdkPlugin alloc] init];
+    }
 
-    [sdkPlugin billing:amount
-           billinginfo:billingInfo
-        paymentMethods:paymentMethods
-    themeConfiguration:themeConfiguration
-             tokenOnly:tokenOnly
-              saveCard:saveCard
-           saveAccount:saveAccount
-      authenticatedACH:authenticatedACH
-        grailPayParams:grailPayParams
-              resolver:resolve
-              rejecter:reject];
+    [self.sdkPluginInstance billing:amount
+                      billinginfo:billingInfo
+                   paymentMethods:paymentMethods
+               themeConfiguration:themeConfiguration
+                        tokenOnly:tokenOnly
+                         saveCard:saveCard
+                      saveAccount:saveAccount
+                 authenticatedACH:authenticatedACH
+                   grailPayParams:grailPayParams
+                         resolver:^(id result) {
+                             resolve(result);
+                             self.sdkPluginInstance = nil;
+                         }
+                         rejecter:^(NSString *code, NSString *message, NSError *error) {
+                             reject(code, message, error);
+                             self.sdkPluginInstance = nil;
+                         }];
 }
 
 
-RCT_EXPORT_METHOD(setViewController:(RCTPromiseResolveBlock)resolve
-        rejecter:(RCTPromiseRejectBlock)reject)
+
+
+RCT_REMAP_METHOD(setViewController,
+                 setViewControllerWithResolver:(RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject)
 {
-    UIViewController *rootViewController = [UIApplication sharedApplication].delegate.window.rootViewController;
+    UIViewController *rootVC = [UIApplication sharedApplication].delegate.window.rootViewController;
     EasyMerchantSdkPlugin *sdkPlugin = [[EasyMerchantSdkPlugin alloc] init];
-    [sdkPlugin setViewController:rootViewController];
-    resolve(@"ViewController set successfully");
+    [sdkPlugin setViewController:rootVC];
+    resolve(@"ViewController set");
 }
 
+
 RCT_EXPORT_METHOD(getPlatformVersion:(RCTPromiseResolveBlock)resolve
-        rejecter:(RCTPromiseRejectBlock)reject)
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     NSString *platformVersion = [NSString stringWithFormat:@"iOS %@", [[UIDevice currentDevice] systemVersion]];
     resolve(platformVersion);
 }
 
 @end
-

package/ios/Classes/EasyMerchantSdk.swift

@@ -3,11 +3,32 @@ import UIKit
 import React
 
 @objc(EasyMerchantSdkPlugin)
-public class EasyMerchantSdkPlugin: NSObject {
+public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
+    public static func moduleName() -> String { "EasyMerchantSdk" }
+    public static func requiresMainQueueSetup() -> Bool { true }
+
+    public var bridge: RCTBridge?
 
     private var viewController: UIViewController?
     private let viewControllerQueue = DispatchQueue(label: "com.easymerchantsdk.viewController")
 
+    private var billingResolver: RCTPromiseResolveBlock?
+    private var billingRejecter: RCTPromiseRejectBlock?
+
+    // ✅ Default initializer for Objective-C compatibility
+    @objc public override init() {
+        super.init()
+    }
+
+    // Optional: Called when the bridge finishes loading
+    public func bridgeDidFinishLoading() {
+        if self.bridge != nil {
+            print("Bridge has been initialized successfully.")
+        } else {
+            print("Bridge initialization failed.")
+        }
+    }
+
     @objc public func setViewController(_ viewController: UIViewController) {
         viewControllerQueue.sync {
             self.viewController = viewController
@@ -15,12 +36,11 @@ public class EasyMerchantSdkPlugin: NSObject {
         print("ViewController set: \(String(describing: self.viewController))")
     }
 
-
     @objc public func billing(
         _ amount: String,
-        billinginfo: String,
+        billinginfo: String?,
         paymentMethods: [String],
-        themeConfiguration: [String: Any],  // Accept dynamic theme from JS
+        themeConfiguration: [String: Any],
         tokenOnly: Bool,
         saveCard: Bool,
         saveAccount: Bool,
@@ -34,10 +54,12 @@ public class EasyMerchantSdkPlugin: NSObject {
             return
         }
 
-        guard let billingInfoData = billinginfo.data(using: .utf8),
-              let _ = try? JSONSerialization.jsonObject(with: billingInfoData, options: []) else {
-            rejecter("INVALID_BILLING_INFO", "Billing info must be valid JSON", nil)
-            return
+        if let billinginfo = billinginfo {
+            guard let billingInfoData = billinginfo.data(using: .utf8),
+                  let _ = try? JSONSerialization.jsonObject(with: billingInfoData, options: []) else {
+                rejecter("INVALID_BILLING_INFO", "Billing info must be valid JSON", nil)
+                return
+            }
         }
 
         let methods: [PaymentMethod] = paymentMethods.compactMap {
@@ -63,35 +85,23 @@ public class EasyMerchantSdkPlugin: NSObject {
             )
         }
 
-        // Extract themeConfiguration values from JS
-        let bodyBackgroundColor = themeConfiguration["bodyBackgroundColor"] as? String ?? "#EBF8FF"
-        let containerBackgroundColor = themeConfiguration["containerBackgroundColor"] as? String ?? "#FFFFFF"
-        let primaryFontColor = themeConfiguration["primaryFontColor"] as? String ?? "#1E3A8A"
-        let secondaryFontColor = themeConfiguration["secondaryFontColor"] as? String ?? "#696969"
-        let primaryButtonBackgroundColor = themeConfiguration["primaryButtonBackgroundColor"] as? String ?? "#1D4ED8"
-        let primaryButtonHoverColor = themeConfiguration["primaryButtonHoverColor"] as? String ?? "#2563EB"
-        let primaryButtonFontColor = themeConfiguration["primaryButtonFontColor"] as? String ?? "#FFFFFF"
-        let secondaryButtonBackgroundColor = themeConfiguration["secondaryButtonBackgroundColor"] as? String ?? "#FFFFFF"
-        let secondaryButtonHoverColor = themeConfiguration["secondaryButtonHoverColor"] as? String ?? "#BFDBFE"
-        let secondaryButtonFontColor = themeConfiguration["secondaryButtonFontColor"] as? String ?? "#1E40AF"
-        let borderRadius = themeConfiguration["borderRadius"] as? String ?? "8"
-        let fontSize = themeConfiguration["fontSize"] as? String ?? "14"
-
         let themeConfig = ThemeConfiguration(
-            bodyBackgroundColor: bodyBackgroundColor,
-            containerBackgroundColor: containerBackgroundColor,
-            primaryFontColor: primaryFontColor,
-            secondaryFontColor: secondaryFontColor,
-            primaryButtonBackgroundColor: primaryButtonBackgroundColor,
-            primaryButtonHoverColor: primaryButtonHoverColor,
-            primaryButtonFontColor: primaryButtonFontColor,
-            secondaryButtonBackgroundColor: secondaryButtonBackgroundColor,
-            secondaryButtonHoverColor: secondaryButtonHoverColor,
-            secondaryButtonFontColor: secondaryButtonFontColor,
-            borderRadius: borderRadius,
-            fontSize: fontSize
+            bodyBackgroundColor: themeConfiguration["bodyBackgroundColor"] as? String ?? "#EBF8FF",
+            containerBackgroundColor: themeConfiguration["containerBackgroundColor"] as? String ?? "#FFFFFF",
+            primaryFontColor: themeConfiguration["primaryFontColor"] as? String ?? "#1E3A8A",
+            secondaryFontColor: themeConfiguration["secondaryFontColor"] as? String ?? "#696969",
+            primaryButtonBackgroundColor: themeConfiguration["primaryButtonBackgroundColor"] as? String ?? "#1D4ED8",
+            primaryButtonHoverColor: themeConfiguration["primaryButtonHoverColor"] as? String ?? "#2563EB",
+            primaryButtonFontColor: themeConfiguration["primaryButtonFontColor"] as? String ?? "#FFFFFF",
+            secondaryButtonBackgroundColor: themeConfiguration["secondaryButtonBackgroundColor"] as? String ?? "#FFFFFF",
+            secondaryButtonHoverColor: themeConfiguration["secondaryButtonHoverColor"] as? String ?? "#BFDBFE",
+            secondaryButtonFontColor: themeConfiguration["secondaryButtonFontColor"] as? String ?? "#1E40AF",
+            borderRadius: themeConfiguration["borderRadius"] as? String ?? "8",
+            fontSize: themeConfiguration["fontSize"] as? String ?? "14"
         )
 
+        let billingInfoData = billinginfo?.data(using: .utf8) ?? Data()
+
         let request = Request(
             amount: amountValue,
             billingInfoData: billingInfoData,
@@ -105,23 +115,22 @@ public class EasyMerchantSdkPlugin: NSObject {
             grailPayParams: authenticatedACH ? grailParams : nil
         )
 
+        self.billingResolver = resolver
+        self.billingRejecter = rejecter
+
         DispatchQueue.main.async {
             let controller = EasyPayViewController(request: request, delegate: self)
             if let vc = self.viewController {
-                vc.present(controller, animated: true) {
-                    resolver("Payment UI presented")
-                }
+                vc.present(controller, animated: true, completion: nil)
             } else if let rootVC = UIApplication.shared.windows.first(where: { $0.isKeyWindow })?.rootViewController {
-                rootVC.present(controller, animated: true) {
-                    resolver("Payment UI presented (fallback)")
-                }
+                rootVC.present(controller, animated: true, completion: nil)
             } else {
                 rejecter("NO_VIEW_CONTROLLER", "No view controller available to present payment screen.", nil)
+                self.clearResolvers()
             }
         }
     }
 
-
     @objc public func configureEnvironment(_ env: String, apiKey: String, apiSecret: String) {
         switch env.lowercased() {
         case "production":
@@ -131,7 +140,6 @@ public class EasyMerchantSdkPlugin: NSObject {
         default:
             EnvironmentConfig.setEnvironment(.staging)
         }
-
         EnvironmentConfig.configure(apiKey: apiKey, apiSecret: apiSecret)
     }
 
@@ -141,41 +149,35 @@ public class EasyMerchantSdkPlugin: NSObject {
     ) {
         resolver("iOS \(UIDevice.current.systemVersion)")
     }
-}
 
-// MARK: - React Native Bridge
-@objc(EasyMerchantSdkPlugin)
-extension EasyMerchantSdkPlugin: RCTBridgeModule {
-    public static func moduleName() -> String { "EasyMerchantSdk" }
-    public static func requiresMainQueueSetup() -> Bool { true }
+    private func clearResolvers() {
+        self.billingResolver = nil
+        self.billingRejecter = nil
+    }
 }
 
-// MARK: - Payment Delegate
 extension EasyMerchantSdkPlugin: EasyPayViewControllerDelegate {
     public func easyPayController(_ controller: EasyPayViewController, didFinishWith result: Result) {
         DispatchQueue.main.async {
             switch result.type {
             case .cancelled:
-                self.sendEvent(name: "EasyPayCancelled", body: ["message": "User cancelled"])
+                self.billingResolver?(["status": "cancelled", "message": "User cancelled"])
             case .success:
                 if let chargeData = result.chargeData,
                    let clientToken = chargeData["clientToken"] as? String {
-                    self.sendEvent(name: "EasyPaySuccess", body: ["clientToken": clientToken])
+                    self.billingResolver?(["status": "success", "clientToken": clientToken])
                 } else {
-                    self.sendEvent(name: "EasyPaySuccess", body: ["chargeData": result.chargeData ?? [:]])
+                    self.billingResolver?(["status": "success", "chargeData": result.chargeData ?? [:]])
                 }
             case .error:
                 if let error = result.chargeData?["errorMessage"] as? String {
-                    self.sendEvent(name: "EasyPayError", body: ["error": error])
+                    self.billingRejecter?("PAYMENT_ERROR", error, nil)
                 } else {
-                    self.sendEvent(name: "EasyPayError", body: ["error": "Unknown error"])
+                    self.billingRejecter?("PAYMENT_ERROR", "Unknown error", nil)
                 }
             }
+            self.clearResolvers()
+            controller.dismiss(animated: true)
         }
     }
-
-    private func sendEvent(name: String, body: [String: Any]) {
-        NotificationCenter.default.post(name: NSNotification.Name(name), object: nil, userInfo: body)
-    }
 }
-

package/ios/CustomComponents/DatePickerHandler.swift

@@ -0,0 +1,71 @@
+//
+//  DatePickerHandler.swift
+//  EasyPay
+//
+//  Created by Mony's Mac on 14/05/25.
+//
+
+import UIKit
+
+class DatePickerHandler: NSObject {
+    
+    private let datePicker = UIDatePicker()
+    private var targetTextField: UITextField?
+    
+    var onDateSelected: ((Date) -> Void)?
+    
+    init(textField: UITextField, initialDate: Date? = nil) {
+        super.init()
+        
+        self.targetTextField = textField
+        configureDatePicker()
+        
+        if let date = initialDate {
+            datePicker.date = date
+        }
+        
+        setupInputView(for: textField)
+    }
+    
+    private func configureDatePicker() {
+        if #available(iOS 14.0, *) {
+            datePicker.preferredDatePickerStyle = .inline
+        }
+        datePicker.datePickerMode = .date
+        datePicker.minimumDate = Date()
+        datePicker.addTarget(self, action: #selector(dateChanged(_:)), for: .valueChanged)
+    }
+    
+    private func setupInputView(for textField: UITextField) {
+        textField.inputView = datePicker
+        
+        let toolbar = UIToolbar()
+        toolbar.sizeToFit()
+        
+        let doneButton = UIBarButtonItem(title: "Done", style: .done, target: self, action: #selector(doneDateSelection))
+        let space = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
+        
+        toolbar.setItems([space, doneButton], animated: false)
+        textField.inputAccessoryView = toolbar
+    }
+    
+    @objc private func dateChanged(_ sender: UIDatePicker) {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "dd/MM/yyyy"
+        targetTextField?.text = formatter.string(from: sender.date)
+        onDateSelected?(sender.date)
+    }
+    
+    @objc private func doneDateSelection() {
+        if targetTextField?.text?.isEmpty ?? true {
+            let formatter = DateFormatter()
+            formatter.dateFormat = "dd/MM/yyyy"
+            let dateText = formatter.string(from: datePicker.date)
+            targetTextField?.text = dateText
+            onDateSelected?(datePicker.date)
+        }
+        targetTextField?.resignFirstResponder()
+    }
+    
+}
+