fix: modal conflicts

Author: kirillzyusko

android/src/main/java/com/reactnativekeyboardcontroller/listeners/KeyboardAnimationCallback.kt

@@ -50,6 +50,7 @@ class KeyboardAnimationCallback(
   val view: View,
   val context: ThemedReactContext?,
   private val config: KeyboardAnimationCallbackConfig,
+  private val source: KeyboardAnimationCallback? = null,
 ) : WindowInsetsAnimationCompat.Callback(config.dispatchMode),
   OnApplyWindowInsetsListener,
   Suspendable {
@@ -67,6 +68,13 @@ class KeyboardAnimationCallback(
     get() = duration == -1
   override var isSuspended: Boolean = false
 
+  init {
+    if (source != null) {
+      this.persistentKeyboardHeight = source.persistentKeyboardHeight
+      this.prevKeyboardHeight = source.prevKeyboardHeight
+    }
+  }
+
   // listeners
   private val focusListener =
     OnGlobalFocusChangeListener { oldFocus, newFocus ->
@@ -165,13 +173,13 @@ class KeyboardAnimationCallback(
       return insets
     }
 
-    // always verify insets, because sometimes default lifecycles may not be invoked
-    // (when we press "Share" on Android 16, for example)
+    // always verify insets, because sometimes default lifecycle methods may not be invoked
+    // (when we press "Share" on Android 16, when Modal closes keyboard, etc.)
     val newHeight = getCurrentKeyboardHeight(insets)
-    if (prevKeyboardHeight != newHeight && !isTransitioning) {
+    if (prevKeyboardHeight != newHeight && !isMoving && !isSuspended) {
       Logger.w(
         TAG,
-        "detected desynchronized state - force updating it. $prevKeyboardHeight -> $newHeight"
+        "detected desynchronized state - force updating it. $prevKeyboardHeight -> $newHeight. Modal ${this.source}",
       )
       this.syncKeyboardPosition(newHeight, newHeight > 0)
     }

android/src/main/java/com/reactnativekeyboardcontroller/modal/ModalAttachedWatcher.kt

@@ -35,6 +35,7 @@ class ModalAttachedWatcher(
       return
     }
 
+    val cb = this.callback()
     val modal =
       try {
         uiManager?.resolveView(event.viewTag) as? ReactModalHostView
@@ -46,6 +47,9 @@ class ModalAttachedWatcher(
     if (modal == null) {
       return
     }
+    if (cb == null) {
+      return
+    }
 
     val dialog = modal.dialog
     val window = dialog?.window
@@ -62,6 +66,7 @@ class ModalAttachedWatcher(
           eventPropagationView = view,
           context = reactContext,
           config = config,
+          source = cb,
         )
 
       rootView.addView(eventView)
@@ -70,28 +75,21 @@ class ModalAttachedWatcher(
         // on Android < 12 all events for `WindowInsetsAnimationCallback`
         // go through main `rootView`, so we don't need to stop main
         // callback - otherwise keyboard transitions will not be animated
-        this.callback()?.suspend(true)
+        cb.suspend(true)
         // attaching callback to Modal on Android < 12 can cause ghost animations, see: https://github.com/kirillzyusko/react-native-keyboard-controller/pull/718
         // and overall attaching additional callbacks (if animation events go through the main window) is not necessary
         ViewCompat.setWindowInsetsAnimationCallback(rootView, callback)
         ViewCompat.setOnApplyWindowInsetsListener(eventView, callback)
-
-        // when modal is shown then keyboard will be hidden by default
-        //
-        // - if events are coming from main window - then keyboard position
-        //   will be synchronized from main window callback
-        // - if events are coming from modal window - then we need to update
-        //   position ourself, because callback can be attached after keyboard
-        //   auto-dismissal and we may miss some events and keyboard position
-        //   will be outdated
-        callback.syncKeyboardPosition(0.0, false)
       }
 
       dialog?.setOnDismissListener {
         callback.syncKeyboardPosition()
         callback.destroy()
         eventView.removeSelf()
-        this.callback()?.suspend(false)
+        // un-pause it in next frame because straight away `onApplyWindowInsets` will be called
+        view.post {
+          this.callback()?.suspend(false)
+        }
       }
 
       // imitating edge-to-edge mode behavior

cspell.json

@@ -170,7 +170,8 @@
     "Pixelfed",
     "Kwai",
     "Kwibo",
-    "revolut"
+    "revolut",
+    "desynchronized"
   ],
   "ignorePaths": [
     "node_modules",