react-native-keyboard-controller 1.5.7 → 1.5.8

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

@@ -145,12 +145,14 @@ class KeyboardAnimationCallback(
     super.onEnd(animation)
 
     isTransitioning = false
+
+    var keyboardHeight = this.persistentKeyboardHeight
     // if keyboard becomes shown after interactive animation completion
     // getCurrentKeyboardHeight() will be `0` and isKeyboardVisible will be `false`
     // it's not correct behavior, so we are handling it here
     val isKeyboardShown = InteractiveKeyboardProvider.shown
     if (!isKeyboardShown) {
-      this.persistentKeyboardHeight = getCurrentKeyboardHeight()
+      keyboardHeight = getCurrentKeyboardHeight()
     } else {
       // if keyboard is shown after interactions and the animation has finished
       // then we need to reset the state
@@ -158,8 +160,8 @@ class KeyboardAnimationCallback(
     }
     isKeyboardVisible = isKeyboardVisible || isKeyboardShown
 
-    this.emitEvent("KeyboardController::" + if (!isKeyboardVisible) "keyboardDidHide" else "keyboardDidShow", getEventParams(this.persistentKeyboardHeight))
-    this.sendEventToJS(KeyboardTransitionEvent(view.id, "topKeyboardMoveEnd", this.persistentKeyboardHeight, if (!isKeyboardVisible) 0.0 else 1.0))
+    this.emitEvent("KeyboardController::" + if (!isKeyboardVisible) "keyboardDidHide" else "keyboardDidShow", getEventParams(keyboardHeight))
+    this.sendEventToJS(KeyboardTransitionEvent(view.id, "topKeyboardMoveEnd", keyboardHeight, if (!isKeyboardVisible) 0.0 else 1.0))
   }
 
   private fun isKeyboardVisible(): Boolean {

package/android/src/main/java/com/reactnativekeyboardcontroller/KeyboardAnimationController.kt

@@ -284,8 +284,14 @@ internal class KeyboardAnimationController {
         velocityY = velocityY,
       )
       // The current inset matches either the shown/hidden inset, finish() immediately
-      current == shown -> controller.finish(true)
-      current == hidden -> controller.finish(false)
+      current == shown -> {
+        InteractiveKeyboardProvider.shown = true
+        controller.finish(true)
+      }
+      current == hidden -> {
+        InteractiveKeyboardProvider.shown = false
+        controller.finish(false)
+      }
       else -> {
         // Otherwise, we'll look at the current position...
         if (controller.currentFraction >= SCROLL_THRESHOLD) {

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

@@ -31,6 +31,7 @@ class KeyboardGestureAreaReactViewGroup(private val reactContext: ThemedReactCon
   private var lastTouchX = 0f
   private var lastTouchY = 0f
   private var lastWindowY = 0
+  private var keyboardHeight = 0
 
   // react props
   private var interpolator: Interpolator = LinearInterpolator()
@@ -87,6 +88,9 @@ class KeyboardGestureAreaReactViewGroup(private val reactContext: ThemedReactCon
 
         if (isHandling) {
           if (controller.isInsetAnimationInProgress()) {
+            if (keyboardHeight == 0) {
+              this.keyboardHeight = controller.getCurrentKeyboardHeight()
+            }
             // 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())
@@ -122,10 +126,18 @@ class KeyboardGestureAreaReactViewGroup(private val reactContext: ThemedReactCon
         // Calculate the current velocityY, over 500 milliseconds
         velocityTracker?.computeCurrentVelocity(500)
         val velocityY = velocityTracker?.yVelocity
+        val isKeyboardPositionChanged =
+          // check `isInsetAnimationInProgress()` before, since direct usage of `getCurrentKeyboardHeight()`
+          // may throw exception
+          !controller.isInsetAnimationInProgress() ||
+            this.keyboardHeight != controller.getCurrentKeyboardHeight()
+        // if keyboard height was changed after finger movement -> we need to calculate final position
+        // and make an animated transition
+        val passedVelocityY = if (isKeyboardPositionChanged) velocityY else null
 
         // If we received a ACTION_UP event, end any current WindowInsetsAnimation passing
         // in the calculated Y velocity
-        controller.animateToFinish(velocityY)
+        controller.animateToFinish(passedVelocityY)
 
         // Reset our touch handling state
         reset()
@@ -162,6 +174,7 @@ class KeyboardGestureAreaReactViewGroup(private val reactContext: ThemedReactCon
     lastTouchX = 0f
     lastTouchY = 0f
     lastWindowY = 0
+    keyboardHeight = 0
     bounds.setEmpty()
 
     velocityTracker?.recycle()

package/ios/KeyboardMovementObserver.swift

@@ -100,6 +100,11 @@ public class KeyboardMovementObserver: NSObject {
       if displayLink != nil {
         return
       }
+      // if keyboard height is not equal to its bounds - we can ignore
+      // values, since they'll be invalid and will cause UI jumps
+      if keyboardView?.bounds.size.height != keyboardHeight {
+        return
+      }
 
       // swiftlint:disable:next force_cast
       let keyboardFrameY = (change?[.newKey] as! NSValue).cgPointValue.y
@@ -208,7 +213,7 @@ public class KeyboardMovementObserver: NSObject {
           if subview.description.hasPrefix("<UIInputSetContainerView") {
             for hostView in subview.subviews {
               if hostView.description.hasPrefix("<UIInputSetHostView") {
-                result = hostView as? UIView
+                result = hostView
                 break
               }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-keyboard-controller",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "description": "Keyboard manager which works in identical way on both iOS and Android",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",