react-native-keyboard-controller 1.21.0-beta.2 → 1.21.0

package/ios/KeyboardControllerModule.mm

@@ -23,6 +23,9 @@
 #endif
 
 #import <React/RCTEventDispatcherProtocol.h>
+#ifndef RCT_NEW_ARCH_ENABLED
+#import <React/RCTUIManager.h>
+#endif
 
 #ifdef RCT_NEW_ARCH_ENABLED
 @interface KeyboardController () <NativeKeyboardControllerSpec>
@@ -95,6 +98,39 @@ RCT_EXPORT_METHOD(setFocusTo : (nonnull NSString *)direction)
   [ViewHierarchyNavigator setFocusToDirection:direction];
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)viewPositionInWindow:(double)viewTag
+                     resolve:(RCTPromiseResolveBlock)resolve
+                      reject:(RCTPromiseRejectBlock)reject
+#else
+RCT_EXPORT_METHOD(viewPositionInWindow
+                  : (nonnull NSNumber *)viewTag resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
+#endif
+{
+  dispatch_async(dispatch_get_main_queue(), ^{
+    UIView *view = nil;
+#ifdef RCT_NEW_ARCH_ENABLED
+    NSInteger tag = (NSInteger)viewTag;
+    view = [UIApplication.sharedApplication.activeWindow viewWithTag:tag];
+#else
+    view = [self.bridge.uiManager viewForReactTag:viewTag];
+#endif
+    if (!view || !view.superview) {
+      reject(@"E_VIEW_NOT_FOUND", @"Could not find view for tag", nil);
+      return;
+    }
+    CGRect frame = [view.superview convertRect:view.frame toView:nil];
+    resolve(@{
+      @"x" : @(frame.origin.x),
+      @"y" : @(frame.origin.y),
+      @"width" : @(frame.size.width),
+      @"height" : @(frame.size.height),
+    });
+  });
+}
+
 + (KeyboardController *)shared
 {
   return shared;

package/ios/animations/KeyboardAnimation.swift

@@ -26,7 +26,7 @@ public class KeyboardAnimation: KeyboardAnimationProtocol {
   let duration: Double
   let speed: Double
   let timestamp: CFTimeInterval
-  // internal state
+  /// internal state
   var lastValue: Double
 
   init(fromValue: Double, toValue: Double, animation: CAMediaTiming, duration: Double) {
@@ -39,7 +39,7 @@ public class KeyboardAnimation: KeyboardAnimationProtocol {
     timestamp = CACurrentMediaTime()
   }
 
-  // public getters
+  /// public getters
   var startTime: CFTimeInterval {
     // when concurrent animation happens, then `.beginTime` remains the same
     return max(animation?.beginTime ?? timestamp, timestamp)

package/ios/animations/SpringAnimation.swift

@@ -60,7 +60,7 @@ public final class SpringAnimation: KeyboardAnimation {
     super.init(fromValue: fromValue, toValue: toValue, animation: animation, duration: animation.settlingDuration)
   }
 
-  // public functions
+  /// public functions
   override func valueAt(time: Double) -> Double {
     let t = time * speed
 

package/ios/animations/TimingAnimation.swift

@@ -56,9 +56,7 @@ public final class TimingAnimation: KeyboardAnimation {
     let x = bezierX(t: t)
 
     let duration = animation?.duration ?? 0.0
-    let time = x * duration / speed
-
-    return time
+    return x * duration / speed
   }
 
   // private functions

package/ios/delegates/KCTextInputCompositeDelegate.swift

@@ -51,7 +51,7 @@ class KCTextInputCompositeDelegate: NSObject, UITextViewDelegate, UITextFieldDel
   weak var textViewDelegate: UITextViewDelegate?
   weak var textFieldDelegate: UITextFieldDelegate?
 
-  // Keep track of which textField we’re observing (iOS < 13 only)
+  /// Keep track of which textField we’re observing (iOS < 13 only)
   private weak var observedTextFieldForSelection: UITextField?
 
   init(
@@ -111,7 +111,7 @@ class KCTextInputCompositeDelegate: NSObject, UITextViewDelegate, UITextFieldDel
     return true
   }
 
-  // Getter for the active delegate
+  /// Getter for the active delegate
   var activeDelegate: AnyObject? {
     return textViewDelegate ?? textFieldDelegate
   }

package/ios/extensions/CGFloat.swift

@@ -16,8 +16,6 @@ public extension CGFloat {
     let outputMax = outputRange.max() ?? 1
 
     let normalizedValue = (currentValue - inputMin) / (inputMax - inputMin)
-    let interpolatedValue = outputMin + (outputMax - outputMin) * normalizedValue
-
-    return interpolatedValue
+    return outputMin + (outputMax - outputMin) * normalizedValue
   }
 }

package/ios/extensions/UIApplication.swift

@@ -9,7 +9,7 @@ import Foundation
 import UIKit
 
 public extension UIApplication {
-  var activeWindow: UIWindow? {
+  @objc var activeWindow: UIWindow? {
     if #available(iOS 13.0, *) {
       for scene in connectedScenes {
         if scene.activationState == .foregroundActive,

package/ios/interactive/KeyboardAreaExtender.swift

@@ -55,7 +55,8 @@ class KeyboardAreaExtender: NSObject {
     let responder = UIResponder.current
     if let activeTextInput = responder as? TextInput,
        let offset = KeyboardOffsetProvider.shared.getOffset(
-         forTextInputNativeID: responder.nativeID),
+         forTextInputNativeID: responder.nativeID
+       ),
        responder?.inputAccessoryView == nil
     {
       currentInputAccessoryView = InvisibleInputAccessoryView(height: CGFloat(truncating: offset))

package/ios/observers/FocusedInputObserver.swift

@@ -32,7 +32,7 @@ public class FocusedInputObserver: NSObject {
   var onFocusDidSet: (NSDictionary) -> Void
   /// delegates
   var delegate: KCTextInputCompositeDelegate
-  // state variables
+  /// state variables
   private var isMounted = false
   // input tracking
   private var currentInput: UIView?
@@ -142,14 +142,17 @@ public class FocusedInputObserver: NSObject {
     setupObservers()
     // dispatch onSelectionChange on focus
     if let textInput = responder as? UITextInput {
-      updateSelectionPosition(textInput: textInput, sendEvent: onSelectionChange)
+      DispatchQueue.main.async {
+        updateSelectionPosition(textInput: textInput, sendEvent: self.onSelectionChange)
+      }
     }
 
     syncUpLayout()
 
     FocusedInputHolder.shared.set(currentResponder as? TextInput)
 
-    let allInputFields = ViewHierarchyNavigator.getAllInputFields()
+    let groupAncestor = ViewHierarchyNavigator.findGroupAncestor(currentResponder as? UIView)
+    let allInputFields = ViewHierarchyNavigator.getAllInputFields(root: groupAncestor)
     let currentIndex = allInputFields.firstIndex(where: { $0 == currentResponder }) ?? -1
 
     onFocusDidSet([

package/ios/observers/movement/KeyboardTrackingView.swift

@@ -12,7 +12,10 @@ import UIKit
  * and uses `keyboardLayoutGuide` on iOS 26+.
  */
 public final class KeyboardTrackingView: UIView {
-  private var keyboardView: UIView? { KeyboardViewLocator.shared.resolve() }
+  private var keyboardView: UIView? {
+    KeyboardViewLocator.shared.resolve()
+  }
+
   private var keyboardHeight = 0.0
   private weak var currentAttachedView: UIView?
   private var isAttaching = false

package/ios/observers/movement/observer/KeyboardMovementObserver+Interactive.swift

@@ -49,6 +49,8 @@ extension KeyboardMovementObserver {
 
     prevKeyboardPosition = position
 
+    keyboardDidTask?.cancel()
+
     onEvent(
       "onKeyboardMoveInteractive",
       position as NSNumber,

package/ios/observers/movement/observer/KeyboardMovementObserver+Listeners.swift

@@ -7,7 +7,7 @@
 
 extension KeyboardMovementObserver {
   @objc func keyboardWillAppear(_ notification: Notification) {
-    guard !KeyboardEventsIgnorer.shared.shouldIgnore, !UIResponder.isKeyboardPreloading else { return }
+    guard !UIResponder.isKeyboardPreloading else { return }
 
     let (duration, frame) = notification.keyboardMetaData()
     if let keyboardFrame = frame {
@@ -15,6 +15,12 @@ extension KeyboardMovementObserver {
       let keyboardHeight = keyboardFrame.cgRectValue.size.height
       self.keyboardHeight = keyboardHeight
       self.notification = notification
+
+      guard !KeyboardEventsIgnorer.shared.shouldIgnore else {
+        KeyboardEventsIgnorer.shared.shouldIgnoreKeyboardEvents = false
+        return
+      }
+
       self.duration = duration
 
       onRequestAnimation()
@@ -23,6 +29,7 @@ extension KeyboardMovementObserver {
 
       setupKeyboardWatcher()
       initializeAnimation(fromValue: prevKeyboardPosition, toValue: self.keyboardHeight)
+      scheduleDidEvent(height: self.keyboardHeight, duration: animation?.duration ?? CGFloat(duration) / 1000)
     }
   }
 
@@ -44,6 +51,7 @@ extension KeyboardMovementObserver {
     setupKeyboardWatcher()
     removeKVObserver()
     initializeAnimation(fromValue: prevKeyboardPosition, toValue: 0)
+    scheduleDidEvent(height: 0, duration: animation?.duration ?? CGFloat(duration) / 1000)
   }
 
   @objc func keyboardDidAppear(_ notification: Notification) {
@@ -55,12 +63,7 @@ extension KeyboardMovementObserver {
       tag = UIResponder.current.reactViewTag
       self.keyboardHeight = keyboardHeight
 
-      guard !KeyboardEventsIgnorer.shared.shouldIgnore else {
-        KeyboardEventsIgnorer.shared.shouldIgnoreKeyboardEvents = false
-        return
-      }
-
-      let height = self.keyboardHeight - KeyboardAreaExtender.shared.offset
+      let height = self.keyboardHeight
       // always limit progress to the maximum possible value
       let progress = min(height / self.keyboardHeight, 1.0)
 
@@ -90,4 +93,24 @@ extension KeyboardMovementObserver {
     removeKeyboardWatcher()
     animation = nil
   }
+
+  @objc func scheduleDidEvent(height: CGFloat, duration: CGFloat) {
+    keyboardDidTask?.cancel()
+
+    guard let notification = notification else {
+      return
+    }
+
+    let task = DispatchWorkItem { [weak self] in
+      guard let self = self else { return }
+      if height > 0 {
+        self.keyboardDidAppear(notification)
+      } else {
+        self.keyboardDidDisappear(notification)
+      }
+    }
+
+    keyboardDidTask = task
+    DispatchQueue.main.asyncAfter(deadline: .now() + duration, execute: task)
+  }
 }

package/ios/observers/movement/observer/KeyboardMovementObserver.swift

@@ -19,30 +19,7 @@ public class KeyboardMovementObserver: NSObject {
   var onCancelAnimation: () -> Void
   // progress tracker
   @objc public var keyboardTrackingView = KeyboardTrackingView()
-  var animation: KeyboardAnimation? {
-    didSet {
-      keyboardDidTask?.cancel()
-
-      guard let animation = animation, let notification = notification else {
-        return
-      }
-
-      let toValue = animation.toValue
-      let duration = animation.duration
-
-      let task = DispatchWorkItem { [weak self] in
-        guard let self = self else { return }
-        if toValue > 0 {
-          self.keyboardDidAppear(notification)
-        } else {
-          self.keyboardDidDisappear(notification)
-        }
-      }
-
-      keyboardDidTask = task
-      DispatchQueue.main.asyncAfter(deadline: .now() + duration, execute: task)
-    }
-  }
+  var animation: KeyboardAnimation?
 
   var prevKeyboardPosition = 0.0
   var displayLink: CADisplayLink!
@@ -55,30 +32,7 @@ public class KeyboardMovementObserver: NSObject {
     set { _keyboardHeight = newValue }
   }
 
-  var duration = 0 {
-    didSet {
-      keyboardDidTask?.cancel()
-
-      guard let notification = notification,
-            let height = notification.keyboardMetaData().1?.cgRectValue.size.height, duration == 0
-      else {
-        return
-      }
-
-      let task = DispatchWorkItem { [weak self] in
-        guard let self = self else { return }
-        if height > 0 {
-          self.keyboardDidAppear(notification)
-        } else {
-          self.keyboardDidDisappear(notification)
-        }
-      }
-
-      keyboardDidTask = task
-      DispatchQueue.main.asyncAfter(deadline: .now() + UIUtils.nextFrame, execute: task)
-    }
-  }
-
+  var duration = 0
   var tag: NSNumber = -1
   // manual did events
   var notification: Notification?

package/ios/protocols/TextInput.swift

@@ -15,7 +15,7 @@ public protocol TextInput: UIView {
   var inputView: UIView? { get set }
   var keyboardType: UIKeyboardType { get }
   var keyboardAppearance: UIKeyboardAppearance { get }
-  // custom methods/properties
+  /// custom methods/properties
   func focus()
 }
 

package/ios/swizzling/UIResponderSwizzle.swift

@@ -94,8 +94,7 @@ extension UIResponder {
     let castOriginalResignFirstResponder = unsafeBitCast(
       originalResignFirstResponder, to: Function.self
     )
-    let result = castOriginalResignFirstResponder(self, selector)
-    return result
+    return castOriginalResignFirstResponder(self, selector)
   }
 
   private func callOriginalBecomeFirstResponder(_ selector: Selector) -> Bool {
@@ -104,7 +103,6 @@ extension UIResponder {
     let castOriginalBecomeFirstResponder = unsafeBitCast(
       originalBecomeFirstResponder, to: Function.self
     )
-    let result = castOriginalBecomeFirstResponder(self, selector)
-    return result
+    return castOriginalBecomeFirstResponder(self, selector)
   }
 }

package/ios/traversal/FocusedInputHolder.swift

@@ -11,10 +11,10 @@ import Foundation
 class FocusedInputHolder {
   static let shared = FocusedInputHolder()
 
-  // Using TextInput protocol as the type for currentFocusedInput
+  /// Using TextInput protocol as the type for currentFocusedInput
   private weak var currentFocusedInput: TextInput?
 
-  // Sets the currentFocusedInput to the passed instance conforming to TextInput or clears it if nil is passed
+  /// Sets the currentFocusedInput to the passed instance conforming to TextInput or clears it if nil is passed
   func set(_ input: TextInput?) {
     currentFocusedInput = input
   }
@@ -23,7 +23,7 @@ class FocusedInputHolder {
     return currentFocusedInput
   }
 
-  // Requests focus for the currentFocusedInput if it's set
+  /// Requests focus for the currentFocusedInput if it's set
   func focus() {
     currentFocusedInput?.focus()
   }

package/ios/traversal/KeyboardView.swift

@@ -13,7 +13,7 @@ enum KeyboardView {
   private static let windowPrefix = "<UITextEffectsWindow"
   private static let containerPrefixes = ["<UIInputSetContainerView", "<UITrackingWindowView"]
   private static let hostPrefixes = ["<UIInputSetHostView", "<UIKeyboardItemContainerView"]
-  // inspired by https://stackoverflow.com/questions/32598490/show-uiview-with-buttons-over-keyboard-like-in-skype-viber-messengers-swift-i
+  /// inspired by https://stackoverflow.com/questions/32598490/show-uiview-with-buttons-over-keyboard-like-in-skype-viber-messengers-swift-i
   static func find() -> UIView? {
     let windows = UIApplication.shared.windows
     for window in windows {

package/ios/traversal/ViewHierarchyNavigator.swift

@@ -11,6 +11,8 @@ import UIKit
 
 @objc(ViewHierarchyNavigator)
 public class ViewHierarchyNavigator: NSObject {
+  private static let groupViewTypeName = "KeyboardToolbarGroupView"
+
   @objc public static func setFocusTo(direction: String) {
     DispatchQueue.main.async {
       if direction == "current" {
@@ -30,30 +32,67 @@ public class ViewHierarchyNavigator: NSObject {
   }
 
   public static func getAllInputFields() -> [TextInput] {
+    return getAllInputFields(root: nil)
+  }
+
+  public static func getAllInputFields(root: UIView?) -> [TextInput] {
     var textInputs = [TextInput]()
 
-    guard let rootView = UIApplication.topViewController()?.view else {
+    let rootView: UIView?
+    if let root = root {
+      rootView = root
+    } else {
+      rootView = UIApplication.topViewController()?.view
+    }
+
+    guard let rootView = rootView else {
       return []
     }
 
-    // Helper function to recursively search for TextInput views
+    let isGroupRoot = isGroupView(rootView)
+
+    /// Helper function to recursively search for TextInput views
     func findTextInputs(in view: UIView?) {
       guard let view = view else { return }
 
       if let textInput = isValidTextInput(view) {
         textInputs.append(textInput)
-      } else {
+      } else if !isGroupView(view) {
         for subview in view.subviews {
           findTextInputs(in: subview)
         }
       }
     }
 
-    findTextInputs(in: rootView)
+    if isGroupRoot {
+      // When root is a group, search its children directly
+      for subview in rootView.subviews {
+        findTextInputs(in: subview)
+      }
+    } else {
+      findTextInputs(in: rootView)
+    }
 
     return textInputs
   }
 
+  /// Finds the closest KeyboardToolbarGroupView ancestor of the given view.
+  /// Returns nil if the view is not inside any group.
+  public static func findGroupAncestor(_ view: UIView?) -> UIView? {
+    var current = view?.superview
+    while let parent = current {
+      if isGroupView(parent) {
+        return parent
+      }
+      current = parent.superview
+    }
+    return nil
+  }
+
+  private static func isGroupView(_ view: UIView) -> Bool {
+    return String(describing: type(of: view)) == groupViewTypeName
+  }
+
   private static func findTextInputInDirection(currentFocus: UIView, direction: String) -> TextInput? {
     // Find the parent view group
     guard let parentViewGroup = currentFocus.superview else {
@@ -81,6 +120,11 @@ public class ViewHierarchyNavigator: NSObject {
       }
     }
 
+    // Don't navigate outside the group boundary
+    if isGroupView(parentViewGroup) {
+      return nil
+    }
+
     // If no next or previous sibling was found in the parent, recurse to the parent's parent
     return findTextInputInDirection(currentFocus: parentViewGroup, direction: direction)
   }
@@ -91,6 +135,8 @@ public class ViewHierarchyNavigator: NSObject {
       return validTextInput
     }
 
+    guard !isGroupView(view) else { return nil }
+
     // Determine the iteration order based on the direction
     let subviews = direction == "next" ? view.subviews : view.subviews.reversed()
 
@@ -104,7 +150,7 @@ public class ViewHierarchyNavigator: NSObject {
     return nil // No valid UITextField or UITextView found
   }
 
-  // Function to check if the view is a valid text field or text view
+  /// Function to check if the view is a valid text field or text view
   private static func isValidTextInput(_ view: UIView) -> TextInput? {
     if let textField = view as? UITextField, textField.isEnabled {
       return textField

package/ios/views/ClippingScrollViewDecoratorViewManager.h

@@ -0,0 +1,26 @@
+//
+//  ClippingScrollViewDecoratorViewManager.h
+//  Pods
+//
+//  Created by Kiryl Ziusko on 03/03/2025.
+//
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTViewComponentView.h>
+#else
+#import <React/RCTView.h>
+#endif
+#import <React/RCTViewManager.h>
+#import <UIKit/UIKit.h>
+
+@interface ClippingScrollViewDecoratorViewManager : RCTViewManager
+@end
+
+@interface ClippingScrollViewDecoratorView :
+#ifdef RCT_NEW_ARCH_ENABLED
+    RCTViewComponentView
+#else
+    UIView
+#endif
+@property (nonatomic, assign) BOOL applyWorkaroundForContentInsetHitTestBug;
+@end