react-native-keyboard-controller 1.10.5 → 1.11.0

package/ios/Extensions.swift

@@ -53,6 +53,35 @@ public extension Optional where Wrapped == UIResponder {
   }
 }
 
+public extension UIScrollView {
+  var reactViewTag: NSNumber {
+    #if KEYBOARD_CONTROLLER_NEW_ARCH_ENABLED
+      return (superview?.tag ?? -1) as NSNumber
+    #else
+      return superview?.reactTag ?? -1
+    #endif
+  }
+}
+
+public extension Optional where Wrapped: UIResponder {
+  var parentScrollViewTarget: NSNumber {
+    var currentResponder: UIResponder? = self
+
+    while let currentView = currentResponder {
+      // If the current responder is a UIScrollView (excluding UITextView), return its tag
+      if let scrollView = currentView as? UIScrollView, !(currentView is UITextView) {
+        return scrollView.reactViewTag
+      }
+
+      // Move to the next responder in the chain
+      currentResponder = currentView.next
+    }
+
+    // UIScrollView is not found
+    return -1
+  }
+}
+
 public extension UIView {
   var globalFrame: CGRect? {
     let rootView = UIApplication.shared.keyWindow?.rootViewController?.view

package/ios/KeyboardController.xcodeproj/project.pbxproj

@@ -7,11 +7,14 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0800511C2B65548600928E51 /* FocusedInputHolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0800511B2B65548600928E51 /* FocusedInputHolder.swift */; };
+		0800511E2B65558800928E51 /* TextInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0800511D2B65558800928E51 /* TextInput.swift */; };
 		0807071E2A34807B00C05A19 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0807071D2A34807B00C05A19 /* Extensions.swift */; };
 		083FB9852B15171600C0EFF0 /* TextChangeObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 083FB9842B15171600C0EFF0 /* TextChangeObserver.swift */; };
 		083FB9872B15174C00C0EFF0 /* FocusedInputTextChangedEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 083FB9862B15174C00C0EFF0 /* FocusedInputTextChangedEvent.m */; };
 		084AEEC62ACF49A8001A3069 /* FocusedInputLayoutChangedEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 084AEEC52ACF49A8001A3069 /* FocusedInputLayoutChangedEvent.m */; };
 		084AEEC82ACF4AB2001A3069 /* FocusedInputObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 084AEEC72ACF4AB2001A3069 /* FocusedInputObserver.swift */; };
+		089BA5DC2B3E0C9D000A9A90 /* ViewHierarchyNavigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 089BA5DB2B3E0C9D000A9A90 /* ViewHierarchyNavigator.swift */; };
 		F333F8D428996B8D0015B05F /* KeyboardControllerView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F333F8D228996B8D0015B05F /* KeyboardControllerView.mm */; };
 		F359D34F28133C26000B6AFE /* KeyboardControllerModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = F359D34E28133C26000B6AFE /* KeyboardControllerModule.mm */; };
 		F3626A0728B3FE760021B2D9 /* KeyboardMovementObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3626A0628B3FE760021B2D9 /* KeyboardMovementObserver.swift */; };
@@ -32,6 +35,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		0800511B2B65548600928E51 /* FocusedInputHolder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FocusedInputHolder.swift; sourceTree = "<group>"; };
+		0800511D2B65558800928E51 /* TextInput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextInput.swift; sourceTree = "<group>"; };
 		0807071D2A34807B00C05A19 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
 		083FB9842B15171600C0EFF0 /* TextChangeObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextChangeObserver.swift; sourceTree = "<group>"; };
 		083FB9862B15174C00C0EFF0 /* FocusedInputTextChangedEvent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FocusedInputTextChangedEvent.m; sourceTree = "<group>"; };
@@ -39,6 +44,7 @@
 		084AEEC22ACF479A001A3069 /* FocusedInputLayoutChangedEvent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FocusedInputLayoutChangedEvent.h; sourceTree = "<group>"; };
 		084AEEC52ACF49A8001A3069 /* FocusedInputLayoutChangedEvent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FocusedInputLayoutChangedEvent.m; sourceTree = "<group>"; };
 		084AEEC72ACF4AB2001A3069 /* FocusedInputObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FocusedInputObserver.swift; sourceTree = "<group>"; };
+		089BA5DB2B3E0C9D000A9A90 /* ViewHierarchyNavigator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewHierarchyNavigator.swift; sourceTree = "<group>"; };
 		134814201AA4EA6300B7C361 /* libKeyboardController.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libKeyboardController.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		B3E7B5891CC2AC0600A0062D /* KeyboardControllerViewManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KeyboardControllerViewManager.mm; sourceTree = "<group>"; };
 		F333F8D128996B1C0015B05F /* KeyboardControllerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KeyboardControllerView.h; sourceTree = "<group>"; };
@@ -97,6 +103,16 @@
 			path = views;
 			sourceTree = "<group>";
 		};
+		089BA5DD2B3EC978000A9A90 /* traversal */ = {
+			isa = PBXGroup;
+			children = (
+				089BA5DB2B3E0C9D000A9A90 /* ViewHierarchyNavigator.swift */,
+				0800511B2B65548600928E51 /* FocusedInputHolder.swift */,
+				0800511D2B65558800928E51 /* TextInput.swift */,
+			);
+			path = traversal;
+			sourceTree = "<group>";
+		};
 		134814211AA4EA7D00B7C361 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -108,6 +124,7 @@
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
+				089BA5DD2B3EC978000A9A90 /* traversal */,
 				084AEEC12ACF405C001A3069 /* views */,
 				084AEEC02ACDFC2A001A3069 /* observers */,
 				084AEEBF2ACDFBF1001A3069 /* events */,
@@ -178,13 +195,16 @@
 			files = (
 				084AEEC62ACF49A8001A3069 /* FocusedInputLayoutChangedEvent.m in Sources */,
 				F3626A0728B3FE760021B2D9 /* KeyboardMovementObserver.swift in Sources */,
+				0800511C2B65548600928E51 /* FocusedInputHolder.swift in Sources */,
 				0807071E2A34807B00C05A19 /* Extensions.swift in Sources */,
 				F359D34F28133C26000B6AFE /* KeyboardControllerModule.mm in Sources */,
 				084AEEC82ACF4AB2001A3069 /* FocusedInputObserver.swift in Sources */,
 				F4FF95D7245B92E800C19C63 /* KeyboardControllerViewManager.swift in Sources */,
 				F333F8D428996B8D0015B05F /* KeyboardControllerView.mm in Sources */,
+				0800511E2B65558800928E51 /* TextInput.swift in Sources */,
 				F3F50669289E653B003091D6 /* KeyboardMoveEvent.m in Sources */,
 				083FB9852B15171600C0EFF0 /* TextChangeObserver.swift in Sources */,
+				089BA5DC2B3E0C9D000A9A90 /* ViewHierarchyNavigator.swift in Sources */,
 				083FB9872B15174C00C0EFF0 /* FocusedInputTextChangedEvent.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

package/ios/KeyboardControllerModule.mm

@@ -17,6 +17,12 @@
 
 #import "KeyboardControllerModule-Header.h"
 
+#if __has_include("react_native_keyboard_controller-Swift.h")
+#import "react_native_keyboard_controller-Swift.h"
+#else
+#import <react_native_keyboard_controller/react_native_keyboard_controller-Swift.h>
+#endif
+
 #import <React/RCTEventDispatcherProtocol.h>
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -75,6 +81,15 @@ RCT_EXPORT_METHOD(dismiss)
   });
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)setFocusTo:(NSString *)direction
+#else
+RCT_EXPORT_METHOD(setFocusTo : (nonnull NSString *)direction)
+#endif
+{
+  [ViewHierarchyNavigator setFocusToDirection:direction];
+}
+
 + (KeyboardController *)shared
 {
   return shared;
@@ -100,10 +115,13 @@ RCT_EXPORT_METHOD(dismiss)
 - (NSArray<NSString *> *)supportedEvents
 {
   return @[
+    // keyboard
     @"KeyboardController::keyboardWillShow",
     @"KeyboardController::keyboardDidShow",
     @"KeyboardController::keyboardWillHide",
     @"KeyboardController::keyboardDidHide",
+    // focused input
+    @"KeyboardController::focusDidSet",
   ];
 }
 

package/ios/events/FocusedInputLayoutChangedEvent.m

@@ -11,6 +11,7 @@
 
 @implementation FocusedInputLayoutChangedEvent {
   NSNumber *_target;
+  NSNumber *_parentScrollViewTarget;
   NSObject *_layout;
   uint16_t _coalescingKey;
 }
@@ -29,6 +30,7 @@
   if ((self = [super init])) {
     _viewTag = reactTag;
     _target = [event valueForKey:@"target"];
+    _parentScrollViewTarget = [event valueForKey:@"parentScrollViewTarget"];
     _layout = [event valueForKey:@"layout"];
     _coalescingKey = 0;
   }
@@ -46,6 +48,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 {
   NSDictionary *body = @{
     @"target" : _target,
+    @"parentScrollViewTarget" : _parentScrollViewTarget,
     @"layout" : _layout,
   };
 

package/ios/observers/FocusedInputObserver.swift

@@ -11,6 +11,7 @@ import UIKit
 
 let noFocusedInputEvent: [String: Any] = [
   "target": -1,
+  "parentScrollViewTarget": -1,
   "layout": [
     "absoluteX": 0,
     "absoluteY": 0,
@@ -26,6 +27,7 @@ public class FocusedInputObserver: NSObject {
   // class members
   var onLayoutChangedHandler: (NSDictionary) -> Void
   var onTextChangedHandler: (String) -> Void
+  var onFocusDidSet: (NSDictionary) -> Void
   // state variables
   private var isMounted = false
   // input tracking
@@ -37,10 +39,12 @@ public class FocusedInputObserver: NSObject {
 
   @objc public init(
     onLayoutChangedHandler: @escaping (NSDictionary) -> Void,
-    onTextChangedHandler: @escaping (String) -> Void
+    onTextChangedHandler: @escaping (String) -> Void,
+    onFocusDidSet: @escaping (NSDictionary) -> Void
   ) {
     self.onLayoutChangedHandler = onLayoutChangedHandler
     self.onTextChangedHandler = onTextChangedHandler
+    self.onFocusDidSet = onFocusDidSet
   }
 
   @objc public func mount() {
@@ -72,9 +76,21 @@ public class FocusedInputObserver: NSObject {
 
   @objc func keyboardWillShow(_: Notification) {
     removeObservers()
-    currentInput = (UIResponder.current as? UIView)?.superview as UIView?
+    let responder = UIResponder.current as? UIView
+    currentInput = responder?.superview as UIView?
+
     setupObservers()
     syncUpLayout()
+
+    FocusedInputHolder.shared.set(responder as? TextInput)
+
+    let allInputFields = ViewHierarchyNavigator.getAllInputFields()
+    let currentIndex = allInputFields.firstIndex(where: { $0 as? UIView == responder }) ?? -1
+
+    onFocusDidSet([
+      "current": currentIndex,
+      "count": allInputFields.count,
+    ])
   }
 
   @objc func keyboardWillHide(_: Notification) {
@@ -90,6 +106,7 @@ public class FocusedInputObserver: NSObject {
 
     let data: [String: Any] = [
       "target": responder.reactViewTag,
+      "parentScrollViewTarget": responder.parentScrollViewTarget,
       "layout": [
         "absoluteX": globalFrame?.origin.x,
         "absoluteY": globalFrame?.origin.y,
@@ -149,8 +166,7 @@ public class FocusedInputObserver: NSObject {
     change _: [NSKeyValueChangeKey: Any]?,
     context _: UnsafeMutableRawPointer?
   ) {
-    // swiftlint:disable:next force_cast
-    if keyPath == "center", object as! NSObject == currentInput! {
+    if keyPath == "center", object as? NSObject == currentInput {
       // we need to read layout in next frame, otherwise we'll get old
       // layout values
       DispatchQueue.main.async {

package/ios/observers/KeyboardMovementObserver.swift

@@ -105,8 +105,7 @@ public class KeyboardMovementObserver: NSObject {
     change: [NSKeyValueChangeKey: Any]?,
     context _: UnsafeMutableRawPointer?
   ) {
-    // swiftlint:disable:next force_cast
-    if keyPath == "center", object as! NSObject == _keyboardView! {
+    if keyPath == "center", object as? NSObject == _keyboardView {
       // if we are currently animating keyboard -> we need to ignore values from KVO
       if displayLink != nil {
         return
@@ -117,8 +116,10 @@ public class KeyboardMovementObserver: NSObject {
         return
       }
 
-      // swiftlint:disable:next force_cast
-      let keyboardFrameY = (change?[.newKey] as! NSValue).cgPointValue.y
+      guard let changeValue = change?[.newKey] as? NSValue else {
+        return
+      }
+      let keyboardFrameY = changeValue.cgPointValue.y
       let keyboardWindowH = keyboardView?.window?.bounds.size.height ?? 0
       let keyboardPosition = keyboardWindowH - keyboardFrameY
       let position = CGFloat.interpolate(

package/ios/traversal/FocusedInputHolder.swift

@@ -0,0 +1,32 @@
+//
+//  FocusedInputHolder.swift
+//  KeyboardController
+//
+//  Created by Kiryl Ziusko on 27/01/2024.
+//  Copyright © 2024 Facebook. All rights reserved.
+//
+
+import Foundation
+
+class FocusedInputHolder {
+  static let shared = FocusedInputHolder()
+
+  // 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
+  func set(_ input: TextInput?) {
+    currentFocusedInput = input
+  }
+
+  // Requests focus for the currentFocusedInput if it's set
+  func requestFocus() {
+    currentFocusedInput?.requestFocus()
+  }
+
+  func get() -> TextInput? {
+    return currentFocusedInput
+  }
+
+  private init() {}
+}

package/ios/traversal/TextInput.swift

@@ -0,0 +1,26 @@
+//
+//  TextInput.swift
+//  KeyboardController
+//
+//  Created by Kiryl Ziusko on 27/01/2024.
+//  Copyright © 2024 Facebook. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+public protocol TextInput: AnyObject {
+  func requestFocus()
+}
+
+extension UITextField: TextInput {
+  public func requestFocus() {
+    becomeFirstResponder()
+  }
+}
+
+extension UITextView: TextInput {
+  public func requestFocus() {
+    becomeFirstResponder()
+  }
+}

package/ios/traversal/ViewHierarchyNavigator.swift

@@ -0,0 +1,116 @@
+//
+//  ViewHierarchyNavigator.swift
+//  KeyboardController
+//
+//  Created by Kiryl Ziusko on 28/12/2023.
+//  Copyright © 2023 Facebook. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+@objc(ViewHierarchyNavigator)
+public class ViewHierarchyNavigator: NSObject {
+  @objc public static func setFocusTo(direction: String) {
+    DispatchQueue.main.async {
+      if direction == "current" {
+        FocusedInputHolder.shared.requestFocus()
+        return
+      }
+
+      let input = (FocusedInputHolder.shared.get() as? UIView) ?? (UIResponder.current as? UIView) ?? nil
+      guard let view = input else { return }
+
+      let textField = findTextInputInDirection(currentFocus: view, direction: direction)
+      textField?.requestFocus()
+    }
+  }
+
+  public static func getAllInputFields() -> [TextInput] {
+    var textInputs = [TextInput]()
+
+    guard let rootView = UIApplication.shared.keyWindow?.rootViewController?.view else {
+      return []
+    }
+
+    // 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 {
+        for subview in view.subviews {
+          findTextInputs(in: subview)
+        }
+      }
+    }
+
+    findTextInputs(in: rootView)
+
+    return textInputs
+  }
+
+  private static func findTextInputInDirection(currentFocus: UIView, direction: String) -> TextInput? {
+    // Find the parent view group
+    guard let parentViewGroup = currentFocus.superview else {
+      return nil
+    }
+
+    // Find the index of the current TextInput in its parent
+    let currentIndex = parentViewGroup.subviews.firstIndex(of: currentFocus) ?? 0
+
+    // Define the range for iterating based on the direction
+    let range: [Int]
+
+    if direction == "next" {
+      range = Array((currentIndex + 1) ..< parentViewGroup.subviews.count)
+    } else {
+      range = Array(stride(from: currentIndex - 1, through: 0, by: -1))
+    }
+
+    // Iterate over the range to find the next or previous TextInput
+    for i in range {
+      let nextChild = parentViewGroup.subviews[i]
+
+      if let nextTextInput = findTextInputInHierarchy(view: nextChild, direction: direction) {
+        return nextTextInput
+      }
+    }
+
+    // If no next or previous sibling was found in the parent, recurse to the parent's parent
+    return findTextInputInDirection(currentFocus: parentViewGroup, direction: direction)
+  }
+
+  private static func findTextInputInHierarchy(view: UIView, direction: String) -> TextInput? {
+    // Check the current view
+    if let validTextInput = isValidTextInput(view) {
+      return validTextInput
+    }
+
+    // Determine the iteration order based on the direction
+    let subviews = direction == "next" ? view.subviews : view.subviews.reversed()
+
+    // Iterate over subviews
+    for subview in subviews {
+      if let textField = findTextInputInHierarchy(view: subview, direction: direction) {
+        return textField
+      }
+    }
+
+    return nil // No valid UITextField or UITextView found
+  }
+
+  // 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
+    }
+
+    if let textView = view as? UITextView, textView.isEditable {
+      return textView
+    }
+
+    return nil
+  }
+}

package/ios/views/KeyboardControllerView.mm

@@ -12,7 +12,12 @@
 #import "FocusedInputLayoutChangedEvent.h"
 #import "FocusedInputTextChangedEvent.h"
 #import "KeyboardMoveEvent.h"
+
+#if __has_include("react_native_keyboard_controller-Swift.h")
 #import "react_native_keyboard_controller-Swift.h"
+#else
+#import <react_native_keyboard_controller/react_native_keyboard_controller-Swift.h>
+#endif
 
 #import <react/renderer/components/reactnativekeyboardcontroller/ComponentDescriptors.h>
 #import <react/renderer/components/reactnativekeyboardcontroller/EventEmitters.h>
@@ -50,6 +55,7 @@ using namespace facebook::react;
         initOnLayoutChangedHandler:^(NSDictionary *event) {
           if (self->_eventEmitter) {
             int target = [event[@"target"] integerValue];
+            int parentScrollViewTarget = [event[@"parentScrollViewTarget"] integerValue];
             double absoluteY = [event[@"layout"][@"absoluteY"] doubleValue];
             double absoulteX = [event[@"layout"][@"absoluteX"] doubleValue];
             double y = [event[@"layout"][@"y"] doubleValue];
@@ -63,6 +69,7 @@ using namespace facebook::react;
                     facebook::react::KeyboardControllerViewEventEmitter::
                         OnFocusedInputLayoutChanged{
                             .target = target,
+                            .parentScrollViewTarget = parentScrollViewTarget,
                             .layout = facebook::react::KeyboardControllerViewEventEmitter::
                                 OnFocusedInputLayoutChangedLayout{
                                     .absoluteY = absoluteY,
@@ -98,6 +105,9 @@ using namespace facebook::react;
               [bridge.eventDispatcher sendEvent:textChangedEvent];
             }
           }
+        }
+        onFocusDidSet:^(NSDictionary *data) {
+          [KeyboardController.shared sendEvent:@"KeyboardController::focusDidSet" body:data];
         }];
     keyboardObserver = [[KeyboardMovementObserver alloc]
         initWithHandler:^(

package/ios/views/KeyboardControllerViewManager.swift

@@ -41,7 +41,10 @@ class KeyboardControllerView: UIView {
     super.init(frame: frame)
     inputObserver = FocusedInputObserver(
       onLayoutChangedHandler: { [weak self] event in self?.onLayoutChanged(event: event) },
-      onTextChangedHandler: { [weak self] text in self?.onTextChanged(text: text) }
+      onTextChangedHandler: { [weak self] text in self?.onTextChanged(text: text) },
+      onFocusDidSet: { [weak self] event in
+        self?.onNotify(event: "KeyboardController::focusDidSet", data: event)
+      }
     )
     keyboardObserver = KeyboardMovementObserver(
       handler: { [weak self] event, height, progress, duration, target in

package/jest/index.js

@@ -14,6 +14,7 @@ const focusedInput = {
   input: {
     value: {
       target: 1,
+      parentScrollViewTarget: -1,
       layout: {
         x: 0,
         y: 0,
@@ -34,6 +35,7 @@ const mock = {
   useResizeMode: jest.fn(),
   useGenericKeyboardHandler: jest.fn(),
   useKeyboardHandler: jest.fn(),
+  useKeyboardContext: jest.fn().mockReturnValue(values),
   /// input
   useReanimatedFocusedInput: jest.fn().mockReturnValue(focusedInput),
   useFocusedInputHandler: jest.fn(),
@@ -46,6 +48,23 @@ const mock = {
     setInputMode: jest.fn(),
     setDefaultMode: jest.fn(),
     dismiss: jest.fn(),
+    setFocusTo: jest.fn(),
+  },
+  AndroidSoftInputModes: {
+    SOFT_INPUT_ADJUST_NOTHING: 48,
+    SOFT_INPUT_ADJUST_PAN: 32,
+    SOFT_INPUT_ADJUST_RESIZE: 16,
+    SOFT_INPUT_ADJUST_UNSPECIFIED: 0,
+    SOFT_INPUT_IS_FORWARD_NAVIGATION: 256,
+    SOFT_INPUT_MASK_ADJUST: 240,
+    SOFT_INPUT_MASK_STATE: 15,
+    SOFT_INPUT_MODE_CHANGED: 512,
+    SOFT_INPUT_STATE_ALWAYS_HIDDEN: 3,
+    SOFT_INPUT_STATE_ALWAYS_VISIBLE: 5,
+    SOFT_INPUT_STATE_HIDDEN: 2,
+    SOFT_INPUT_STATE_UNCHANGED: 1,
+    SOFT_INPUT_STATE_UNSPECIFIED: 0,
+    SOFT_INPUT_STATE_VISIBLE: 4,
   },
   KeyboardEvents: {
     addListener: jest.fn(() => ({ remove: jest.fn() })),
@@ -59,6 +78,7 @@ const mock = {
   KeyboardStickyView: View,
   KeyboardAvoidingView: View,
   KeyboardAwareScrollView: ScrollView,
+  KeyboardToolbar: View,
 };
 
 module.exports = mock;

package/lib/commonjs/bindings.js

@@ -3,13 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.KeyboardGestureArea = exports.KeyboardEvents = exports.KeyboardControllerView = exports.KeyboardController = void 0;
+exports.KeyboardGestureArea = exports.KeyboardEvents = exports.KeyboardControllerView = exports.KeyboardController = exports.FocusedInputEvents = void 0;
 var _reactNative = require("react-native");
 const NOOP = () => {};
 const KeyboardController = {
   setDefaultMode: NOOP,
   setInputMode: NOOP,
   dismiss: NOOP,
+  setFocusTo: NOOP,
   addListener: NOOP,
   removeListeners: NOOP
 };
@@ -19,7 +20,17 @@ const KeyboardEvents = {
     remove: NOOP
   })
 };
+/**
+ * This API is not documented, it's for internal usage only (for now), and is a subject to potential breaking changes in future.
+ * Use it with cautious.
+ */
 exports.KeyboardEvents = KeyboardEvents;
+const FocusedInputEvents = {
+  addListener: () => ({
+    remove: NOOP
+  })
+};
+exports.FocusedInputEvents = FocusedInputEvents;
 const KeyboardControllerView = _reactNative.View;
 exports.KeyboardControllerView = KeyboardControllerView;
 const KeyboardGestureArea = _reactNative.View;

package/lib/commonjs/bindings.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","NOOP","KeyboardController","setDefaultMode","setInputMode","dismiss","addListener","removeListeners","exports","KeyboardEvents","remove","KeyboardControllerView","View","KeyboardGestureArea"],"sources":["bindings.ts"],"sourcesContent":["import { View } from \"react-native\";\n\nimport type {\n  KeyboardControllerModule,\n  KeyboardControllerProps,\n  KeyboardEventsModule,\n  KeyboardGestureAreaProps,\n} from \"./types\";\nimport type { EmitterSubscription } from \"react-native\";\n\nconst NOOP = () => {};\nexport const KeyboardController: KeyboardControllerModule = {\n  setDefaultMode: NOOP,\n  setInputMode: NOOP,\n  dismiss: NOOP,\n  addListener: NOOP,\n  removeListeners: NOOP,\n};\nexport const KeyboardEvents: KeyboardEventsModule = {\n  addListener: () => ({ remove: NOOP } as EmitterSubscription),\n};\nexport const KeyboardControllerView =\n  View as unknown as React.FC<KeyboardControllerProps>;\nexport const KeyboardGestureArea =\n  View as unknown as React.FC<KeyboardGestureAreaProps>;\n"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAUA,MAAMC,IAAI,GAAGA,CAAA,KAAM,CAAC,CAAC;AACd,MAAMC,kBAA4C,GAAG;EAC1DC,cAAc,EAAEF,IAAI;EACpBG,YAAY,EAAEH,IAAI;EAClBI,OAAO,EAAEJ,IAAI;EACbK,WAAW,EAAEL,IAAI;EACjBM,eAAe,EAAEN;AACnB,CAAC;AAACO,OAAA,CAAAN,kBAAA,GAAAA,kBAAA;AACK,MAAMO,cAAoC,GAAG;EAClDH,WAAW,EAAEA,CAAA,MAAO;IAAEI,MAAM,EAAET;EAAK,CAAC;AACtC,CAAC;AAACO,OAAA,CAAAC,cAAA,GAAAA,cAAA;AACK,MAAME,sBAAsB,GACjCC,iBAAoD;AAACJ,OAAA,CAAAG,sBAAA,GAAAA,sBAAA;AAChD,MAAME,mBAAmB,GAC9BD,iBAAqD;AAACJ,OAAA,CAAAK,mBAAA,GAAAA,mBAAA"}
+{"version":3,"names":["_reactNative","require","NOOP","KeyboardController","setDefaultMode","setInputMode","dismiss","setFocusTo","addListener","removeListeners","exports","KeyboardEvents","remove","FocusedInputEvents","KeyboardControllerView","View","KeyboardGestureArea"],"sources":["bindings.ts"],"sourcesContent":["import { View } from \"react-native\";\n\nimport type {\n  FocusedInputEventsModule,\n  KeyboardControllerModule,\n  KeyboardControllerProps,\n  KeyboardEventsModule,\n  KeyboardGestureAreaProps,\n} from \"./types\";\nimport type { EmitterSubscription } from \"react-native\";\n\nconst NOOP = () => {};\nexport const KeyboardController: KeyboardControllerModule = {\n  setDefaultMode: NOOP,\n  setInputMode: NOOP,\n  dismiss: NOOP,\n  setFocusTo: NOOP,\n  addListener: NOOP,\n  removeListeners: NOOP,\n};\nexport const KeyboardEvents: KeyboardEventsModule = {\n  addListener: () => ({ remove: NOOP } as EmitterSubscription),\n};\n/**\n * This API is not documented, it's for internal usage only (for now), and is a subject to potential breaking changes in future.\n * Use it with cautious.\n */\nexport const FocusedInputEvents: FocusedInputEventsModule = {\n  addListener: () => ({ remove: NOOP } as EmitterSubscription),\n};\nexport const KeyboardControllerView =\n  View as unknown as React.FC<KeyboardControllerProps>;\nexport const KeyboardGestureArea =\n  View as unknown as React.FC<KeyboardGestureAreaProps>;\n"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAWA,MAAMC,IAAI,GAAGA,CAAA,KAAM,CAAC,CAAC;AACd,MAAMC,kBAA4C,GAAG;EAC1DC,cAAc,EAAEF,IAAI;EACpBG,YAAY,EAAEH,IAAI;EAClBI,OAAO,EAAEJ,IAAI;EACbK,UAAU,EAAEL,IAAI;EAChBM,WAAW,EAAEN,IAAI;EACjBO,eAAe,EAAEP;AACnB,CAAC;AAACQ,OAAA,CAAAP,kBAAA,GAAAA,kBAAA;AACK,MAAMQ,cAAoC,GAAG;EAClDH,WAAW,EAAEA,CAAA,MAAO;IAAEI,MAAM,EAAEV;EAAK,CAAC;AACtC,CAAC;AACD;AACA;AACA;AACA;AAHAQ,OAAA,CAAAC,cAAA,GAAAA,cAAA;AAIO,MAAME,kBAA4C,GAAG;EAC1DL,WAAW,EAAEA,CAAA,MAAO;IAAEI,MAAM,EAAEV;EAAK,CAAC;AACtC,CAAC;AAACQ,OAAA,CAAAG,kBAAA,GAAAA,kBAAA;AACK,MAAMC,sBAAsB,GACjCC,iBAAoD;AAACL,OAAA,CAAAI,sBAAA,GAAAA,sBAAA;AAChD,MAAME,mBAAmB,GAC9BD,iBAAqD;AAACL,OAAA,CAAAM,mBAAA,GAAAA,mBAAA"}

package/lib/commonjs/bindings.native.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.KeyboardGestureArea = exports.KeyboardEvents = exports.KeyboardControllerView = exports.KeyboardController = void 0;
+exports.KeyboardGestureArea = exports.KeyboardEvents = exports.KeyboardControllerView = exports.KeyboardController = exports.FocusedInputEvents = void 0;
 var _reactNative = require("react-native");
 const LINKING_ERROR = `The package 'react-native-keyboard-controller' doesn't seem to be linked. Make sure: \n\n` + _reactNative.Platform.select({
   ios: "- You have run 'pod install'\n",
@@ -16,11 +16,20 @@ const KeyboardController = RCTKeyboardController ? RCTKeyboardController : new P
   }
 });
 exports.KeyboardController = KeyboardController;
+const KEYBOARD_CONTROLLER_NAMESPACE = "KeyboardController::";
 const eventEmitter = new _reactNative.NativeEventEmitter(KeyboardController);
 const KeyboardEvents = {
-  addListener: (name, cb) => eventEmitter.addListener("KeyboardController::" + name, cb)
+  addListener: (name, cb) => eventEmitter.addListener(KEYBOARD_CONTROLLER_NAMESPACE + name, cb)
 };
+/**
+ * This API is not documented, it's for internal usage only (for now), and is a subject to potential breaking changes in future.
+ * Use it with cautious.
+ */
 exports.KeyboardEvents = KeyboardEvents;
+const FocusedInputEvents = {
+  addListener: (name, cb) => eventEmitter.addListener(KEYBOARD_CONTROLLER_NAMESPACE + name, cb)
+};
+exports.FocusedInputEvents = FocusedInputEvents;
 const KeyboardControllerView = require("./specs/KeyboardControllerViewNativeComponent").default;
 exports.KeyboardControllerView = KeyboardControllerView;
 const KeyboardGestureArea = _reactNative.Platform.OS === "android" && _reactNative.Platform.Version >= 30 ? require("./specs/KeyboardGestureAreaNativeComponent").default : _ref => {

package/lib/commonjs/bindings.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","RCTKeyboardController","KeyboardController","Proxy","get","Error","exports","eventEmitter","NativeEventEmitter","KeyboardEvents","addListener","name","cb","KeyboardControllerView","KeyboardGestureArea","OS","Version","_ref","children"],"sources":["bindings.native.ts"],"sourcesContent":["import { NativeEventEmitter, Platform } from \"react-native\";\n\nimport type {\n  KeyboardControllerModule,\n  KeyboardControllerProps,\n  KeyboardEventsModule,\n  KeyboardGestureAreaProps,\n} from \"./types\";\n\nconst LINKING_ERROR =\n  `The package 'react-native-keyboard-controller' doesn't seem to be linked. Make sure: \\n\\n` +\n  Platform.select({ ios: \"- You have run 'pod install'\\n\", default: \"\" }) +\n  \"- You rebuilt the app after installing the package\\n\" +\n  \"- You are not using Expo Go\\n\";\n\nconst RCTKeyboardController =\n  require(\"./specs/NativeKeyboardController\").default;\nexport const KeyboardController = (\n  RCTKeyboardController\n    ? RCTKeyboardController\n    : new Proxy(\n        {},\n        {\n          get() {\n            throw new Error(LINKING_ERROR);\n          },\n        },\n      )\n) as KeyboardControllerModule;\n\nconst eventEmitter = new NativeEventEmitter(KeyboardController);\n\nexport const KeyboardEvents: KeyboardEventsModule = {\n  addListener: (name, cb) =>\n    eventEmitter.addListener(\"KeyboardController::\" + name, cb),\n};\nexport const KeyboardControllerView: React.FC<KeyboardControllerProps> =\n  require(\"./specs/KeyboardControllerViewNativeComponent\").default;\nexport const KeyboardGestureArea: React.FC<KeyboardGestureAreaProps> =\n  Platform.OS === \"android\" && Platform.Version >= 30\n    ? require(\"./specs/KeyboardGestureAreaNativeComponent\").default\n    : ({ children }: KeyboardGestureAreaProps) => children;\n"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AASA,MAAMC,aAAa,GAChB,2FAA0F,GAC3FC,qBAAQ,CAACC,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,qBAAqB,GACzBN,OAAO,CAAC,kCAAkC,CAAC,CAACK,OAAO;AAC9C,MAAME,kBAAkB,GAC7BD,qBAAqB,GACjBA,qBAAqB,GACrB,IAAIE,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACT,aAAa,CAAC;EAChC;AACF,CACF,CACuB;AAACU,OAAA,CAAAJ,kBAAA,GAAAA,kBAAA;AAE9B,MAAMK,YAAY,GAAG,IAAIC,+BAAkB,CAACN,kBAAkB,CAAC;AAExD,MAAMO,cAAoC,GAAG;EAClDC,WAAW,EAAEA,CAACC,IAAI,EAAEC,EAAE,KACpBL,YAAY,CAACG,WAAW,CAAC,sBAAsB,GAAGC,IAAI,EAAEC,EAAE;AAC9D,CAAC;AAACN,OAAA,CAAAG,cAAA,GAAAA,cAAA;AACK,MAAMI,sBAAyD,GACpElB,OAAO,CAAC,+CAA+C,CAAC,CAACK,OAAO;AAACM,OAAA,CAAAO,sBAAA,GAAAA,sBAAA;AAC5D,MAAMC,mBAAuD,GAClEjB,qBAAQ,CAACkB,EAAE,KAAK,SAAS,IAAIlB,qBAAQ,CAACmB,OAAO,IAAI,EAAE,GAC/CrB,OAAO,CAAC,4CAA4C,CAAC,CAACK,OAAO,GAC7DiB,IAAA;EAAA,IAAC;IAAEC;EAAmC,CAAC,GAAAD,IAAA;EAAA,OAAKC,QAAQ;AAAA;AAACZ,OAAA,CAAAQ,mBAAA,GAAAA,mBAAA"}
+{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","RCTKeyboardController","KeyboardController","Proxy","get","Error","exports","KEYBOARD_CONTROLLER_NAMESPACE","eventEmitter","NativeEventEmitter","KeyboardEvents","addListener","name","cb","FocusedInputEvents","KeyboardControllerView","KeyboardGestureArea","OS","Version","_ref","children"],"sources":["bindings.native.ts"],"sourcesContent":["import { NativeEventEmitter, Platform } from \"react-native\";\n\nimport type {\n  FocusedInputEventsModule,\n  KeyboardControllerModule,\n  KeyboardControllerProps,\n  KeyboardEventsModule,\n  KeyboardGestureAreaProps,\n} from \"./types\";\n\nconst LINKING_ERROR =\n  `The package 'react-native-keyboard-controller' doesn't seem to be linked. Make sure: \\n\\n` +\n  Platform.select({ ios: \"- You have run 'pod install'\\n\", default: \"\" }) +\n  \"- You rebuilt the app after installing the package\\n\" +\n  \"- You are not using Expo Go\\n\";\n\nconst RCTKeyboardController =\n  require(\"./specs/NativeKeyboardController\").default;\nexport const KeyboardController = (\n  RCTKeyboardController\n    ? RCTKeyboardController\n    : new Proxy(\n        {},\n        {\n          get() {\n            throw new Error(LINKING_ERROR);\n          },\n        },\n      )\n) as KeyboardControllerModule;\n\nconst KEYBOARD_CONTROLLER_NAMESPACE = \"KeyboardController::\";\nconst eventEmitter = new NativeEventEmitter(KeyboardController);\n\nexport const KeyboardEvents: KeyboardEventsModule = {\n  addListener: (name, cb) =>\n    eventEmitter.addListener(KEYBOARD_CONTROLLER_NAMESPACE + name, cb),\n};\n/**\n * This API is not documented, it's for internal usage only (for now), and is a subject to potential breaking changes in future.\n * Use it with cautious.\n */\nexport const FocusedInputEvents: FocusedInputEventsModule = {\n  addListener: (name, cb) =>\n    eventEmitter.addListener(KEYBOARD_CONTROLLER_NAMESPACE + name, cb),\n};\nexport const KeyboardControllerView: React.FC<KeyboardControllerProps> =\n  require(\"./specs/KeyboardControllerViewNativeComponent\").default;\nexport const KeyboardGestureArea: React.FC<KeyboardGestureAreaProps> =\n  Platform.OS === \"android\" && Platform.Version >= 30\n    ? require(\"./specs/KeyboardGestureAreaNativeComponent\").default\n    : ({ children }: KeyboardGestureAreaProps) => children;\n"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAUA,MAAMC,aAAa,GAChB,2FAA0F,GAC3FC,qBAAQ,CAACC,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,qBAAqB,GACzBN,OAAO,CAAC,kCAAkC,CAAC,CAACK,OAAO;AAC9C,MAAME,kBAAkB,GAC7BD,qBAAqB,GACjBA,qBAAqB,GACrB,IAAIE,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACT,aAAa,CAAC;EAChC;AACF,CACF,CACuB;AAACU,OAAA,CAAAJ,kBAAA,GAAAA,kBAAA;AAE9B,MAAMK,6BAA6B,GAAG,sBAAsB;AAC5D,MAAMC,YAAY,GAAG,IAAIC,+BAAkB,CAACP,kBAAkB,CAAC;AAExD,MAAMQ,cAAoC,GAAG;EAClDC,WAAW,EAAEA,CAACC,IAAI,EAAEC,EAAE,KACpBL,YAAY,CAACG,WAAW,CAACJ,6BAA6B,GAAGK,IAAI,EAAEC,EAAE;AACrE,CAAC;AACD;AACA;AACA;AACA;AAHAP,OAAA,CAAAI,cAAA,GAAAA,cAAA;AAIO,MAAMI,kBAA4C,GAAG;EAC1DH,WAAW,EAAEA,CAACC,IAAI,EAAEC,EAAE,KACpBL,YAAY,CAACG,WAAW,CAACJ,6BAA6B,GAAGK,IAAI,EAAEC,EAAE;AACrE,CAAC;AAACP,OAAA,CAAAQ,kBAAA,GAAAA,kBAAA;AACK,MAAMC,sBAAyD,GACpEpB,OAAO,CAAC,+CAA+C,CAAC,CAACK,OAAO;AAACM,OAAA,CAAAS,sBAAA,GAAAA,sBAAA;AAC5D,MAAMC,mBAAuD,GAClEnB,qBAAQ,CAACoB,EAAE,KAAK,SAAS,IAAIpB,qBAAQ,CAACqB,OAAO,IAAI,EAAE,GAC/CvB,OAAO,CAAC,4CAA4C,CAAC,CAACK,OAAO,GAC7DmB,IAAA;EAAA,IAAC;IAAEC;EAAmC,CAAC,GAAAD,IAAA;EAAA,OAAKC,QAAQ;AAAA;AAACd,OAAA,CAAAU,mBAAA,GAAAA,mBAAA"}