react-native-keyboard-controller 1.21.12 → 1.21.13

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

@@ -106,7 +106,7 @@ class FocusedInputObserver(
           // remove it asynchronously to avoid crash in stripe input
           // see https://github.com/stripe/stripe-android/issues/10178
           input.post {
-            input.removeTextChangedListener(watcher)
+            watcher?.let { input.removeTextChangedListener(it) }
           }
         }
         selectionSubscription?.invoke()

package/ios/core/KeyboardControllerConfiguration.swift

@@ -0,0 +1,16 @@
+//
+//  KeyboardControllerConfiguration.swift
+//  Pods
+//
+//  Created by Kiryl Ziusko on 25/06/2026.
+//
+
+enum KeyboardControllerConfiguration {
+  static var usesKeyboardLayoutGuideTracking: Bool {
+    if #available(iOS 26.0, *) {
+      return true
+    }
+
+    return false
+  }
+}

package/ios/delegates/KCTextInputCompositeDelegate.swift

@@ -65,7 +65,7 @@ class KCTextInputCompositeDelegate: NSObject, UITextViewDelegate, UITextFieldDel
   // MARK: setters/getters
 
   func setTextViewDelegate(delegate: UITextViewDelegate?) {
-    // remove KVO from any old textView
+    // remove KVO from any old textField
     if let oldTextField = observedTextFieldForSelection {
       removeSelectionRangeObserver(from: oldTextField)
     }
@@ -96,21 +96,6 @@ class KCTextInputCompositeDelegate: NSObject, UITextViewDelegate, UITextFieldDel
     }
   }
 
-  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.
-      // It forwards input events to the keyboard-controller delegate.
-      // To prevent an infinite loop, we avoid setting our delegate in this case.
-      // Since Square's SDK is used imperatively and doesn't allow adding custom components,
-      // keyboard-controller components cannot be used in this context,
-      // so it's safe to skip replacing the delegate.
-      return false
-    }
-
-    return true
-  }
-
   /// Getter for the active delegate
   var activeDelegate: AnyObject? {
     return textViewDelegate ?? textFieldDelegate
@@ -208,15 +193,49 @@ class KCTextInputCompositeDelegate: NSObject, UITextViewDelegate, UITextFieldDel
 
   // MARK: call forwarding
 
+  /// Decides whether `aSelector` should be forwarded to `delegate`.
+  ///
+  /// Usually we stay fully transparent and forward every selector the
+  /// underlying delegate responds to. The exception is a field that acts as its
+  /// own UIKit delegate and relays callbacks to an inner delegate through
+  /// `forwardInvocation:` (e.g. `BKForwardingTextField`). For such a field
+  /// `activeDelegate` is the text input *itself*, so it also "responds" to the
+  /// many `UITextField` / `UITextView` methods that UIKit relays to its delegate
+  /// (e.g. `keyboardInputChangedSelection:`). Forwarding one of those back to the
+  /// field makes the field relay it to us again — an infinite recursion.
+  ///
+  /// To stay transparent without looping, when the delegate is the text input
+  /// itself we forward only the selectors it handles *dynamically* (i.e. the
+  /// ones it routes to its inner delegate via its own message forwarding), and
+  /// never the ones it implements as a UIKit object. `instancesRespond(to:)`
+  /// inspects the real method table only, so it is `false` exactly for the
+  /// selectors resolved through the field's own `forwardInvocation:`.
+  private func shouldForward(_ aSelector: Selector!, to delegate: AnyObject) -> Bool {
+    guard delegate.responds(to: aSelector) else {
+      return false
+    }
+
+    if delegate is UITextField || delegate is UITextView,
+       let delegateClass = type(of: delegate) as? NSObject.Type
+    {
+      return !delegateClass.instancesRespond(to: aSelector)
+    }
+
+    return true
+  }
+
   override func responds(to aSelector: Selector!) -> Bool {
     if super.responds(to: aSelector) {
       return true
     }
-    return activeDelegate?.responds(to: aSelector) ?? false
+    guard let activeDelegate = activeDelegate else {
+      return false
+    }
+    return shouldForward(aSelector, to: activeDelegate)
   }
 
   override func forwardingTarget(for aSelector: Selector!) -> Any? {
-    if activeDelegate?.responds(to: aSelector) ?? false {
+    if let activeDelegate = activeDelegate, shouldForward(aSelector, to: activeDelegate) {
       return activeDelegate
     }
     return super.forwardingTarget(for: aSelector)

package/ios/objc/{UITextView+DelegateManager.h → TextInput+DelegateManager.h}

@@ -1,5 +1,5 @@
 //
-//  UITextView+DelegateManager.h
+//  TextInput+DelegateManager.h
 //  react-native-keyboard-controller
 //
 //  Created by Kiryl Ziusko on 24/04/2024.
@@ -10,3 +10,9 @@
 - (void)setForceDelegate:(id<UITextViewDelegate>)delegate;
 
 @end
+
+@interface UITextField (DelegateManager)
+
+- (void)setForceDelegate:(id<UITextFieldDelegate>)delegate;
+
+@end

package/ios/objc/TextInput+DelegateManager.m

@@ -0,0 +1,55 @@
+//
+//  TextInput+DelegateManager.m
+//  react-native-keyboard-controller
+//
+//  Created by Kiryl Ziusko on 24/04/2024.
+//
+
+#import <objc/runtime.h>
+#import "TextInput+DelegateManager.h"
+
+@implementation UITextView (DelegateManager)
+
+/**
+ * We are aware that delegate is set by RN on mount and we can not re-define it
+ * but we are using composite delegate to forward all calls to original delegate
+ * so we use this method to force set our delegate
+ */
+- (void)setForceDelegate:(id<UITextViewDelegate>)delegate
+{
+  Ivar ivar = class_getInstanceVariable([UITextView class], "_delegate");
+  if (ivar) {
+    object_setIvar(self, ivar, delegate);
+  }
+}
+
+@end
+
+@implementation UITextField (DelegateManager)
+
+/**
+ * Some `UITextField` subclasses (e.g. card-input fields from third-party SDKs, aka Square)
+ * make themselves their own UIKit delegate via `[super setDelegate:self]` and
+ * override `setDelegate:` so that the public setter only stores an *inner*
+ * delegate, forwarding UIKit callbacks to it via `forwardInvocation:`.
+ *
+ * For such fields the regular `textField.delegate = composite` does NOT replace
+ * the real UIKit delegate slot — it only points the field's inner delegate at us
+ * while the field itself stays the real delegate. Combined with the composite
+ * forwarding unhandled calls back to that same field, this creates an infinite
+ * recursion (it blows the stack already inside `respondsToSelector:`).
+ *
+ * Writing the `_delegate` ivar directly installs the composite as the genuine
+ * UIKit delegate without touching the field's inner delegate slot, so no
+ * back-pointer to the composite is ever created and the chain stays acyclic:
+ * `UIKit -> composite -> field -> field's original inner delegate`.
+ */
+- (void)setForceDelegate:(id<UITextFieldDelegate>)delegate
+{
+  Ivar ivar = class_getInstanceVariable([UITextField class], "_delegate");
+  if (ivar) {
+    object_setIvar(self, ivar, delegate);
+  }
+}
+
+@end

package/ios/observers/FocusedInputObserver.swift

@@ -251,11 +251,9 @@ public class FocusedInputObserver: NSObject {
 
   private func substituteDelegate(_ input: UIResponder?) {
     if let textField = input as? UITextField {
-      if !(textField.delegate is KCTextInputCompositeDelegate),
-         delegate.canSubstituteTextFieldDelegate(delegate: textField.delegate)
-      {
+      if !(textField.delegate is KCTextInputCompositeDelegate) {
         delegate.setTextFieldDelegate(delegate: textField.delegate, textField: textField)
-        textField.delegate = delegate
+        textField.setForceDelegate(delegate)
       }
     } else if let textView = input as? UITextView {
       if !(textView.delegate is KCTextInputCompositeDelegate) {
@@ -267,7 +265,7 @@ public class FocusedInputObserver: NSObject {
 
   private func substituteDelegateBack(_ input: UIResponder?) {
     if let textField = input as? UITextField, let oldDelegate = delegate.activeDelegate as? UITextFieldDelegate {
-      textField.delegate = oldDelegate
+      textField.setForceDelegate(oldDelegate)
     } else if let textView = input as? UITextView, let oldDelegate = delegate.activeDelegate as? UITextViewDelegate {
       textView.setForceDelegate(oldDelegate)
     }

package/ios/observers/movement/KeyboardTrackingView.swift

@@ -8,8 +8,8 @@
 import UIKit
 
 /**
- * A compatibility view that resolves to `KeyboardView` on iOS < 26
- * and uses `keyboardLayoutGuide` on iOS 26+.
+ * A compatibility view that resolves to `KeyboardView` for the legacy path
+ * and uses `keyboardLayoutGuide` for configured iOS 26+ behavior.
  */
 public final class KeyboardTrackingView: UIView {
   private var keyboardView: UIView? {
@@ -69,6 +69,8 @@ public final class KeyboardTrackingView: UIView {
   }
 
   @objc public func attachToTopmostView(toWindow window: UIWindow? = nil) {
+    guard KeyboardControllerConfiguration.usesKeyboardLayoutGuideTracking else { return }
+
     var topViewController = window?.rootViewController
     if let rootVC = topViewController, let topView = rootVC.view, topView.window != nil {
       // ok, attach
@@ -120,7 +122,7 @@ public final class KeyboardTrackingView: UIView {
   }
 
   @objc var view: UIView? {
-    if #available(iOS 26.0, *) {
+    if KeyboardControllerConfiguration.usesKeyboardLayoutGuideTracking {
       return self
     } else {
       return keyboardView
@@ -135,7 +137,7 @@ public final class KeyboardTrackingView: UIView {
     let keyboardPosition = keyboardWindowH - keyboardFrameY
 
     // for `keyboardLayoutGuide` case we can just read keyboard position directly - no interpolation needed
-    if #available(iOS 26.0, *) {
+    if KeyboardControllerConfiguration.usesKeyboardLayoutGuideTracking {
       if keyboardPosition > keyboardHeight {
         return Self.invalidPosition
       }

package/package.json

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

package/ios/objc/UITextView+DelegateManager.m

@@ -1,26 +0,0 @@
-//
-//  UITextView+DelegateManager.m
-//  react-native-keyboard-controller
-//
-//  Created by Kiryl Ziusko on 24/04/2024.
-//
-
-#import <objc/runtime.h>
-#import "UITextView+DelegateManager.h"
-
-@implementation UITextView (DelegateManager)
-
-/**
- * We are aware that delegate is set by RN on mount and we can not re-define it
- * but we are using composite delegate to forward all calls to original delegate
- * so we use this method to force set our delegate
- */
-- (void)setForceDelegate:(id<UITextViewDelegate>)delegate
-{
-  Ivar ivar = class_getInstanceVariable([UITextView class], "_delegate");
-  if (ivar) {
-    object_setIvar(self, ivar, delegate);
-  }
-}
-
-@end