react-native-keyboard-controller 1.21.7 → 1.21.8

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

@@ -31,6 +31,13 @@ import kotlin.math.abs
 private val TAG = KeyboardAnimationCallback::class.qualifiedName
 private val isResizeHandledInCallbackMethods = Keyboard.IS_ANIMATION_EMULATED
 
+private data class PendingKeyboardStartEvent(
+  val keyboardHeight: Double,
+  val progress: Double,
+  val duration: Int,
+  val target: Int,
+)
+
 data class KeyboardAnimationCallbackConfig(
   val persistentInsetTypes: Int,
   val deferredInsetTypes: Int,
@@ -63,6 +70,7 @@ class KeyboardAnimationCallback(
   private var isTransitioning = false
   private var duration = 0
   private var viewTagFocused = -1
+  private var pendingStartEvent: PendingKeyboardStartEvent? = null
   private var animationsToSkip = hashSetOf<WindowInsetsAnimationCompat>()
   private val isKeyboardInteractive: Boolean
     get() = duration == -1
@@ -177,6 +185,7 @@ class KeyboardAnimationCallback(
     }
 
     isTransitioning = true
+    pendingStartEvent = null
     isKeyboardVisible = isKeyboardVisible()
     duration = animation.durationMillis.toInt()
     val keyboardHeight = getCurrentKeyboardHeight()
@@ -205,18 +214,16 @@ class KeyboardAnimationCallback(
     )
 
     Logger.i(TAG, "HEIGHT:: $keyboardHeight TAG:: $viewTagFocused")
-    context.dispatchEvent(
-      eventPropagationView.id,
-      KeyboardTransitionEvent(
-        surfaceId,
-        eventPropagationView.id,
-        KeyboardTransitionEvent.Start,
+    // AOSP calls app onStart before its internal listener.onReady. Dispatching
+    // a RN event here lets Reanimated synchronously mutate Fabric and can
+    // cancel the pending IME controller before Android starts its animator.
+    pendingStartEvent =
+      PendingKeyboardStartEvent(
         keyboardHeight,
         if (!isKeyboardVisible) 0.0 else 1.0,
         duration,
         viewTagFocused,
-      ),
-    )
+      )
 
     return super.onStart(animation, bounds)
   }
@@ -265,24 +272,27 @@ class KeyboardAnimationCallback(
       "DiffY: $diffY $height $progress ${InteractiveKeyboardProvider.isInteractive} $viewTagFocused",
     )
 
-    val event =
-      if (InteractiveKeyboardProvider.isInteractive) {
-        KeyboardTransitionEvent.Interactive
-      } else {
-        KeyboardTransitionEvent.Move
-      }
-    context.dispatchEvent(
-      eventPropagationView.id,
-      KeyboardTransitionEvent(
-        surfaceId,
+    flushPendingStartEvent()
+    if (isTransitioning) {
+      val event =
+        if (InteractiveKeyboardProvider.isInteractive) {
+          KeyboardTransitionEvent.Interactive
+        } else {
+          KeyboardTransitionEvent.Move
+        }
+      context.dispatchEvent(
         eventPropagationView.id,
-        event,
-        height,
-        progress,
-        duration,
-        viewTagFocused,
-      ),
-    )
+        KeyboardTransitionEvent(
+          surfaceId,
+          eventPropagationView.id,
+          event,
+          height,
+          progress,
+          duration,
+          viewTagFocused,
+        ),
+      )
+    }
 
     return insets
   }
@@ -306,10 +316,13 @@ class KeyboardAnimationCallback(
 
         if (animation in animationsToSkip) {
           duration = 0
+          pendingStartEvent = null
           animationsToSkip.remove(animation)
           return@Runnable
         }
 
+        flushPendingStartEvent()
+
         context.emitEvent(
           "KeyboardController::" + if (!isKeyboardVisible) "keyboardDidHide" else "keyboardDidShow",
           getEventParams(keyboardHeight),
@@ -352,6 +365,7 @@ class KeyboardAnimationCallback(
     prevKeyboardHeight = keyboardHeight
     isTransitioning = false
     duration = 0
+    pendingStartEvent = null
 
     context.emitEvent(
       "KeyboardController::" + if (!isKeyboardVisible) "keyboardDidHide" else "keyboardDidShow",
@@ -375,6 +389,7 @@ class KeyboardAnimationCallback(
   }
 
   fun destroy() {
+    pendingStartEvent = null
     view.viewTreeObserver.removeOnGlobalFocusChangeListener(focusListener)
     layoutObserver?.destroy()
   }
@@ -430,6 +445,24 @@ class KeyboardAnimationCallback(
     return (keyboardHeight - navigationBar).toFloat().dp.coerceAtLeast(0.0)
   }
 
+  private fun flushPendingStartEvent() {
+    val event = pendingStartEvent ?: return
+
+    pendingStartEvent = null
+    context.dispatchEvent(
+      eventPropagationView.id,
+      KeyboardTransitionEvent(
+        surfaceId,
+        eventPropagationView.id,
+        KeyboardTransitionEvent.Start,
+        event.keyboardHeight,
+        event.progress,
+        event.duration,
+        event.target,
+      ),
+    )
+  }
+
   private fun getEventParams(height: Double): WritableMap {
     val params: WritableMap = Arguments.createMap()
     params.putDouble("height", height)

package/ios/observers/movement/KeyboardViewLocator.swift

@@ -7,7 +7,7 @@
 
 final class KeyboardViewLocator {
   static let shared = KeyboardViewLocator()
-  private var cachedKeyboardView: UIView?
+  private weak var cachedKeyboardView: UIView?
   private var cachedWindowsCount: Int = 0
 
   func resolve() -> UIView? {

package/ios/views/ClippingScrollViewDecoratorViewManager.mm

@@ -16,6 +16,7 @@
 #import "RCTFabricComponentsPlugins.h"
 #endif
 
+#import <TargetConditionals.h>
 #import <UIKit/UIKit.h>
 #import <objc/runtime.h>
 
@@ -213,11 +214,16 @@ RCT_EXPORT_VIEW_PROPERTY(applyWorkaroundForContentInsetHitTestBug, BOOL)
 {
   [super didMoveToWindow];
   if (self.window) {
+#if TARGET_OS_MACCATALYST
+    // Catalyst UIScrollView is AppKit-backed; avoid runtime subclassing it.
+    return;
+#else
     UIScrollView *scrollView = KCFindFirstScrollView(self);
     KCApplyNoopScrollRectToVisible(scrollView);
     if (self.applyWorkaroundForContentInsetHitTestBug) {
       KCApplyFixedHitTest(scrollView);
     }
+#endif
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-keyboard-controller",
-  "version": "1.21.7",
+  "version": "1.21.8",
   "description": "Keyboard manager which works in identical way on both iOS and Android",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",