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

package/android/src/fabric/java/com/reactnativekeyboardcontroller/ClippingScrollViewDecoratorViewManager.kt

@@ -27,4 +27,11 @@ class ClippingScrollViewDecoratorViewManager :
   ) {
     view?.setContentInsetBottom(value)
   }
+
+  override fun setContentInsetTop(
+    view: ClippingScrollViewDecoratorView?,
+    value: Double,
+  ) {
+    view?.setContentInsetTop(value)
+  }
 }

package/android/src/main/java/com/reactnativekeyboardcontroller/views/ClippingScrollViewDecoratorView.kt

@@ -1,6 +1,7 @@
 package com.reactnativekeyboardcontroller.views
 
 import android.annotation.SuppressLint
+import android.view.ViewGroup
 import android.widget.ScrollView
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.views.view.ReactViewGroup
@@ -11,6 +12,8 @@ class ClippingScrollViewDecoratorView(
   val reactContext: ThemedReactContext,
 ) : ReactViewGroup(reactContext) {
   private var insetBottom = 0.0
+  private var insetTop = 0.0
+  private var appliedTopInsetPx = 0
 
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
@@ -23,15 +26,39 @@ class ClippingScrollViewDecoratorView(
     decorateScrollView()
   }
 
+  fun setContentInsetTop(value: Double) {
+    insetTop = value
+    decorateScrollView()
+  }
+
   private fun decorateScrollView() {
     val scrollView = getChildAt(0) as? ScrollView ?: return
 
     scrollView.clipToPadding = false
+
+    val newTopInsetPx = insetTop.toFloat().px.toInt()
+
+    // Translate the content view as a whole — this keeps FlatList's
+    // virtualizer calculations correct (it reads layout positions,
+    // not translationY).
+    val contentView = scrollView.getChildAt(0) as? ViewGroup ?: return
+    (contentView.getChildAt(0) as? ViewGroup)?.translationY = newTopInsetPx.toFloat()
+
     scrollView.setPadding(
       scrollView.paddingLeft,
       scrollView.paddingTop,
       scrollView.paddingRight,
-      insetBottom.toFloat().px.toInt(),
+      // pass accumulated value — visually both top and bottom insets
+      // extend the scroll range via bottom padding
+      (insetBottom + insetTop).toFloat().px.toInt(),
     )
+
+    // scroll by the delta to keep content visually in place
+    val delta = newTopInsetPx - appliedTopInsetPx
+    if (delta != 0) {
+      scrollView.scrollBy(0, delta)
+    }
+
+    appliedTopInsetPx = newTopInsetPx
   }
 }

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

@@ -21,4 +21,12 @@ class ClippingScrollViewDecoratorViewManager : ViewGroupManager<ClippingScrollVi
   ) {
     view.setContentInsetBottom(value)
   }
+
+  @ReactProp(name = "contentInsetTop")
+  fun setContentInsetTop(
+    view: ClippingScrollViewDecoratorView,
+    value: Double,
+  ) {
+    view.setContentInsetTop(value)
+  }
 }

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/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,7 +142,9 @@ 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()

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

@@ -36,7 +36,7 @@ public class ViewHierarchyNavigator: NSObject {
       return []
     }
 
-    // Helper function to recursively search for TextInput views
+    /// Helper function to recursively search for TextInput views
     func findTextInputs(in view: UIView?) {
       guard let view = view else { return }
 
@@ -104,7 +104,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/KeyboardControllerViewManager.swift

@@ -27,7 +27,7 @@ class KeyboardControllerView: UIView {
   var inputObserver: FocusedInputObserver?
   private var eventDispatcher: RCTEventDispatcherProtocol
   private var bridge: RCTBridge
-  // internal state
+  /// internal state
   private var lastScreenSize: CGSize = .zero
   // react callbacks
   /// keyboard
@@ -39,7 +39,7 @@ class KeyboardControllerView: UIView {
   @objc var onFocusedInputLayoutChanged: RCTDirectEventBlock?
   @objc var onFocusedInputTextChanged: RCTDirectEventBlock?
   @objc var onFocusedInputSelectionChanged: RCTDirectEventBlock?
-  // react props
+  /// react props
   @objc var enabled: ObjCBool = true {
     didSet {
       if enabled.boolValue {
@@ -83,9 +83,9 @@ class KeyboardControllerView: UIView {
     fatalError("init(coder:) has not been implemented")
   }
 
-  // for mounting/unmounting observers for lifecycle events we're using willMove(toSuperview) method
-  // not willMove(toWindow)
-  // see https://github.com/kirillzyusko/react-native-keyboard-controller/issues/271
+  /// for mounting/unmounting observers for lifecycle events we're using willMove(toSuperview) method
+  /// not willMove(toWindow)
+  /// see https://github.com/kirillzyusko/react-native-keyboard-controller/issues/271
   override func willMove(toSuperview newSuperview: UIView?) {
     super.willMove(toSuperview: newSuperview)
 

package/jest/index.js

@@ -120,9 +120,7 @@ const mock = {
   KeyboardAvoidingView: View,
   KeyboardAwareScrollView: ScrollView,
   KeyboardToolbar: View,
-  ChatKit: {
-    ScrollView: ScrollView,
-  },
+  KeyboardChatScrollView: ScrollView,
   // themes
   DefaultKeyboardToolbarTheme,
 };

package/lib/commonjs/components/KeyboardAwareScrollView/index.js

@@ -103,6 +103,7 @@ const KeyboardAwareScrollView = /*#__PURE__*/(0, _react.forwardRef)(({
   const layout = (0, _reactNativeReanimated.useSharedValue)(null);
   const lastSelection = (0, _reactNativeReanimated.useSharedValue)(null);
   const ghostViewSpace = (0, _reactNativeReanimated.useSharedValue)(-1);
+  const pendingSelectionForFocus = (0, _reactNativeReanimated.useSharedValue)(false);
   const {
     height
   } = (0, _hooks.useWindowDimensions)();
@@ -215,7 +216,17 @@ const KeyboardAwareScrollView = /*#__PURE__*/(0, _react.forwardRef)(({
     const latestSelection = (_lastSelection$value3 = lastSelection.value) === null || _lastSelection$value3 === void 0 ? void 0 : _lastSelection$value3.selection;
     lastSelection.value = e;
     if (e.target !== lastTarget) {
-      // ignore this event, because "focus changed" event handled in `useSmoothKeyboardHandler`
+      if (pendingSelectionForFocus.value) {
+        // selection arrived after onStart - complete the deferred setup
+        pendingSelectionForFocus.value = false;
+        updateLayoutFromSelection();
+
+        // if keyboard was already visible (focus change, no onMove expected),
+        // perform the deferred scroll now
+        if (!keyboardWillAppear.value && keyboardHeight.value > 0) {
+          position.value += maybeScroll(keyboardHeight.value, true);
+        }
+      }
       return;
     }
     // caret in the end + end coordinates has been changed -> we moved to a new line
@@ -228,7 +239,7 @@ const KeyboardAwareScrollView = /*#__PURE__*/(0, _react.forwardRef)(({
       return scrollFromCurrentPosition();
     }
     onChangeTextHandler();
-  }, [scrollFromCurrentPosition, onChangeTextHandler]);
+  }, [scrollFromCurrentPosition, onChangeTextHandler, updateLayoutFromSelection, maybeScroll]);
   (0, _hooks.useFocusedInputHandler)({
     onSelectionChange: onSelectionChange
   }, [onSelectionChange]);
@@ -247,6 +258,7 @@ const KeyboardAwareScrollView = /*#__PURE__*/(0, _react.forwardRef)(({
         // on back transition need to interpolate as [0, keyboardHeight]
         initialKeyboardSize.value = 0;
         scrollPosition.value = scrollBeforeKeyboardMovement.value;
+        pendingSelectionForFocus.value = false;
       }
       if (keyboardWillAppear.value || keyboardWillChangeSize || focusWasChanged) {
         // persist scroll value
@@ -257,17 +269,31 @@ const KeyboardAwareScrollView = /*#__PURE__*/(0, _react.forwardRef)(({
 
       // focus was changed
       if (focusWasChanged) {
+        var _lastSelection$value4;
         tag.value = e.target;
-        // save position of focused text input when keyboard starts to move
-        updateLayoutFromSelection();
+        if (((_lastSelection$value4 = lastSelection.value) === null || _lastSelection$value4 === void 0 ? void 0 : _lastSelection$value4.target) === e.target) {
+          // selection arrived before onStart - use it to update layout
+          updateLayoutFromSelection();
+          pendingSelectionForFocus.value = false;
+        } else {
+          // selection hasn't arrived yet for the new target.
+          // use input layout as-is; will be refined when selection arrives.
+          if (input.value) {
+            layout.value = input.value;
+          }
+          pendingSelectionForFocus.value = true;
+        }
+
         // save current scroll position - when keyboard will hide we'll reuse
         // this value to achieve smooth hide effect
         scrollBeforeKeyboardMovement.value = position.value;
       }
       if (focusWasChanged && !keyboardWillAppear.value) {
-        // update position on scroll value, so `onEnd` handler
-        // will pick up correct values
-        position.value += maybeScroll(e.height, true);
+        if (!pendingSelectionForFocus.value) {
+          // update position on scroll value, so `onEnd` handler
+          // will pick up correct values
+          position.value += maybeScroll(e.height, true);
+        }
       }
       ghostViewSpace.value = position.value + scrollViewLayout.value.height - scrollViewContentSize.value.height;
       if (ghostViewSpace.value > 0) {
@@ -293,6 +319,9 @@ const KeyboardAwareScrollView = /*#__PURE__*/(0, _react.forwardRef)(({
       removeGhostPadding(e.height);
       keyboardHeight.value = e.height;
       scrollPosition.value = position.value;
+      if (e.height === 0) {
+        lastSelection.value = null;
+      }
       syncKeyboardFrame(e);
     }
   }, [maybeScroll, removeGhostPadding, disableScrollOnKeyboardHide, syncKeyboardFrame]);
@@ -306,11 +335,14 @@ const KeyboardAwareScrollView = /*#__PURE__*/(0, _react.forwardRef)(({
   }, [update, scrollFromCurrentPosition]);
   (0, _react.useImperativeHandle)(ref, () => {
     const scrollView = scrollViewRef.current;
-    const existingMethods = scrollView ? {
-      ...scrollView
-    } : {};
+    if (scrollView) {
+      const scrollViewWithMethods = scrollView;
+      scrollViewWithMethods.assureFocusedInputVisible = () => {
+        synchronize();
+      };
+      return scrollViewWithMethods;
+    }
     return {
-      ...existingMethods,
       assureFocusedInputVisible: () => {
         synchronize();
       }