Dismiss android pickers on react component unmount

android/src/main/java/com/reactcommunity/rndatetimepicker/RNDatePickerDialogModule.java

@@ -84,6 +84,25 @@ public void onClick(DialogInterface dialog, int which) {
     }
   }
 
+  @ReactMethod
+  public void close(Promise promise) {
+    FragmentActivity activity = (FragmentActivity) getCurrentActivity();
+    if (activity == null) {
+      promise.reject(
+              RNConstants.ERROR_NO_ACTIVITY,
+              "Tried to close a DatePicker dialog while not attached to an Activity");
+      return;
+    }
+
+    FragmentManager fragmentManager = activity.getSupportFragmentManager();
+    final RNDatePickerDialogFragment oldFragment = (RNDatePickerDialogFragment) fragmentManager.findFragmentByTag(FRAGMENT_TAG);
+
+    if (oldFragment != null) {
+      oldFragment.dismiss();
+    }
+
+    promise.resolve(null);
+  }
   /**
    * Show a date picker dialog.
    *

android/src/main/java/com/reactcommunity/rndatetimepicker/RNTimePickerDialogModule.java

@@ -83,6 +83,26 @@ public void onClick(DialogInterface dialog, int which) {
     }
   }
 
+  @ReactMethod
+  public void close(Promise promise) {
+    FragmentActivity activity = (FragmentActivity) getCurrentActivity();
+    if (activity == null) {
+      promise.reject(
+              RNConstants.ERROR_NO_ACTIVITY,
+              "Tried to close a TimePicker dialog while not attached to an Activity");
+      return;
+    }
+
+    FragmentManager fragmentManager = activity.getSupportFragmentManager();
+    final RNTimePickerDialogFragment oldFragment = (RNTimePickerDialogFragment) fragmentManager.findFragmentByTag(FRAGMENT_TAG);
+
+    if (oldFragment != null) {
+      oldFragment.dismiss();
+    }
+
+    promise.resolve(null);
+  }
+
   @ReactMethod
   public void open(@Nullable final ReadableMap options, Promise promise) {
 

src/datepicker.android.js

@@ -42,6 +42,10 @@ export default class DatePickerAndroid {
     return NativeModules.RNDatePickerAndroid.open(options);
   }
 
+  static async close(): Promise<null> {
+    return NativeModules.RNDatePickerAndroid.close();
+  }
+
   /**
    * A date has been selected.
    */

src/datetimepicker.android.js

@@ -15,6 +15,7 @@ import {
 } from './constants';
 import pickers from './picker';
 import invariant from 'invariant';
+import {useEffect} from 'react';
 
 import type {AndroidEvent, AndroidNativeProps} from './types';
 
@@ -66,6 +67,12 @@ export default function RNDateTimePicker(props: AndroidNativeProps) {
       break;
   }
 
+  useEffect(() => {
+    // This effect runs on unmount, and will ensure the picker is closed.
+    // This allows for controlling the opening state of the picker through declarative logic in jsx.
+    return () => (pickers[mode] ?? pickers[MODE_DATE]).close();
+  }, [mode]);
+
   picker.then(
     function resolve({action, day, month, year, minute, hour}) {
       const date = new Date(value);

src/timepicker.android.js

@@ -40,6 +40,10 @@ export default class TimePickerAndroid {
     return NativeModules.RNTimePickerAndroid.open(options);
   }
 
+  static async close(): Promise<null> {
+    return NativeModules.RNDatePickerAndroid.close();
+  }
+
   /**
    * A time has been selected.
    */