react-native-keyboard-controller 1.17.4 → 1.18.0

package/android/src/main/res/values/colors.xml

@@ -0,0 +1,35 @@
+<resources>
+  <style name="aosp_light">
+    <item name="color">#ebeff1</item>
+  </style>
+  <style name="gboard_dark">
+    <item name="color">#1c1c2c</item>
+  </style>
+  <style name="gboard_light">
+    <item name="color">#ebeff1</item>
+  </style>
+  <style name="gboard_tts_dark">
+    <item name="color">#202124</item>
+  </style>
+  <style name="gboard_tts_light">
+    <item name="color">#f8f9fa</item>
+  </style>
+  <style name="swiftkey_dark">
+    <item name="color">#141414</item>
+  </style>
+  <style name="swiftkey_light">
+    <item name="color">#f1f1f1</item>
+  </style>
+  <style name="yandex_dark">
+    <item name="color">#1a1b20</item>
+  </style>
+  <style name="yandex_light">
+    <item name="color">#eeedf4</item>
+  </style>
+  <style name="samsung_dark">
+    <item name="color">#080808</item>
+  </style>
+  <style name="samsung_light">
+    <item name="color">#e4e4e4</item>
+  </style>
+</resources>

package/android/src/main/res/values-v29/colors.xml

@@ -0,0 +1,5 @@
+<resources>
+  <style name="gboard_tts_light">
+    <item name="color">#ebeff1</item>
+  </style>
+</resources>

package/android/src/main/res/values-v30/colors.xml

@@ -0,0 +1,17 @@
+<resources>
+  <style name="gboard_dark">
+    <item name="color">#292e32</item>
+  </style>
+  <style name="gboard_light">
+    <item name="color">#e8eaed</item>
+  </style>
+  <style name="gboard_tts_light">
+    <item name="color">#f8f9fa</item>
+  </style>
+  <style name="yandex_dark">
+    <item name="color">#121212</item>
+  </style>
+  <style name="yandex_light">
+    <item name="color">#eaeef2</item>
+  </style>
+</resources>

package/android/src/main/res/values-v33/colors.xml

@@ -0,0 +1,16 @@
+<resources>
+  <style name="gboard_dark">
+    <item name="color">@android:color/system_neutral1_900</item>
+  </style>
+  <style name="gboard_light">
+    <item name="color">@android:color/system_neutral1_50</item>
+  </style>
+  <style name="yandex_dark">
+    <item name="color">@android:color/system_neutral2_900</item>
+    <!-- TODO: doesn't match -->
+  </style>
+  <style name="yandex_light">
+    <item name="color">@android:color/system_neutral2_50</item>
+    <!-- TODO: doesn't match -->
+  </style>
+</resources>

package/android/src/main/res/values-v34/colors.xml

@@ -0,0 +1,18 @@
+<resources>
+  <style name="gboard_dark">
+    <item name="color">@android:color/system_neutral1_900</item>
+  </style>
+  <style name="gboard_light">
+    <item name="color">@android:color/system_neutral1_50</item>
+  </style>
+  <style name="yandex_dark">
+    <item name="color">@android:color/system_neutral1_900</item>
+  </style>
+  <style name="yandex_light">
+    <item name="color">@android:color/system_neutral1_50</item>
+    <item name="tone">-3</item>
+  </style>
+  <style name="samsung_dark">
+    <item name="color">#030303</item>
+  </style>
+</resources>

package/android/src/main/res/values-v35/colors.xml

@@ -0,0 +1,10 @@
+<resources>
+  <style name="gboard_dark">
+    <item name="color">@android:color/system_neutral1_900</item>
+    <item name="tone">4</item>
+  </style>
+  <style name="gboard_light">
+    <item name="color">@android:color/system_neutral1_50</item>
+    <item name="tone">-3</item>
+  </style>
+</resources>

package/android/src/paper/java/com/reactnativekeyboardcontroller/KeyboardBackgroundViewManager.kt

@@ -0,0 +1,15 @@
+package com.reactnativekeyboardcontroller
+
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.views.view.ReactViewManager
+import com.reactnativekeyboardcontroller.managers.KeyboardBackgroundViewManagerImpl
+import com.reactnativekeyboardcontroller.views.background.KeyboardBackgroundViewGroup
+
+class KeyboardBackgroundViewManager : ReactViewManager() {
+  private val manager = KeyboardBackgroundViewManagerImpl()
+
+  override fun getName(): String = KeyboardBackgroundViewManagerImpl.NAME
+
+  override fun createViewInstance(reactContext: ThemedReactContext): KeyboardBackgroundViewGroup =
+    manager.createViewInstance(reactContext)
+}

package/android/src/paper/java/com/reactnativekeyboardcontroller/KeyboardControllerModule.kt

@@ -22,6 +22,11 @@ class KeyboardControllerModule(
     module.setDefaultMode()
   }
 
+  @ReactMethod
+  fun preload() {
+    module.preload()
+  }
+
   @ReactMethod
   fun dismiss(keepFocus: Boolean) {
     module.dismiss(keepFocus)

package/android/src/paper/java/com/reactnativekeyboardcontroller/KeyboardControllerViewManager.kt

@@ -1,6 +1,5 @@
 package com.reactnativekeyboardcontroller
 
-import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.views.view.ReactViewGroup
@@ -8,10 +7,8 @@ import com.facebook.react.views.view.ReactViewManager
 import com.reactnativekeyboardcontroller.managers.KeyboardControllerViewManagerImpl
 import com.reactnativekeyboardcontroller.views.EdgeToEdgeReactViewGroup
 
-class KeyboardControllerViewManager(
-  mReactContext: ReactApplicationContext,
-) : ReactViewManager() {
-  private val manager = KeyboardControllerViewManagerImpl(mReactContext)
+class KeyboardControllerViewManager : ReactViewManager() {
+  private val manager = KeyboardControllerViewManagerImpl()
 
   // region Lifecycle
   override fun createViewInstance(context: ThemedReactContext): ReactViewGroup = manager.createViewInstance(context)

package/android/src/paper/java/com/reactnativekeyboardcontroller/KeyboardGestureAreaViewManager.kt

@@ -1,16 +1,13 @@
 package com.reactnativekeyboardcontroller
 
-import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.views.view.ReactViewManager
 import com.reactnativekeyboardcontroller.managers.KeyboardGestureAreaViewManagerImpl
 import com.reactnativekeyboardcontroller.views.KeyboardGestureAreaReactViewGroup
 
-class KeyboardGestureAreaViewManager(
-  mReactContext: ReactApplicationContext,
-) : ReactViewManager() {
-  private val manager = KeyboardGestureAreaViewManagerImpl(mReactContext)
+class KeyboardGestureAreaViewManager : ReactViewManager() {
+  private val manager = KeyboardGestureAreaViewManagerImpl()
 
   override fun getName(): String = KeyboardGestureAreaViewManagerImpl.NAME
 

package/android/src/paper/java/com/reactnativekeyboardcontroller/OverKeyboardViewManager.kt

@@ -1,6 +1,5 @@
 package com.reactnativekeyboardcontroller
 
-import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
@@ -9,10 +8,8 @@ import com.reactnativekeyboardcontroller.managers.OverKeyboardViewManagerImpl
 import com.reactnativekeyboardcontroller.views.overlay.OverKeyboardHostShadowNode
 import com.reactnativekeyboardcontroller.views.overlay.OverKeyboardHostView
 
-class OverKeyboardViewManager(
-  mReactContext: ReactApplicationContext,
-) : ViewGroupManager<OverKeyboardHostView>() {
-  private val manager = OverKeyboardViewManagerImpl(mReactContext)
+class OverKeyboardViewManager : ViewGroupManager<OverKeyboardHostView>() {
+  private val manager = OverKeyboardViewManagerImpl()
 
   override fun getName(): String = OverKeyboardViewManagerImpl.NAME
 

package/android/src/paper/java/com/reactnativekeyboardcontroller/StatusBarManagerCompatModule.kt

@@ -5,7 +5,7 @@ import androidx.annotation.RequiresApi
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
-import com.reactnativekeyboardcontroller.modules.StatusBarManagerCompatModuleImpl
+import com.reactnativekeyboardcontroller.modules.statusbar.StatusBarManagerCompatModuleImpl
 
 class StatusBarManagerCompatModule(
   mReactContext: ReactApplicationContext,
@@ -14,6 +14,8 @@ class StatusBarManagerCompatModule(
 
   override fun getName(): String = StatusBarManagerCompatModuleImpl.NAME
 
+  override fun getConstants(): MutableMap<String, Any>? = module.getConstants()
+
   @ReactMethod
   private fun setHidden(hidden: Boolean) {
     module.setHidden(hidden)

package/android/src/turbo/java/com/reactnativekeyboardcontroller/KeyboardControllerPackage.kt

@@ -7,7 +7,7 @@ import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 import com.reactnativekeyboardcontroller.modules.KeyboardControllerModuleImpl
-import com.reactnativekeyboardcontroller.modules.StatusBarManagerCompatModuleImpl
+import com.reactnativekeyboardcontroller.modules.statusbar.StatusBarManagerCompatModuleImpl
 
 class KeyboardControllerPackage : TurboReactPackage() {
   override fun getModule(
@@ -45,7 +45,7 @@ class KeyboardControllerPackage : TurboReactPackage() {
         ReactModuleInfo(
           StatusBarManagerCompatModuleImpl.NAME,
           StatusBarManagerCompatModuleImpl.NAME,
-          false, // canOverrideExistingModule
+          true, // canOverrideExistingModule
           false, // needsEagerInit
           true, // hasConstants
           false, // isCxxModule
@@ -56,8 +56,8 @@ class KeyboardControllerPackage : TurboReactPackage() {
 
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> =
     listOf(
-      KeyboardControllerViewManager(reactContext),
-      KeyboardGestureAreaViewManager(reactContext),
-      OverKeyboardViewManager(reactContext),
+      KeyboardControllerViewManager(),
+      KeyboardGestureAreaViewManager(),
+      OverKeyboardViewManager(),
     )
 }

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardBackgroundViewComponentDescriptor.h

@@ -0,0 +1,27 @@
+//
+//  RNKCKeyboardBackgroundViewComponentDescriptor.h
+//  Pods
+//
+//  Created by Kiryl Ziusko on 18/05/2025.
+//
+
+#pragma once
+
+#include "RNKCKeyboardBackgroundViewShadowNode.h"
+
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook::react {
+class KeyboardBackgroundViewComponentDescriptor final
+    : public ConcreteComponentDescriptor<KeyboardBackgroundViewShadowNode> {
+ public:
+  using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+  void adopt(ShadowNode &shadowNode) const override {
+    react_native_assert(dynamic_cast<KeyboardBackgroundViewShadowNode *>(&shadowNode));
+    ConcreteComponentDescriptor::adopt(shadowNode);
+  }
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardBackgroundViewShadowNode.cpp

@@ -0,0 +1,14 @@
+//
+//  RNKCKeyboardBackgroundViewShadowNode.cpp
+//  Pods
+//
+//  Created by Kiryl Ziusko on 18/05/2025.
+//
+
+#include "RNKCKeyboardBackgroundViewShadowNode.h"
+
+namespace facebook::react {
+
+extern const char KeyboardBackgroundViewComponentName[] = "KeyboardBackgroundView";
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardBackgroundViewShadowNode.h

@@ -0,0 +1,30 @@
+//
+//  RNKCKeyboardBackgroundViewShadowNode.h
+//  Pods
+//
+//  Created by Kiryl Ziusko on 18/05/2025.
+//
+
+#pragma once
+
+#include "RNKCKeyboardBackgroundViewState.h"
+
+#include <react/renderer/components/reactnativekeyboardcontroller/EventEmitters.h>
+#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <jsi/jsi.h>
+
+namespace facebook::react {
+
+JSI_EXPORT extern const char KeyboardBackgroundViewComponentName[];
+
+/*
+ * `ShadowNode` for <KeyboardBackgroundView> component.
+ */
+using KeyboardBackgroundViewShadowNode = ConcreteViewShadowNode<
+    KeyboardBackgroundViewComponentName,
+    KeyboardBackgroundViewProps,
+    KeyboardBackgroundViewEventEmitter,
+    KeyboardBackgroundViewState>;
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardBackgroundViewState.h

@@ -0,0 +1,28 @@
+//
+//  RNKCKeyboardBackgroundViewState.h
+//  Pods
+//
+//  Created by Kiryl Ziusko on 18/05/2025.
+//
+
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#endif
+
+namespace facebook::react {
+
+class KeyboardBackgroundViewState {
+ public:
+  KeyboardBackgroundViewState() = default;
+
+#ifdef ANDROID
+  KeyboardBackgroundViewState(KeyboardBackgroundViewState const &previousState, folly::dynamic data) {}
+  folly::dynamic getDynamic() const {
+    return {};
+  }
+#endif
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardExtenderComponentDescriptor.h

@@ -0,0 +1,27 @@
+//
+//  RNKCKeyboardExtenderComponentDescriptor.h
+//  Pods
+//
+//  Created by Kiryl Ziusko on 25/06/2025.
+//
+
+#pragma once
+
+#include "RNKCKeyboardExtenderShadowNode.h"
+
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook::react {
+class KeyboardExtenderComponentDescriptor final
+    : public ConcreteComponentDescriptor<KeyboardExtenderShadowNode> {
+ public:
+  using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+  void adopt(ShadowNode &shadowNode) const override {
+    react_native_assert(dynamic_cast<KeyboardExtenderShadowNode *>(&shadowNode));
+    ConcreteComponentDescriptor::adopt(shadowNode);
+  }
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardExtenderShadowNode.cpp

@@ -0,0 +1,14 @@
+//
+//  RNKCKeyboardExtenderShadowNode.cpp
+//  Pods
+//
+//  Created by Kiryl Ziusko on 25/06/2025.
+//
+
+#include "RNKCKeyboardExtenderShadowNode.h"
+
+namespace facebook::react {
+
+extern const char KeyboardExtenderComponentName[] = "KeyboardExtender";
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardExtenderShadowNode.h

@@ -0,0 +1,30 @@
+//
+//  RNKCKeyboardExtenderShadowNode.h
+//  Pods
+//
+//  Created by Kiryl Ziusko on 25/06/2025.
+//
+
+#pragma once
+
+#include "RNKCKeyboardExtenderState.h"
+
+#include <react/renderer/components/reactnativekeyboardcontroller/EventEmitters.h>
+#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <jsi/jsi.h>
+
+namespace facebook::react {
+
+JSI_EXPORT extern const char KeyboardExtenderComponentName[];
+
+/*
+ * `ShadowNode` for <KeyboardExtender> component.
+ */
+using KeyboardExtenderShadowNode = ConcreteViewShadowNode<
+    KeyboardExtenderComponentName,
+    KeyboardExtenderProps,
+    KeyboardExtenderEventEmitter,
+    KeyboardExtenderState>;
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardExtenderState.h

@@ -0,0 +1,28 @@
+//
+//  RNKCKeyboardExtenderState.h
+//  Pods
+//
+//  Created by Kiryl Ziusko on 25/06/2025.
+//
+
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#endif
+
+namespace facebook::react {
+
+class KeyboardExtenderState {
+ public:
+  KeyboardExtenderState() = default;
+
+#ifdef ANDROID
+  KeyboardExtenderState(KeyboardExtenderState const &previousState, folly::dynamic data) {}
+  folly::dynamic getDynamic() const {
+    return {};
+  }
+#endif
+};
+
+} // namespace facebook::react

package/ios/KeyboardControllerModule.mm

@@ -67,6 +67,15 @@ RCT_EXPORT_METHOD(setInputMode : (nonnull NSNumber *)mode)
 {
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)preload
+#else
+RCT_EXPORT_METHOD(preload)
+#endif
+{
+  [UIResponder preloadKeyboardIfNeeded];
+}
+
 #ifdef RCT_NEW_ARCH_ENABLED
 - (void)dismiss:(BOOL)keepFocus
 #else

package/ios/delegates/KCTextInputCompositeDelegate.swift

@@ -54,7 +54,7 @@ class KCTextInputCompositeDelegate: NSObject, UITextViewDelegate, UITextFieldDel
   // Keep track of which textField we’re observing (iOS < 13 only)
   private weak var observedTextFieldForSelection: UITextField?
 
-  public init(
+  init(
     onSelectionChange: @escaping (_ event: NSDictionary) -> Void,
     onTextChange: @escaping (_ text: String?) -> Void
   ) {
@@ -64,7 +64,7 @@ class KCTextInputCompositeDelegate: NSObject, UITextViewDelegate, UITextFieldDel
 
   // MARK: setters/getters
 
-  public func setTextViewDelegate(delegate: UITextViewDelegate?) {
+  func setTextViewDelegate(delegate: UITextViewDelegate?) {
     // remove KVO from any old textView
     if let oldTextField = observedTextFieldForSelection {
       removeSelectionRangeObserver(from: oldTextField)
@@ -75,7 +75,7 @@ class KCTextInputCompositeDelegate: NSObject, UITextViewDelegate, UITextFieldDel
     observedTextFieldForSelection = nil
   }
 
-  public func setTextFieldDelegate(delegate: UITextFieldDelegate?, textField: UITextField?) {
+  func setTextFieldDelegate(delegate: UITextFieldDelegate?, textField: UITextField?) {
     // remove KVO from any old textField
     if let oldTextField = observedTextFieldForSelection {
       removeSelectionRangeObserver(from: oldTextField)
@@ -96,7 +96,7 @@ class KCTextInputCompositeDelegate: NSObject, UITextViewDelegate, UITextFieldDel
     }
   }
 
-  public func canSubstituteTextFieldDelegate(delegate: UITextFieldDelegate?) -> Bool {
+  func canSubstituteTextFieldDelegate(delegate: UITextFieldDelegate?) -> Bool {
     let type = String(describing: delegate)
     if type.range(of: "SQIPTextFieldInputModifier") != nil {
       // SQIPTextFieldInputModifier is a private class used internally by Square.
@@ -112,7 +112,7 @@ class KCTextInputCompositeDelegate: NSObject, UITextViewDelegate, UITextFieldDel
   }
 
   // Getter for the active delegate
-  public var activeDelegate: AnyObject? {
+  var activeDelegate: AnyObject? {
     return textViewDelegate ?? textFieldDelegate
   }
 

package/ios/events/KeyboardEventEmitterPayload.swift

@@ -17,7 +17,7 @@ public func buildEventParams(_ height: Double, _ duration: Int, _ tag: NSNumber)
   data["timestamp"] = Date.currentTimeStamp
   data["target"] = tag
   data["type"] = input?.keyboardType.name ?? "default"
-  data["appearance"] = input?.keyboardAppearance.name ?? "default"
+  data["appearance"] = input?.keyboardAppearanceValue ?? "light"
 
   return data
 }

package/ios/extensions/String.swift

@@ -0,0 +1,12 @@
+//
+//  String.swift
+//  Pods
+//
+//  Created by Kiryl Ziusko on 10/06/2025.
+//
+
+public extension String {
+  func hasAnyPrefix(_ prefixes: [String]) -> Bool {
+    prefixes.contains { hasPrefix($0) }
+  }
+}

package/ios/extensions/UIResponder.swift

@@ -63,3 +63,30 @@ public extension Optional where Wrapped: UIResponder {
     return -1
   }
 }
+
+@objc
+public extension UIResponder {
+  private static var hasPreloadedKeyboard = false
+  static var isKeyboardPreloading = false
+
+  /// Preloads the keyboard UI to reduce first-time lag when showing a keyboard.
+  /// https://stackoverflow.com/questions/9357026/super-slow-lag-delay-on-initial-keyboard-animation-of-uitextfield/20436797#20436797
+  static func preloadKeyboardIfNeeded() {
+    guard !hasPreloadedKeyboard else { return }
+    hasPreloadedKeyboard = true
+    isKeyboardPreloading = true
+
+    DispatchQueue.main.async {
+      defer { isKeyboardPreloading = false }
+      guard let window = UIApplication.shared.activeWindow else { return }
+
+      let lagFreeField = UITextField(frame: .zero)
+      lagFreeField.isHidden = true
+      window.addSubview(lagFreeField)
+
+      lagFreeField.becomeFirstResponder()
+      lagFreeField.resignFirstResponder()
+      lagFreeField.removeFromSuperview()
+    }
+  }
+}

package/ios/interactive/KeyboardAreaExtender.swift

@@ -8,7 +8,7 @@
 class KeyboardAreaExtender: NSObject {
   private var currentInputAccessoryView: InvisibleInputAccessoryView?
 
-  @objc public static let shared = KeyboardAreaExtender()
+  @objc static let shared = KeyboardAreaExtender()
 
   override private init() {
     super.init()
@@ -24,11 +24,11 @@ class KeyboardAreaExtender: NSObject {
     NotificationCenter.default.removeObserver(self)
   }
 
-  public var offset: CGFloat {
+  var offset: CGFloat {
     return currentInputAccessoryView?.frame.height ?? 0
   }
 
-  public func hide() {
+  func hide() {
     if isVisible {
       NotificationCenter.default.post(
         name: .shouldIgnoreKeyboardEvents, object: nil, userInfo: ["ignore": true]
@@ -37,11 +37,11 @@ class KeyboardAreaExtender: NSObject {
     }
   }
 
-  public func remove() {
+  func remove() {
     currentInputAccessoryView = nil
   }
 
-  public func updateHeight(to newHeight: CGFloat, for nativeID: String) {
+  func updateHeight(to newHeight: CGFloat, for nativeID: String) {
     if UIResponder.current.nativeID == nativeID {
       currentInputAccessoryView?.updateHeight(to: newHeight)
     }

package/ios/observers/FocusedInputObserver.swift

@@ -140,6 +140,11 @@ public class FocusedInputObserver: NSObject {
     currentInput = currentResponder?.superview as UIView?
 
     setupObservers()
+    // dispatch onSelectionChange on focus
+    if let textInput = responder as? UITextInput {
+      updateSelectionPosition(textInput: textInput, sendEvent: onSelectionChange)
+    }
+
     syncUpLayout()
 
     FocusedInputHolder.shared.set(currentResponder as? TextInput)
@@ -211,7 +216,15 @@ public class FocusedInputObserver: NSObject {
         self.onLayoutChange(view: view, change: change)
       }
 
-      substituteDelegate(currentResponder)
+      // Substitute a delegate in the next frame.
+      // This is only applicable if the autoFocus prop is true.
+      // Other libraries (e.g., decorator views) might mount *after* the
+      // TextInput and inject their own delegates at that point.
+      // If we substitute our delegate too early (e.g., during autoFocus), and later restore it when the keyboard hides,
+      // we may accidentally overwrite a delegate injected by another library — breaking its logic.
+      DispatchQueue.main.async {
+        self.substituteDelegate(self.currentResponder)
+      }
     }
   }
 
@@ -240,10 +253,6 @@ public class FocusedInputObserver: NSObject {
         textView.setForceDelegate(delegate)
       }
     }
-    // dispatch onSelectionChange on focus
-    if let textInput = input as? UITextInput {
-      updateSelectionPosition(textInput: textInput, sendEvent: onSelectionChange)
-    }
   }
 
   private func substituteDelegateBack(_ input: UIResponder?) {