react-native-keyboard-controller 1.13.4 → 1.14.0

package/android/src/main/java/com/reactnativekeyboardcontroller/managers/KeyboardControllerViewManagerImpl.kt

@@ -6,40 +6,51 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.reactnativekeyboardcontroller.views.EdgeToEdgeReactViewGroup
 
 @Suppress("detekt:UnusedPrivateProperty")
-class KeyboardControllerViewManagerImpl(mReactContext: ReactApplicationContext) {
-  fun createViewInstance(reactContext: ThemedReactContext): EdgeToEdgeReactViewGroup {
-    return EdgeToEdgeReactViewGroup(reactContext)
-  }
-
-  fun setEnabled(view: EdgeToEdgeReactViewGroup, enabled: Boolean) {
+class KeyboardControllerViewManagerImpl(
+  mReactContext: ReactApplicationContext,
+) {
+  fun createViewInstance(reactContext: ThemedReactContext): EdgeToEdgeReactViewGroup =
+    EdgeToEdgeReactViewGroup(reactContext)
+
+  fun setEnabled(
+    view: EdgeToEdgeReactViewGroup,
+    enabled: Boolean,
+  ) {
     view.setActive(enabled)
   }
 
-  fun setStatusBarTranslucent(view: EdgeToEdgeReactViewGroup, isStatusBarTranslucent: Boolean) {
+  fun setStatusBarTranslucent(
+    view: EdgeToEdgeReactViewGroup,
+    isStatusBarTranslucent: Boolean,
+  ) {
     view.setStatusBarTranslucent(isStatusBarTranslucent)
   }
 
-  fun setNavigationBarTranslucent(view: EdgeToEdgeReactViewGroup, isNavigationBarTranslucent: Boolean) {
+  fun setNavigationBarTranslucent(
+    view: EdgeToEdgeReactViewGroup,
+    isNavigationBarTranslucent: Boolean,
+  ) {
     view.setNavigationBarTranslucent(isNavigationBarTranslucent)
   }
 
   fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
-    val map: MutableMap<String, Any> = MapBuilder.of(
-      "topKeyboardMove",
-      MapBuilder.of("registrationName", "onKeyboardMove"),
-      "topKeyboardMoveStart",
-      MapBuilder.of("registrationName", "onKeyboardMoveStart"),
-      "topKeyboardMoveEnd",
-      MapBuilder.of("registrationName", "onKeyboardMoveEnd"),
-      "topKeyboardMoveInteractive",
-      MapBuilder.of("registrationName", "onKeyboardMoveInteractive"),
-      "topFocusedInputLayoutChanged",
-      MapBuilder.of("registrationName", "onFocusedInputLayoutChanged"),
-      "topFocusedInputTextChanged",
-      MapBuilder.of("registrationName", "onFocusedInputTextChanged"),
-      "topFocusedInputSelectionChanged",
-      MapBuilder.of("registrationName", "onFocusedInputSelectionChanged"),
-    )
+    val map: MutableMap<String, Any> =
+      MapBuilder.of(
+        "topKeyboardMove",
+        MapBuilder.of("registrationName", "onKeyboardMove"),
+        "topKeyboardMoveStart",
+        MapBuilder.of("registrationName", "onKeyboardMoveStart"),
+        "topKeyboardMoveEnd",
+        MapBuilder.of("registrationName", "onKeyboardMoveEnd"),
+        "topKeyboardMoveInteractive",
+        MapBuilder.of("registrationName", "onKeyboardMoveInteractive"),
+        "topFocusedInputLayoutChanged",
+        MapBuilder.of("registrationName", "onFocusedInputLayoutChanged"),
+        "topFocusedInputTextChanged",
+        MapBuilder.of("registrationName", "onFocusedInputTextChanged"),
+        "topFocusedInputSelectionChanged",
+        MapBuilder.of("registrationName", "onFocusedInputSelectionChanged"),
+      )
 
     return map
   }

package/android/src/main/java/com/reactnativekeyboardcontroller/managers/KeyboardGestureAreaViewManagerImpl.kt

@@ -5,24 +5,37 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.reactnativekeyboardcontroller.views.KeyboardGestureAreaReactViewGroup
 
 @Suppress("detekt:UnusedPrivateProperty")
-class KeyboardGestureAreaViewManagerImpl(mReactContext: ReactApplicationContext) {
-  fun createViewInstance(reactContext: ThemedReactContext): KeyboardGestureAreaReactViewGroup {
-    return KeyboardGestureAreaReactViewGroup(reactContext)
-  }
+class KeyboardGestureAreaViewManagerImpl(
+  mReactContext: ReactApplicationContext,
+) {
+  fun createViewInstance(reactContext: ThemedReactContext): KeyboardGestureAreaReactViewGroup =
+    KeyboardGestureAreaReactViewGroup(reactContext)
 
-  fun setOffset(view: KeyboardGestureAreaReactViewGroup, offset: Double) {
+  fun setOffset(
+    view: KeyboardGestureAreaReactViewGroup,
+    offset: Double,
+  ) {
     view.setOffset(offset)
   }
 
-  fun setInterpolator(view: KeyboardGestureAreaReactViewGroup, interpolator: String) {
+  fun setInterpolator(
+    view: KeyboardGestureAreaReactViewGroup,
+    interpolator: String,
+  ) {
     view.setInterpolator(interpolator)
   }
 
-  fun setScrollKeyboardOffScreenWhenVisible(view: KeyboardGestureAreaReactViewGroup, value: Boolean) {
+  fun setScrollKeyboardOffScreenWhenVisible(
+    view: KeyboardGestureAreaReactViewGroup,
+    value: Boolean,
+  ) {
     view.setScrollKeyboardOffScreenWhenVisible(value)
   }
 
-  fun setScrollKeyboardOnScreenWhenNotVisible(view: KeyboardGestureAreaReactViewGroup, value: Boolean) {
+  fun setScrollKeyboardOnScreenWhenNotVisible(
+    view: KeyboardGestureAreaReactViewGroup,
+    value: Boolean,
+  ) {
     view.setScrollKeyboardOnScreenWhenNotVisible(value)
   }
 

package/android/src/main/java/com/reactnativekeyboardcontroller/managers/OverKeyboardViewManagerImpl.kt

@@ -0,0 +1,27 @@
+package com.reactnativekeyboardcontroller.managers
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ThemedReactContext
+import com.reactnativekeyboardcontroller.views.overlay.OverKeyboardHostView
+
+@Suppress("detekt:UnusedPrivateProperty")
+class OverKeyboardViewManagerImpl(
+  mReactContext: ReactApplicationContext,
+) {
+  fun createViewInstance(reactContext: ThemedReactContext): OverKeyboardHostView = OverKeyboardHostView(reactContext)
+
+  fun setVisible(
+    view: OverKeyboardHostView,
+    value: Boolean,
+  ) {
+    if (value) {
+      view.show()
+    } else {
+      view.hide()
+    }
+  }
+
+  companion object {
+    const val NAME = "OverKeyboardView"
+  }
+}

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

@@ -30,12 +30,13 @@ class ModalAttachedWatcher(
       return
     }
 
-    val modal = try {
-      uiManager?.resolveView(event.viewTag) as? ReactModalHostView
-    } catch (ignore: Exception) {
-      Logger.w(TAG, "Can not resolve view for Modal#${event.viewTag}", ignore)
-      null
-    }
+    val modal =
+      try {
+        uiManager?.resolveView(event.viewTag) as? ReactModalHostView
+      } catch (ignore: Exception) {
+        Logger.w(TAG, "Can not resolve view for Modal#${event.viewTag}", ignore)
+        null
+      }
 
     if (modal == null) {
       return
@@ -46,12 +47,13 @@ class ModalAttachedWatcher(
     val rootView = window?.decorView?.rootView
 
     if (rootView != null) {
-      val callback = KeyboardAnimationCallback(
-        view = rootView,
-        eventPropagationView = view,
-        context = reactContext,
-        config = config(),
-      )
+      val callback =
+        KeyboardAnimationCallback(
+          view = rootView,
+          eventPropagationView = view,
+          context = reactContext,
+          config = config(),
+        )
 
       ViewCompat.setWindowInsetsAnimationCallback(rootView, callback)
       ViewCompat.setOnApplyWindowInsetsListener(rootView, callback)

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

@@ -9,7 +9,9 @@ import com.facebook.react.bridge.UiThreadUtil
 import com.reactnativekeyboardcontroller.traversal.FocusedInputHolder
 import com.reactnativekeyboardcontroller.traversal.ViewHierarchyNavigator
 
-class KeyboardControllerModuleImpl(private val mReactContext: ReactApplicationContext) {
+class KeyboardControllerModuleImpl(
+  private val mReactContext: ReactApplicationContext,
+) {
   private val mDefaultMode: Int = getCurrentMode()
 
   fun setInputMode(mode: Int) {
@@ -22,10 +24,10 @@ class KeyboardControllerModuleImpl(private val mReactContext: ReactApplicationCo
 
   fun dismiss() {
     val activity = mReactContext.currentActivity
-    val view: View? = activity?.currentFocus
+    val view: View? = FocusedInputHolder.get()
 
     if (view != null) {
-      val imm = activity.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+      val imm = activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
       imm?.hideSoftInputFromWindow(view.windowToken, 0)
     }
   }
@@ -35,8 +37,7 @@ class KeyboardControllerModuleImpl(private val mReactContext: ReactApplicationCo
       return FocusedInputHolder.focus()
     }
 
-    val activity = mReactContext.currentActivity
-    val view: View? = activity?.currentFocus
+    val view: View? = FocusedInputHolder.get()
 
     if (view != null) {
       ViewHierarchyNavigator.setFocusTo(direction, view)
@@ -51,14 +52,13 @@ class KeyboardControllerModuleImpl(private val mReactContext: ReactApplicationCo
     }
   }
 
-  private fun getCurrentMode(): Int {
-    return mReactContext
+  private fun getCurrentMode(): Int =
+    mReactContext
       .currentActivity
       ?.window
       ?.attributes
       ?.softInputMode
       ?: WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED
-  }
 
   companion object {
     const val NAME = "KeyboardController"

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

@@ -14,7 +14,9 @@ import com.reactnativekeyboardcontroller.views.EdgeToEdgeReactViewGroup
 
 private val TAG = StatusBarManagerCompatModuleImpl::class.qualifiedName
 
-class StatusBarManagerCompatModuleImpl(private val mReactContext: ReactApplicationContext) {
+class StatusBarManagerCompatModuleImpl(
+  private val mReactContext: ReactApplicationContext,
+) {
   private var controller: WindowInsetsControllerCompat? = null
 
   fun setHidden(hidden: Boolean) {
@@ -28,7 +30,10 @@ class StatusBarManagerCompatModuleImpl(private val mReactContext: ReactApplicati
   }
 
   @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
-  fun setColor(color: Int, animated: Boolean) {
+  fun setColor(
+    color: Int,
+    animated: Boolean,
+  ) {
     val activity = mReactContext.currentActivity
     if (activity == null) {
       Logger.w(TAG, "StatusBarManagerCompatModule: Ignored status bar change, current activity is null.")

package/android/src/main/java/com/reactnativekeyboardcontroller/traversal/FocusedInputHolder.kt

@@ -11,9 +11,7 @@ object FocusedInputHolder {
     input = WeakReference(textInput)
   }
 
-  fun get(): EditText? {
-    return input?.get()
-  }
+  fun get(): EditText? = input?.get()
 
   fun focus() {
     input?.get()?.focus()

package/android/src/main/java/com/reactnativekeyboardcontroller/traversal/ViewHierarchyNavigator.kt

@@ -7,7 +7,10 @@ import com.facebook.react.bridge.UiThreadUtil
 import com.reactnativekeyboardcontroller.extensions.focus
 
 object ViewHierarchyNavigator {
-  fun setFocusTo(direction: String, view: View) {
+  fun setFocusTo(
+    direction: String,
+    view: View,
+  ) {
     val input = if (direction == "next") findNextEditText(view) else findPreviousEditText(view)
 
     UiThreadUtil.runOnUiThread {
@@ -35,16 +38,15 @@ object ViewHierarchyNavigator {
     return editTexts
   }
 
-  private fun findNextEditText(currentFocus: View): EditText? {
-    return findEditTextInDirection(currentFocus, 1)
-  }
+  private fun findNextEditText(currentFocus: View): EditText? = findEditTextInDirection(currentFocus, 1)
 
-  private fun findPreviousEditText(currentFocus: View): EditText? {
-    return findEditTextInDirection(currentFocus, -1)
-  }
+  private fun findPreviousEditText(currentFocus: View): EditText? = findEditTextInDirection(currentFocus, -1)
 
   @Suppress("detekt:ReturnCount")
-  private fun findEditTextInDirection(currentFocus: View, direction: Int): EditText? {
+  private fun findEditTextInDirection(
+    currentFocus: View,
+    direction: Int,
+  ): EditText? {
     // Attempt to find the parent view group, return null if not found or not a ViewGroup
     val parentViewGroup = currentFocus.parent as? ViewGroup ?: return null
 
@@ -66,7 +68,10 @@ object ViewHierarchyNavigator {
     return findEditTextInDirection(parentViewGroup, direction)
   }
 
-  private fun findEditTextInHierarchy(viewGroup: ViewGroup, direction: Int): EditText? {
+  private fun findEditTextInHierarchy(
+    viewGroup: ViewGroup,
+    direction: Int,
+  ): EditText? {
     val range = if (direction > 0) 0 until viewGroup.childCount else viewGroup.childCount - 1 downTo 0
 
     for (i in range) {
@@ -78,7 +83,10 @@ object ViewHierarchyNavigator {
     return null
   }
 
-  private fun findEditTextOrGoDeeper(child: View, direction: Int): EditText? {
+  private fun findEditTextOrGoDeeper(
+    child: View,
+    direction: Int,
+  ): EditText? {
     var result: EditText? = null
 
     if (isValidTextInput(child)) {
@@ -91,7 +99,5 @@ object ViewHierarchyNavigator {
     return result
   }
 
-  private fun isValidTextInput(view: View?): Boolean {
-    return view is EditText && view.isEnabled
-  }
+  private fun isValidTextInput(view: View?): Boolean = view is EditText && view.isEnabled
 }

package/android/src/main/java/com/reactnativekeyboardcontroller/ui/FrameScheduler.kt

@@ -7,20 +7,23 @@ import android.view.Choreographer
  *
  * @property callback The function to be executed on each frame.
  */
-class FrameScheduler(private val callback: () -> Unit) {
+class FrameScheduler(
+  private val callback: () -> Unit,
+) {
   /**
    * A FrameCallback instance responsible for running the provided callback
    * on each frame and rescheduling itself for the next frame.
    */
-  private val frameCallback = object : Choreographer.FrameCallback {
-    override fun doFrame(frameTimeNanoSeconds: Long) {
-      // Execute the callback
-      callback()
+  private val frameCallback =
+    object : Choreographer.FrameCallback {
+      override fun doFrame(frameTimeNanoSeconds: Long) {
+        // Execute the callback
+        callback()
 
-      // Re-post the callback to the next frame
-      Choreographer.getInstance().postFrameCallback(this)
+        // Re-post the callback to the next frame
+        Choreographer.getInstance().postFrameCallback(this)
+      }
     }
-  }
 
   /**
    * Starts the frame callback, which will continuously call the provided function

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

@@ -25,7 +25,9 @@ private val TAG = EdgeToEdgeReactViewGroup::class.qualifiedName
 
 @Suppress("detekt:TooManyFunctions")
 @SuppressLint("ViewConstructor")
-class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : ReactViewGroup(reactContext) {
+class EdgeToEdgeReactViewGroup(
+  private val reactContext: ThemedReactContext,
+) : ReactViewGroup(reactContext) {
   // props
   private var isStatusBarTranslucent = false
   private var isNavigationBarTranslucent = false
@@ -36,12 +38,13 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
   private var wasMounted = false
   private var callback: KeyboardAnimationCallback? = null
   private val config: KeyboardAnimationCallbackConfig
-    get() = KeyboardAnimationCallbackConfig(
-      persistentInsetTypes = WindowInsetsCompat.Type.systemBars(),
-      deferredInsetTypes = WindowInsetsCompat.Type.ime(),
-      dispatchMode = WindowInsetsAnimationCompat.Callback.DISPATCH_MODE_CONTINUE_ON_SUBTREE,
-      hasTranslucentNavigationBar = isNavigationBarTranslucent,
-    )
+    get() =
+      KeyboardAnimationCallbackConfig(
+        persistentInsetTypes = WindowInsetsCompat.Type.systemBars(),
+        deferredInsetTypes = WindowInsetsCompat.Type.ime(),
+        dispatchMode = WindowInsetsAnimationCompat.Callback.DISPATCH_MODE_CONTINUE_ON_SUBTREE,
+        hasTranslucentNavigationBar = isNavigationBarTranslucent,
+      )
 
   // managers/watchers
   private val modalAttachedWatcher = ModalAttachedWatcher(this, reactContext, ::config)
@@ -81,10 +84,11 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
     if (rootView != null) {
       ViewCompat.setOnApplyWindowInsetsListener(rootView) { v, insets ->
         val content = reactContext.content
-        val params = FrameLayout.LayoutParams(
-          FrameLayout.LayoutParams.MATCH_PARENT,
-          FrameLayout.LayoutParams.MATCH_PARENT,
-        )
+        val params =
+          FrameLayout.LayoutParams(
+            FrameLayout.LayoutParams.MATCH_PARENT,
+            FrameLayout.LayoutParams.MATCH_PARENT,
+          )
 
         val shouldApplyZeroPaddingTop = !active || this.isStatusBarTranslucent
         val shouldApplyZeroPaddingBottom = !active || this.isNavigationBarTranslucent
@@ -136,12 +140,13 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
       val root = reactContext.content
       root?.addView(eventView)
 
-      callback = KeyboardAnimationCallback(
-        view = this,
-        eventPropagationView = this,
-        context = reactContext,
-        config = config,
-      )
+      callback =
+        KeyboardAnimationCallback(
+          view = this,
+          eventPropagationView = this,
+          context = reactContext,
+          config = config,
+        )
 
       eventView?.let {
         ViewCompat.setWindowInsetsAnimationCallback(it, callback)

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

@@ -20,14 +20,17 @@ import com.reactnativekeyboardcontroller.interactive.interpolators.LinearInterpo
 import kotlin.math.absoluteValue
 import kotlin.math.roundToInt
 
-val interpolators = mapOf(
-  "linear" to LinearInterpolator(),
-  "ios" to IosInterpolator(),
-)
+val interpolators =
+  mapOf(
+    "linear" to LinearInterpolator(),
+    "ios" to IosInterpolator(),
+  )
 
 @Suppress("detekt:TooManyFunctions")
 @SuppressLint("ViewConstructor")
-class KeyboardGestureAreaReactViewGroup(private val reactContext: ThemedReactContext) : ReactViewGroup(reactContext) {
+class KeyboardGestureAreaReactViewGroup(
+  private val reactContext: ThemedReactContext,
+) : ReactViewGroup(reactContext) {
   // internal state management
   private var isHandling = false
   private var lastTouchX = 0f
@@ -127,12 +130,13 @@ class KeyboardGestureAreaReactViewGroup(private val reactContext: ThemedReactCon
         }
         // If we currently have control, we can update the IME insets to 'scroll'
         // the IME in
-        val moveBy = this.interpolator.interpolate(
-          dy.roundToInt(),
-          this.getWindowHeight() - event.rawY.toInt(),
-          controller.getCurrentKeyboardHeight(),
-          offset,
-        )
+        val moveBy =
+          this.interpolator.interpolate(
+            dy.roundToInt(),
+            this.getWindowHeight() - event.rawY.toInt(),
+            controller.getCurrentKeyboardHeight(),
+            offset,
+          )
 
         if (moveBy != 0) {
           controller.insetBy(moveBy)
@@ -141,8 +145,10 @@ class KeyboardGestureAreaReactViewGroup(private val reactContext: ThemedReactCon
         !controller.isInsetAnimationRequestPending() &&
         shouldStartRequest(
           dy = dy,
-          imeVisible = ViewCompat.getRootWindowInsets(this)
-            ?.isVisible(WindowInsetsCompat.Type.ime()) == true,
+          imeVisible =
+            ViewCompat
+              .getRootWindowInsets(this)
+              ?.isVisible(WindowInsetsCompat.Type.ime()) == true,
         )
       ) {
         // If we don't currently have control (and a request isn't pending),
@@ -210,7 +216,10 @@ class KeyboardGestureAreaReactViewGroup(private val reactContext: ThemedReactCon
    * Returns true if the given [dy], [IME visibility][imeVisible], and constructor options
    * support a IME animation request.
    */
-  private fun shouldStartRequest(dy: Float, imeVisible: Boolean) = when {
+  private fun shouldStartRequest(
+    dy: Float,
+    imeVisible: Boolean,
+  ) = when {
     // If the user is scroll up, return true if scrollImeOnScreenWhenNotVisible is true, and
     // the IME is not currently visible
     dy < 0 -> !imeVisible && scrollKeyboardOnScreenWhenNotVisible

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

@@ -0,0 +1,30 @@
+package com.reactnativekeyboardcontroller.views.overlay
+
+import com.facebook.react.uimanager.LayoutShadowNode
+import com.facebook.react.uimanager.ReactShadowNodeImpl
+import com.reactnativekeyboardcontroller.extensions.getDisplaySize
+
+/**
+ * We implement the OverKeyboardView by using an Android WindowManager. That will fill the entire window of the
+ * application. To get layout to work properly, we need to layout all the elements within the
+ * OverKeyboardView's inner content view as if they can fill the entire window. To do that, we need to
+ * explicitly set the styleWidth and styleHeight on the LayoutShadowNode of the child of this node
+ * to be the window size. This will then cause the children of the Modal to layout as if they can
+ * fill the window.
+ */
+internal class OverKeyboardHostShadowNode : LayoutShadowNode() {
+  /**
+   * We need to set the styleWidth and styleHeight of the one child (represented by the
+   * <View></View> within the <RCTOverKeyboardView></RCTOverKeyboardView> in OverKeyboardView.tsx.
+   * This needs to fill the entire window.
+   */
+  override fun addChildAt(
+    child: ReactShadowNodeImpl,
+    i: Int,
+  ) {
+    super.addChildAt(child, i)
+    val displaySize = themedContext.getDisplaySize()
+    child.setStyleWidth(displaySize.x.toFloat())
+    child.setStyleHeight(displaySize.y.toFloat())
+  }
+}