react-native-keyboard-controller 1.14.4 → 1.15.0

package/android/build.gradle

@@ -158,14 +158,15 @@ repositories {
 }
 
 def kotlin_version = getExtOrDefault('kotlinVersion')
+def reactNativeVersion = getExtOrDefault('reactNativeVersion')
 
 dependencies {
   if (project.ext.shouldConsumeReactNativeFromMavenCentral()) {
     // noinspection GradleDynamicVersion
-    implementation 'com.facebook.react:react-android:+'
+    implementation "com.facebook.react:react-android:$reactNativeVersion"
   } else {
     // noinspection GradleDynamicVersion
-    implementation 'com.facebook.react:react-native:+'
+    implementation "com.facebook.react:react-native:$reactNativeVersion"
   }
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation 'androidx.core:core-ktx:1.5.0-beta03'

package/android/gradle.properties

@@ -2,5 +2,6 @@ KeyboardController_kotlinVersion=1.8.22
 KeyboardController_compileSdkVersion=33
 KeyboardController_targetSdkVersion=33
 KeyboardController_minSdkVersion=16
+KeyboardController_reactNativeVersion=+
 
 android.useAndroidX=true

package/android/react-native-helpers.gradle

@@ -4,23 +4,17 @@ def safeAppExtGet(prop, fallback) {
 }
 
 // Let's detect react-native's directory, it will be used to determine RN's version
-// https://github.com/software-mansion/react-native-reanimated/blob/cda4627c3337c33674f05f755b7485165c6caca9/android/build.gradle#L88
+// https://github.com/software-mansion/react-native-reanimated/blob/36c291a15880c78a94dd125c51484630546ceb7c/packages/react-native-reanimated/android/build.gradle#L73
 def resolveReactNativeDirectory() {
   def reactNativeLocation = safeAppExtGet("REACT_NATIVE_NODE_MODULES_DIR", null)
   if (reactNativeLocation != null) {
     return file(reactNativeLocation)
   }
 
-  // monorepo workaround
-  // react-native can be hoisted or in project's own node_modules
-  def reactNativeFromProjectNodeModules = file("${rootProject.projectDir}/../node_modules/react-native")
-  if (reactNativeFromProjectNodeModules.exists()) {
-    return reactNativeFromProjectNodeModules
-  }
-
-  def reactNativeFromNodeModules = file("${projectDir}/../../react-native")
-  if (reactNativeFromNodeModules.exists()) {
-    return reactNativeFromNodeModules
+  // Fallback to node resolver for custom directory structures like monorepos.
+  def reactNativePackage = file(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim())
+  if (reactNativePackage.exists()) {
+      return reactNativePackage.parentFile
   }
 
   throw new GradleException(

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

@@ -18,8 +18,8 @@ class KeyboardControllerModule(
     module.setDefaultMode()
   }
 
-  override fun dismiss() {
-    module.dismiss()
+  override fun dismiss(keepFocus: Boolean) {
+    module.dismiss(keepFocus)
   }
 
   override fun setFocusTo(direction: String) {

package/android/src/main/java/com/reactnativekeyboardcontroller/extensions/EditText.kt

@@ -2,6 +2,7 @@ package com.reactnativekeyboardcontroller.extensions
 
 import android.os.Build
 import android.text.Editable
+import android.text.InputType
 import android.text.TextWatcher
 import android.view.View
 import android.widget.EditText
@@ -110,6 +111,40 @@ fun EditText?.focus() {
   }
 }
 
+val EditText?.keyboardType: String
+  get() {
+    if (this == null) {
+      return "default"
+    }
+
+    // Extract base input type class
+    val inputTypeClass = inputType and InputType.TYPE_MASK_CLASS
+    val inputTypeVariation = inputType and InputType.TYPE_MASK_VARIATION
+
+    // Check for special input types
+    return when {
+      inputTypeVariation == InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS -> "email-address"
+      inputTypeVariation == InputType.TYPE_TEXT_VARIATION_URI -> "url"
+      inputTypeVariation == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD -> "visible-password"
+
+      // Check for specific input type classes
+      inputTypeClass == InputType.TYPE_CLASS_NUMBER ->
+        when {
+          (inputType and InputType.TYPE_NUMBER_FLAG_DECIMAL) != 0 &&
+            (inputType and InputType.TYPE_NUMBER_FLAG_SIGNED) == 0 -> "decimal-pad"
+
+          (inputType and InputType.TYPE_NUMBER_FLAG_SIGNED) != 0 -> "numeric"
+
+          else -> "number-pad"
+        }
+
+      inputTypeClass == InputType.TYPE_CLASS_PHONE -> "phone-pad"
+      inputTypeClass == InputType.TYPE_CLASS_TEXT -> "default"
+
+      else -> "default"
+    }
+  }
+
 class KeyboardControllerSelectionWatcher(
   private val editText: ReactEditText,
   private val action: (start: Int, end: Int, startX: Double, startY: Double, endX: Double, endY: Double) -> Unit,

package/android/src/main/java/com/reactnativekeyboardcontroller/extensions/ThemedReactContext.kt

@@ -1,5 +1,7 @@
 package com.reactnativekeyboardcontroller.extensions
 
+import android.content.Context
+import android.os.Build
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
@@ -34,3 +36,19 @@ fun ThemedReactContext?.emitEvent(
 
   Logger.i("ThemedReactContext", event)
 }
+
+val ThemedReactContext?.appearance: String
+  get() =
+    when {
+      this == null -> "default"
+      isSystemDarkMode(this) -> "dark"
+      else -> "light"
+    }
+
+private fun isSystemDarkMode(context: Context): Boolean =
+  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+    (context.getSystemService(Context.UI_MODE_SERVICE) as? android.app.UiModeManager)
+      ?.nightMode == android.app.UiModeManager.MODE_NIGHT_YES
+  } else {
+    false
+  }

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

@@ -15,12 +15,15 @@ import com.facebook.react.views.textinput.ReactEditText
 import com.facebook.react.views.view.ReactViewGroup
 import com.reactnativekeyboardcontroller.constants.Keyboard
 import com.reactnativekeyboardcontroller.events.KeyboardTransitionEvent
+import com.reactnativekeyboardcontroller.extensions.appearance
 import com.reactnativekeyboardcontroller.extensions.dispatchEvent
 import com.reactnativekeyboardcontroller.extensions.dp
 import com.reactnativekeyboardcontroller.extensions.emitEvent
 import com.reactnativekeyboardcontroller.extensions.isKeyboardAnimation
+import com.reactnativekeyboardcontroller.extensions.keyboardType
 import com.reactnativekeyboardcontroller.interactive.InteractiveKeyboardProvider
 import com.reactnativekeyboardcontroller.log.Logger
+import com.reactnativekeyboardcontroller.traversal.FocusedInputHolder
 import kotlin.math.abs
 
 private val TAG = KeyboardAnimationCallback::class.qualifiedName
@@ -425,6 +428,8 @@ class KeyboardAnimationCallback(
     params.putInt("duration", duration)
     params.putDouble("timestamp", System.currentTimeMillis().toDouble())
     params.putInt("target", viewTagFocused)
+    params.putString("type", FocusedInputHolder.get()?.keyboardType)
+    params.putString("appearance", context.appearance)
 
     return params
   }

package/android/src/main/java/com/reactnativekeyboardcontroller/modal/ModalAttachedWatcher.kt

@@ -65,14 +65,17 @@ class ModalAttachedWatcher(
         )
 
       rootView.addView(eventView)
-      // on Android < 12 all events for `WindowInsetsAnimationCallback`
-      // go through main `rootView`, so we don't need to stop main
-      // callback - otherwise keyboard transitions will not be animated
-      this.callback()?.suspend(areEventsComingFromOwnWindow)
-      ViewCompat.setWindowInsetsAnimationCallback(rootView, callback)
-      ViewCompat.setOnApplyWindowInsetsListener(eventView, callback)
 
       if (areEventsComingFromOwnWindow) {
+        // on Android < 12 all events for `WindowInsetsAnimationCallback`
+        // go through main `rootView`, so we don't need to stop main
+        // callback - otherwise keyboard transitions will not be animated
+        this.callback()?.suspend(true)
+        // attaching callback to Modal on Android < 12 can cause ghost animations, see: https://github.com/kirillzyusko/react-native-keyboard-controller/pull/718
+        // and overall attaching additional callbacks (if animation events go through the main window) is not necessary
+        ViewCompat.setWindowInsetsAnimationCallback(rootView, callback)
+        ViewCompat.setOnApplyWindowInsetsListener(eventView, callback)
+
         // when modal is shown then keyboard will be hidden by default
         //
         // - if events are coming from main window - then keyboard position

package/android/src/main/java/com/reactnativekeyboardcontroller/modules/KeyboardControllerModuleImpl.kt

@@ -22,19 +22,28 @@ class KeyboardControllerModuleImpl(
     setSoftInputMode(mDefaultMode)
   }
 
-  fun dismiss() {
+  fun dismiss(keepFocus: Boolean) {
     val activity = mReactContext.currentActivity
     val view: View? = FocusedInputHolder.get()
 
     if (view != null) {
-      val imm = activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
-      imm?.hideSoftInputFromWindow(view.windowToken, 0)
+      UiThreadUtil.runOnUiThread {
+        val imm = activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+        imm?.hideSoftInputFromWindow(view.windowToken, 0)
+        if (!keepFocus) {
+          view.clearFocus()
+        }
+      }
     }
   }
 
   fun setFocusTo(direction: String) {
     if (direction == "current") {
-      return FocusedInputHolder.focus()
+      UiThreadUtil.runOnUiThread {
+        FocusedInputHolder.focus()
+      }
+
+      return
     }
 
     val view: View? = FocusedInputHolder.get()

package/android/src/main/java/com/reactnativekeyboardcontroller/views/overlay/JSPointerDispatcherCompat.kt

@@ -0,0 +1,56 @@
+package com.reactnativekeyboardcontroller.views.overlay
+
+import android.view.MotionEvent
+import android.view.ViewGroup
+import com.facebook.react.uimanager.JSPointerDispatcher
+import com.facebook.react.uimanager.events.EventDispatcher
+import java.lang.reflect.Method
+
+/**
+ * Compat layer for `JSPointerDispatcher` interface for RN < 0.72
+ */
+class JSPointerDispatcherCompat(
+  viewGroup: ViewGroup,
+) : JSPointerDispatcher(viewGroup) {
+  private val handleMotionEventMethod: Method? by lazy {
+    try {
+      // Try to get the 3-parameter method (for RN >= 0.72)
+      JSPointerDispatcher::class.java.getMethod(
+        HANDLE_MOTION_EVENT,
+        MotionEvent::class.java,
+        EventDispatcher::class.java,
+        Boolean::class.javaPrimitiveType,
+      )
+    } catch (_: NoSuchMethodException) {
+      try {
+        // Fallback to 2-parameter method (for RN < 0.72)
+        JSPointerDispatcher::class.java.getMethod(
+          HANDLE_MOTION_EVENT,
+          MotionEvent::class.java,
+          EventDispatcher::class.java,
+        )
+      } catch (_: NoSuchMethodException) {
+        null
+      }
+    }
+  }
+
+  fun handleMotionEventCompat(
+    event: MotionEvent?,
+    eventDispatcher: EventDispatcher?,
+    isCapture: Boolean,
+  ) {
+    handleMotionEventMethod?.let { method ->
+      if (method.parameterCount == RN_72_PARAMS_COUNT) {
+        method.invoke(this, event, eventDispatcher, isCapture)
+      } else {
+        method.invoke(this, event, eventDispatcher)
+      }
+    }
+  }
+
+  companion object {
+    private const val HANDLE_MOTION_EVENT = "handleMotionEvent"
+    private const val RN_72_PARAMS_COUNT = 3
+  }
+}

package/android/src/main/java/com/reactnativekeyboardcontroller/views/overlay/OverKeyboardViewGroup.kt

@@ -8,7 +8,6 @@ import android.view.View
 import android.view.WindowManager
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.config.ReactFeatureFlags
-import com.facebook.react.uimanager.JSPointerDispatcher
 import com.facebook.react.uimanager.JSTouchDispatcher
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
@@ -99,13 +98,13 @@ class OverKeyboardRootViewGroup(
 ) : ReactViewGroup(reactContext),
   RootViewCompat {
   private val jsTouchDispatcher: JSTouchDispatcher = JSTouchDispatcher(this)
-  private var jsPointerDispatcher: JSPointerDispatcher? = null
+  private var jsPointerDispatcher: JSPointerDispatcherCompat? = null
   internal var eventDispatcher: EventDispatcher? = null
   internal var isAttached = false
 
   init {
     if (ReactFeatureFlags.dispatchPointerEvents) {
-      jsPointerDispatcher = JSPointerDispatcher(this)
+      jsPointerDispatcher = JSPointerDispatcherCompat(this)
     }
   }
 
@@ -125,7 +124,7 @@ class OverKeyboardRootViewGroup(
   override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
     eventDispatcher?.let { eventDispatcher ->
       jsTouchDispatcher.handleTouchEvent(event, eventDispatcher)
-      jsPointerDispatcher?.handleMotionEvent(event, eventDispatcher, true)
+      jsPointerDispatcher?.handleMotionEventCompat(event, eventDispatcher, true)
     }
     return super.onInterceptTouchEvent(event)
   }
@@ -134,7 +133,7 @@ class OverKeyboardRootViewGroup(
   override fun onTouchEvent(event: MotionEvent): Boolean {
     eventDispatcher?.let { eventDispatcher ->
       jsTouchDispatcher.handleTouchEvent(event, eventDispatcher)
-      jsPointerDispatcher?.handleMotionEvent(event, eventDispatcher, false)
+      jsPointerDispatcher?.handleMotionEventCompat(event, eventDispatcher, false)
     }
     super.onTouchEvent(event)
     // In case when there is no children interested in handling touch event, we return true from
@@ -143,12 +142,16 @@ class OverKeyboardRootViewGroup(
   }
 
   override fun onInterceptHoverEvent(event: MotionEvent): Boolean {
-    eventDispatcher?.let { jsPointerDispatcher?.handleMotionEvent(event, it, true) }
+    eventDispatcher?.let {
+      jsPointerDispatcher?.handleMotionEventCompat(event, it, true)
+    }
     return super.onHoverEvent(event)
   }
 
   override fun onHoverEvent(event: MotionEvent): Boolean {
-    eventDispatcher?.let { jsPointerDispatcher?.handleMotionEvent(event, it, false) }
+    eventDispatcher?.let {
+      jsPointerDispatcher?.handleMotionEventCompat(event, it, false)
+    }
     return super.onHoverEvent(event)
   }
 

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

@@ -23,8 +23,8 @@ class KeyboardControllerModule(
   }
 
   @ReactMethod
-  fun dismiss() {
-    module.dismiss()
+  fun dismiss(keepFocus: Boolean) {
+    module.dismiss(keepFocus)
   }
 
   @ReactMethod

package/ios/KeyboardControllerModule.mm

@@ -68,13 +68,13 @@ RCT_EXPORT_METHOD(setInputMode : (nonnull NSNumber *)mode)
 }
 
 #ifdef RCT_NEW_ARCH_ENABLED
-- (void)dismiss
+- (void)dismiss:(BOOL)keepFocus
 #else
-RCT_EXPORT_METHOD(dismiss)
+RCT_EXPORT_METHOD(dismiss : (BOOL)keepFocus)
 #endif
 {
   dispatch_async(dispatch_get_main_queue(), ^{
-    [[UIResponder current] resignFirstResponder];
+    [KeyboardControllerModuleImpl dismiss:keepFocus];
   });
 }
 

package/ios/KeyboardControllerModuleImpl.swift

@@ -0,0 +1,66 @@
+//
+//  KeyboardControllerModuleImpl.swift
+//  Pods
+//
+//  Created by Kiryl Ziusko on 19/11/2024.
+//
+
+import Foundation
+import UIKit
+
+@objc(KeyboardControllerModuleImpl)
+public class KeyboardControllerModuleImpl: NSObject {
+  private static let keyboardRevealGestureName = "keyboardRevealGesture"
+
+  @objc
+  public static func dismiss(_ keepFocus: Bool) {
+    guard let input = UIResponder.current as? TextInput else { return }
+
+    if keepFocus {
+      let tapGesture = UITapGestureRecognizer(target: self, action: #selector(onTextInputTapped(_:)))
+      tapGesture.name = keyboardRevealGestureName
+      input.addGestureRecognizer(tapGesture)
+
+      input.inputView = UIView()
+      input.reloadInputViews()
+
+      NotificationCenter.default.addObserver(
+        self,
+        selector: #selector(onResponderResigned(_:)),
+        name: UITextField.textDidEndEditingNotification,
+        object: input
+      )
+    } else {
+      input.resignFirstResponder()
+    }
+  }
+
+  @objc static func onTextInputTapped(_ gesture: UITapGestureRecognizer) {
+    if gesture.state == .ended {
+      guard let input = UIResponder.current as? TextInput else { return }
+
+      cleanup(input)
+
+      input.becomeFirstResponder()
+    }
+  }
+
+  @objc static func onResponderResigned(_ notification: Notification) {
+    guard let input = notification.object as? TextInput else { return }
+
+    cleanup(input)
+  }
+
+  static func cleanup(_ input: TextInput) {
+    input.inputView = nil
+    input.reloadInputViews()
+
+    if let gestures = input.gestureRecognizers {
+      for gesture in gestures where gesture.name == keyboardRevealGestureName {
+        input.removeGestureRecognizer(gesture)
+      }
+    }
+
+    NotificationCenter.default.removeObserver(self, name: UITextField.textDidEndEditingNotification, object: input)
+  }
+}

package/ios/events/KeyboardEventEmitterPayload.swift

@@ -0,0 +1,23 @@
+//
+//  KeyboardEventEmitterPayload.swift
+//  Pods
+//
+//  Created by Kiryl Ziusko on 07/12/2024.
+//
+
+import Foundation
+import UIKit
+
+public func buildEventParams(_ height: Double, _ duration: Int, _ tag: NSNumber) -> [AnyHashable: Any] {
+  var data = [AnyHashable: Any]()
+  let input = FocusedInputHolder.shared.get()
+
+  data["height"] = height
+  data["duration"] = duration
+  data["timestamp"] = Date.currentTimeStamp
+  data["target"] = tag
+  data["type"] = input?.keyboardType.name ?? "default"
+  data["appearance"] = input?.keyboardAppearance.name ?? "default"
+
+  return data
+}

package/ios/extensions/Notification.swift

@@ -0,0 +1,17 @@
+//
+//  Notification.swift
+//  Pods
+//
+//  Created by Kiryl Ziusko on 04/11/2024.
+//
+
+extension Notification {
+  func keyboardMetaData() -> (Int, NSValue?) {
+    let duration = Int(
+      (userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? Double ?? 0) * 1000
+    )
+    let keyboardFrame = userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue
+
+    return (duration, keyboardFrame)
+  }
+}

package/ios/extensions/UIKeyboardAppearance.swift

@@ -0,0 +1,21 @@
+//
+//  UIKeyboardAppearance.swift
+//  Pods
+//
+//  Created by Kiryl Ziusko on 08/12/2024.
+//
+
+import Foundation
+import UIKit
+
+public extension UIKeyboardAppearance {
+  var name: String {
+    switch self {
+    case .default: return "default"
+    case .dark: return "dark"
+    case .light: return "light"
+    @unknown default:
+      return "default"
+    }
+  }
+}

package/ios/extensions/UIKeyboardType.swift

@@ -0,0 +1,30 @@
+//
+//  UIKeyboardType.swift
+//  Pods
+//
+//  Created by Kiryl Ziusko on 08/12/2024.
+//
+
+import Foundation
+import UIKit
+
+extension UIKeyboardType {
+  private static let keyboardTypeToStringMapping: [UIKeyboardType: String] = [
+    .default: "default",
+    .asciiCapable: "ascii-capable",
+    .numbersAndPunctuation: "numbers-and-punctuation",
+    .URL: "url",
+    .numberPad: "number-pad",
+    .phonePad: "phone-pad",
+    .namePhonePad: "name-phone-pad",
+    .emailAddress: "email-address",
+    .decimalPad: "decimal-pad",
+    .twitter: "twitter",
+    .webSearch: "web-search",
+    .asciiCapableNumberPad: "ascii-capable-number-pad",
+  ]
+
+  var name: String {
+    return UIKeyboardType.keyboardTypeToStringMapping[self] ?? "default"
+  }
+}

package/ios/observers/KeyboardMovementObserver.swift

@@ -163,7 +163,7 @@ public class KeyboardMovementObserver: NSObject {
   }
 
   @objc func keyboardWillAppear(_ notification: Notification) {
-    let (duration, frame) = metaDataFromNotification(notification)
+    let (duration, frame) = notification.keyboardMetaData()
     if let keyboardFrame = frame {
       tag = UIResponder.current.reactViewTag
       let keyboardHeight = keyboardFrame.cgRectValue.size.height
@@ -173,7 +173,7 @@ public class KeyboardMovementObserver: NSObject {
 
       onRequestAnimation()
       onEvent("onKeyboardMoveStart", Float(keyboardHeight) as NSNumber, 1, duration as NSNumber, tag)
-      onNotify("KeyboardController::keyboardWillShow", getEventParams(keyboardHeight, duration))
+      onNotify("KeyboardController::keyboardWillShow", buildEventParams(keyboardHeight, duration, tag))
 
       setupKeyboardWatcher()
       initializeAnimation(fromValue: prevKeyboardPosition, toValue: keyboardHeight)
@@ -181,13 +181,13 @@ public class KeyboardMovementObserver: NSObject {
   }
 
   @objc func keyboardWillDisappear(_ notification: Notification) {
-    let (duration, _) = metaDataFromNotification(notification)
+    let (duration, _) = notification.keyboardMetaData()
     tag = UIResponder.current.reactViewTag
     self.duration = duration
 
     onRequestAnimation()
     onEvent("onKeyboardMoveStart", 0, 0, duration as NSNumber, tag)
-    onNotify("KeyboardController::keyboardWillHide", getEventParams(0, duration))
+    onNotify("KeyboardController::keyboardWillHide", buildEventParams(0, duration, tag))
 
     setupKeyboardWatcher()
     removeKVObserver()
@@ -196,7 +196,7 @@ public class KeyboardMovementObserver: NSObject {
 
   @objc func keyboardDidAppear(_ notification: Notification) {
     let timestamp = Date.currentTimeStamp
-    let (duration, frame) = metaDataFromNotification(notification)
+    let (duration, frame) = notification.keyboardMetaData()
     if let keyboardFrame = frame {
       let (position, _) = keyboardView.frameTransitionInWindow
       let keyboardHeight = keyboardFrame.cgRectValue.size.height
@@ -210,7 +210,7 @@ public class KeyboardMovementObserver: NSObject {
 
       onCancelAnimation()
       onEvent("onKeyboardMoveEnd", height as NSNumber, progress as NSNumber, duration as NSNumber, tag)
-      onNotify("KeyboardController::keyboardDidShow", getEventParams(height, duration))
+      onNotify("KeyboardController::keyboardDidShow", buildEventParams(height, duration, tag))
 
       removeKeyboardWatcher()
       setupKVObserver()
@@ -219,12 +219,12 @@ public class KeyboardMovementObserver: NSObject {
   }
 
   @objc func keyboardDidDisappear(_ notification: Notification) {
-    let (duration, _) = metaDataFromNotification(notification)
+    let (duration, _) = notification.keyboardMetaData()
     tag = UIResponder.current.reactViewTag
 
     onCancelAnimation()
     onEvent("onKeyboardMoveEnd", 0 as NSNumber, 0, duration as NSNumber, tag)
-    onNotify("KeyboardController::keyboardDidHide", getEventParams(0, duration))
+    onNotify("KeyboardController::keyboardDidHide", buildEventParams(0, duration, tag))
 
     removeKeyboardWatcher()
     animation = nil
@@ -309,23 +309,4 @@ public class KeyboardMovementObserver: NSObject {
       tag
     )
   }
-
-  private func metaDataFromNotification(_ notification: Notification) -> (Int, NSValue?) {
-    let duration = Int(
-      (notification.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? Double ?? 0) * 1000
-    )
-    let keyboardFrame = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue
-
-    return (duration, keyboardFrame)
-  }
-
-  private func getEventParams(_ height: Double, _ duration: Int) -> [AnyHashable: Any] {
-    var data = [AnyHashable: Any]()
-    data["height"] = height
-    data["duration"] = duration
-    data["timestamp"] = Date.currentTimeStamp
-    data["target"] = tag
-
-    return data
-  }
 }

package/ios/{traversal → protocols}/TextInput.swift

@@ -9,7 +9,11 @@
 import Foundation
 import UIKit
 
-public protocol TextInput: AnyObject {
+public protocol TextInput: UIView {
+  // default common methods/properties
+  var inputView: UIView? { get set }
+  var keyboardType: UIKeyboardType { get }
+  var keyboardAppearance: UIKeyboardAppearance { get }
   func focus()
 }
 

package/ios/traversal/ViewHierarchyNavigator.swift

@@ -14,7 +14,10 @@ public class ViewHierarchyNavigator: NSObject {
   @objc public static func setFocusTo(direction: String) {
     DispatchQueue.main.async {
       if direction == "current" {
-        FocusedInputHolder.shared.focus()
+        let input = FocusedInputHolder.shared.get()
+        input?.inputView = nil
+        input?.reloadInputViews()
+        input?.focus()
         return
       }