apply patch

Author: hasanal95

android/src/main/java/com/henninghall/date_picker/DatePickerModuleImpl.java

@@ -30,23 +30,29 @@ public class DatePickerModuleImpl {
         ApplicationStarter.initialize(context, false); // false = no need to prefetch on time data background tread
     }
 
-    public void openPicker(ReadableMap props){
+    public void openPicker(ReadableMap props, Callback onConfirm, Callback onCancel){
         final PickerView picker = createPicker(props);
-        Callback onConfirm = new Callback() {
+        Callback onConfirmCallback = new Callback() {
             @Override
             public void invoke(Object... objects) {
                 Emitter.onConfirm(picker.getDate(), picker.getPickerId());
+                 if (onConfirm != null) {
+                    onConfirm.invoke(picker.getDate());
+                }
             }
         };
 
-        Callback onCancel = new Callback() {
+        Callback onCancelCallback = new Callback() {
             @Override
             public void invoke(Object... objects) {
                 Emitter.onCancel(picker.getPickerId());
+                  if (onCancel != null) {
+                    onCancel.invoke();
+                }
             }
         };
 
-        dialog = createDialog(props, picker, onConfirm, onCancel);
+        dialog = createDialog(props, picker, onConfirmCallback, onCancelCallback);
         dialog.show();
     }
 

android/src/newarch/java/com/henninghall/date_picker/DatePickerModule.java

@@ -2,6 +2,7 @@
 
 import androidx.annotation.NonNull;
 
+import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableMap;
 
@@ -28,8 +29,8 @@ public void removeListeners(double type) {
     }
 
     @Override
-    public void openPicker(ReadableMap props){
-        module.openPicker(props);
+    public void openPicker(ReadableMap props, Callback onConfirm, Callback onCancel){
+        module.openPicker(props, onConfirm, onCancel);
     }
 
     @Override

ios/RNDatePickerManager.h

@@ -8,7 +8,14 @@
 #import <React/RCTConvert.h>
 #import <React/RCTViewManager.h>
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <RNDatePickerSpecs/RNDatePickerSpecs.h>
+#endif
+
 @interface RNDatePickerManager : RCTViewManager
+#ifdef RCT_NEW_ARCH_ENABLED
+<NativeRNDatePickerSpec>
+#endif
 
 @property (strong, nonatomic) UIViewController *topViewController;
 

ios/RNDatePickerManager.mm

@@ -234,6 +234,22 @@ - (double) getPickerHeight :(UIView *) alertView
     return 216;
 }
 
+// New Architecture support - provide module instance to TurboModule system
+ (BOOL)requiresMainQueueSetup {
+    return NO;
+}
+
+#ifdef RCT_NEW_ARCH_ENABLED
+// Implement the Spec protocol methods required by TurboModule
+- (void)getConstants:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+    resolve(@{});
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params {
+    return std::make_shared<facebook::react::NativeRNDatePickerSpecJSI>(params);
+}
+#endif
+
 @end
 
 

src/DatePickerAndroid.js

@@ -67,9 +67,10 @@ export const DatePickerAndroid = React.memo((props) => {
     onStateChange: onSpinnerStateChanged,
   }
 
-  useModal({ props: modifiedProps, id: thisId })
-
-  if (props.modal) return null
+  if (props.modal){
+     useModal({ props: modifiedProps, id: thisId })
+     return null
+    }
 
   return <NativeComponent {...modifiedProps} />
 })

src/DatePickerIOS.js

@@ -28,9 +28,10 @@ export const DatePickerIOS = (props) => {
     theme: props.theme ? props.theme : 'auto',
   }
 
-  useModal({ props: modifiedProps, id: undefined })
-
-  if (props.modal) return null
+  if (props.modal){ 
+    useModal({ props: modifiedProps, id: undefined })
+    return null
+  }
 
   return (
     <NativeComponent

src/fabric/NativeRNDatePicker.ts

@@ -5,7 +5,7 @@ import { Double, UnsafeObject } from 'react-native/Libraries/Types/CodegenTypes'
 export interface Spec extends TurboModule {
   readonly getConstants: () => {}
   closePicker(): void
-  openPicker(props: UnsafeObject): void
+  openPicker(props: UnsafeObject, onConfirm: (result: UnsafeObject) => void, onCancel: () => void): void
   removeListeners(type: Double): void
   addListener(eventName: string): void
 }

src/modal.js

@@ -76,12 +76,7 @@ export const useModal = ({ props, id }) => {
   useEffect(() => {
     if (shouldOpenModal(props, previousProps)) {
       closing.current = false
-      const params = Platform.select({
-        android: [props],
-        ios: [props, onConfirm, onCancel],
-      })
-      if (!params) throw Error('Unsupported platform')
-      NativeModule.openPicker(...params)
+      NativeModule.openPicker(props, onConfirm, onCancel)
     }
   }, [onCancel, onConfirm, previousProps, props])