diff --git a/packages/react-native-avoid-softinput/android/src/newarch/java/com/reactnativeavoidsoftinput/AvoidSoftInputViewManager.kt b/packages/react-native-avoid-softinput/android/src/newarch/java/com/reactnativeavoidsoftinput/AvoidSoftInputViewManager.kt index 35b4cb9..e7453a5 100644 --- a/packages/react-native-avoid-softinput/android/src/newarch/java/com/reactnativeavoidsoftinput/AvoidSoftInputViewManager.kt +++ b/packages/react-native-avoid-softinput/android/src/newarch/java/com/reactnativeavoidsoftinput/AvoidSoftInputViewManager.kt @@ -30,9 +30,12 @@ class AvoidSoftInputViewManager : override fun prepareToRecycleView( reactContext: ThemedReactContext, view: ReactViewGroup - ): ReactViewGroup? { + ): ReactViewGroup { (view as AvoidSoftInputView).cleanup() - return super.prepareToRecycleView(reactContext, view) + + super.prepareToRecycleView(reactContext, view) + + return view } @ReactProp(name = "avoidOffset") diff --git a/packages/react-native-avoid-softinput/android/src/oldarch/java/com/reactnativeavoidsoftinput/AvoidSoftInputViewManager.kt b/packages/react-native-avoid-softinput/android/src/oldarch/java/com/reactnativeavoidsoftinput/AvoidSoftInputViewManager.kt index aefd517..6d8f5ff 100644 --- a/packages/react-native-avoid-softinput/android/src/oldarch/java/com/reactnativeavoidsoftinput/AvoidSoftInputViewManager.kt +++ b/packages/react-native-avoid-softinput/android/src/oldarch/java/com/reactnativeavoidsoftinput/AvoidSoftInputViewManager.kt @@ -22,9 +22,12 @@ class AvoidSoftInputViewManager : ReactViewManager() { override fun prepareToRecycleView( reactContext: ThemedReactContext, view: ReactViewGroup - ): ReactViewGroup? { + ): ReactViewGroup { (view as AvoidSoftInputView).cleanup() - return super.prepareToRecycleView(reactContext, view) + + super.prepareToRecycleView(reactContext, view) + + return view } @ReactProp(name = "avoidOffset")