react-native-keyboard-controller 1.20.4 → 1.20.6

package/android/src/main/jni/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
-set(LIB_LITERAL keyboardcontroller)
+set(LIB_LITERAL RNKC)
 set(LIB_TARGET_NAME react_codegen_${LIB_LITERAL})
 
 set(LIB_ANDROID_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)

package/android/src/main/jni/RNKC.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
+
+/**
+ * Note this import and that it is not present in autogenerated header file
+ * under android/build/generated/source/codegen/jni/RNKC.h
+ *
+ * Here we are overriding autogenerated component descriptors by prioritizing our custom headers via include path setup.
+ */
+#include <react/renderer/components/RNKC/RNKCKeyboardControllerViewComponentDescriptor.h>
+#include <react/renderer/components/RNKC/RNKCKeyboardGestureAreaComponentDescriptor.h>
+#include <react/renderer/components/RNKC/RNKCOverKeyboardViewComponentDescriptor.h>
+#include <react/renderer/components/RNKC/RNKCKeyboardBackgroundViewComponentDescriptor.h>
+
+#include <memory>
+#include <string>
+
+namespace facebook::react {
+  JSI_EXPORT
+  std::shared_ptr<TurboModule> RNKC_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
+} // namespace facebook::react

package/common/cpp/react/renderer/components/{keyboardcontroller → RNKC}/RNKCKeyboardBackgroundViewComponentDescriptor.h

@@ -10,7 +10,7 @@
 #include "RNKCKeyboardBackgroundViewShadowNode.h"
 
 #include <react/debug/react_native_assert.h>
-#include <react/renderer/components/keyboardcontroller/Props.h>
+#include <react/renderer/components/RNKC/Props.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook::react {

package/common/cpp/react/renderer/components/{keyboardcontroller → RNKC}/RNKCKeyboardBackgroundViewShadowNode.h

@@ -9,8 +9,8 @@
 
 #include "RNKCKeyboardBackgroundViewState.h"
 
-#include <react/renderer/components/keyboardcontroller/EventEmitters.h>
-#include <react/renderer/components/keyboardcontroller/Props.h>
+#include <react/renderer/components/RNKC/EventEmitters.h>
+#include <react/renderer/components/RNKC/Props.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 

package/common/cpp/react/renderer/components/{keyboardcontroller → RNKC}/RNKCKeyboardControllerViewComponentDescriptor.h

@@ -3,7 +3,7 @@
 #include "RNKCKeyboardControllerViewShadowNode.h"
 
 #include <react/debug/react_native_assert.h>
-#include <react/renderer/components/keyboardcontroller/Props.h>
+#include <react/renderer/components/RNKC/Props.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook::react {

package/common/cpp/react/renderer/components/{keyboardcontroller → RNKC}/RNKCKeyboardControllerViewShadowNode.h

@@ -2,8 +2,8 @@
 
 #include "RNKCKeyboardControllerViewState.h"
 
-#include <react/renderer/components/keyboardcontroller/EventEmitters.h>
-#include <react/renderer/components/keyboardcontroller/Props.h>
+#include <react/renderer/components/RNKC/EventEmitters.h>
+#include <react/renderer/components/RNKC/Props.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 

package/common/cpp/react/renderer/components/{keyboardcontroller → RNKC}/RNKCKeyboardExtenderComponentDescriptor.h

@@ -10,7 +10,7 @@
 #include "RNKCKeyboardExtenderShadowNode.h"
 
 #include <react/debug/react_native_assert.h>
-#include <react/renderer/components/keyboardcontroller/Props.h>
+#include <react/renderer/components/RNKC/Props.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook::react {

package/common/cpp/react/renderer/components/{keyboardcontroller → RNKC}/RNKCKeyboardExtenderShadowNode.h

@@ -9,8 +9,8 @@
 
 #include "RNKCKeyboardExtenderState.h"
 
-#include <react/renderer/components/keyboardcontroller/EventEmitters.h>
-#include <react/renderer/components/keyboardcontroller/Props.h>
+#include <react/renderer/components/RNKC/EventEmitters.h>
+#include <react/renderer/components/RNKC/Props.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 

package/common/cpp/react/renderer/components/{keyboardcontroller → RNKC}/RNKCKeyboardGestureAreaComponentDescriptor.h

@@ -3,7 +3,7 @@
 #include "RNKCKeyboardGestureAreaShadowNode.h"
 
 #include <react/debug/react_native_assert.h>
-#include <react/renderer/components/keyboardcontroller/Props.h>
+#include <react/renderer/components/RNKC/Props.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook::react {

package/common/cpp/react/renderer/components/{keyboardcontroller → RNKC}/RNKCKeyboardGestureAreaShadowNode.h

@@ -2,8 +2,8 @@
 
 #include "RNKCKeyboardGestureAreaState.h"
 
-#include <react/renderer/components/keyboardcontroller/EventEmitters.h>
-#include <react/renderer/components/keyboardcontroller/Props.h>
+#include <react/renderer/components/RNKC/EventEmitters.h>
+#include <react/renderer/components/RNKC/Props.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 

package/common/cpp/react/renderer/components/{keyboardcontroller → RNKC}/RNKCOverKeyboardViewComponentDescriptor.h

@@ -3,7 +3,7 @@
 #include "RNKCOverKeyboardViewShadowNode.h"
 
 #include <react/debug/react_native_assert.h>
-#include <react/renderer/components/keyboardcontroller/Props.h>
+#include <react/renderer/components/RNKC/Props.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook::react {

package/common/cpp/react/renderer/components/{keyboardcontroller → RNKC}/RNKCOverKeyboardViewShadowNode.h

@@ -2,8 +2,8 @@
 
 #include "RNKCOverKeyboardViewState.h"
 
-#include <react/renderer/components/keyboardcontroller/EventEmitters.h>
-#include <react/renderer/components/keyboardcontroller/Props.h>
+#include <react/renderer/components/RNKC/EventEmitters.h>
+#include <react/renderer/components/RNKC/Props.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 

package/ios/KeyboardControllerModule.mm

@@ -11,7 +11,7 @@
 
 // Thanks to this guard, we won't import this header when we build for the old architecture.
 #ifdef RCT_NEW_ARCH_ENABLED
-#import <keyboardcontroller/keyboardcontroller.h>
+#import <RNKC/RNKC.h>
 #endif
 
 #import "KeyboardControllerModule-Header.h"

package/ios/animations/KeyboardAnimation.swift

@@ -23,13 +23,18 @@ public class KeyboardAnimation: KeyboardAnimationProtocol {
   // constructor variables
   let fromValue: Double
   let toValue: Double
+  let duration: Double
   let speed: Double
   let timestamp: CFTimeInterval
+  // internal state
+  var lastValue: Double
 
-  init(fromValue: Double, toValue: Double, animation: CAMediaTiming) {
+  init(fromValue: Double, toValue: Double, animation: CAMediaTiming, duration: Double) {
     self.fromValue = fromValue
     self.toValue = toValue
     self.animation = animation
+    self.duration = duration
+    lastValue = fromValue
     speed = Double(animation.speed)
     timestamp = CACurrentMediaTime()
   }
@@ -48,6 +53,10 @@ public class KeyboardAnimation: KeyboardAnimationProtocol {
     return fromValue < toValue
   }
 
+  var isFinished: Bool {
+    return lastValue == toValue
+  }
+
   func valueAt(time _: Double) -> Double {
     fatalError("Method is not implemented in abstract class!")
   }

package/ios/animations/SpringAnimation.swift

@@ -57,7 +57,7 @@ public final class SpringAnimation: KeyboardAnimation {
       bUnder = 0
     }
 
-    super.init(fromValue: fromValue, toValue: toValue, animation: animation)
+    super.init(fromValue: fromValue, toValue: toValue, animation: animation, duration: animation.settlingDuration)
   }
 
   // public functions

package/ios/animations/TimingAnimation.swift

@@ -30,7 +30,7 @@ public final class TimingAnimation: KeyboardAnimation {
     self.p1 = p1
     self.p2 = p2
 
-    super.init(fromValue: fromValue, toValue: toValue, animation: animation)
+    super.init(fromValue: fromValue, toValue: toValue, animation: animation, duration: animation.duration)
   }
 
   // MARK: public functions

package/ios/extensions/Notification.swift

@@ -18,4 +18,5 @@ extension Notification {
 
 extension Notification.Name {
   static let shouldIgnoreKeyboardEvents = Notification.Name("shouldIgnoreKeyboardEvents")
+  static let keyboardDidAppear = Notification.Name("keyboardDidAppear")
 }

package/ios/interactive/KeyboardAreaExtender.swift

@@ -15,7 +15,7 @@ class KeyboardAreaExtender: NSObject {
     NotificationCenter.default.addObserver(
       self,
       selector: #selector(keyboardDidAppear),
-      name: UIResponder.keyboardDidShowNotification,
+      name: .keyboardDidAppear,
       object: nil
     )
   }

package/ios/observers/movement/observer/KeyboardMovementObserver+Lifecycle.swift

@@ -25,18 +25,6 @@ public extension KeyboardMovementObserver {
       name: UIResponder.keyboardWillShowNotification,
       object: nil
     )
-    NotificationCenter.default.addObserver(
-      self,
-      selector: #selector(keyboardDidAppear),
-      name: UIResponder.keyboardDidShowNotification,
-      object: nil
-    )
-    NotificationCenter.default.addObserver(
-      self,
-      selector: #selector(keyboardDidDisappear),
-      name: UIResponder.keyboardDidHideNotification,
-      object: nil
-    )
   }
 
   @objc func unmount() {

package/ios/observers/movement/observer/KeyboardMovementObserver+Listeners.swift

@@ -14,8 +14,8 @@ extension KeyboardMovementObserver {
       tag = UIResponder.current.reactViewTag
       let keyboardHeight = keyboardFrame.cgRectValue.size.height
       self.keyboardHeight = keyboardHeight
+      self.notification = notification
       self.duration = duration
-      didShowDeadline = Date.currentTimeStamp + Int64(duration)
 
       onRequestAnimation()
       onEvent("onKeyboardMoveStart", Float(self.keyboardHeight) as NSNumber, 1, duration as NSNumber, tag)
@@ -30,6 +30,11 @@ extension KeyboardMovementObserver {
     guard !UIResponder.isKeyboardPreloading else { return }
     let (duration, _) = notification.keyboardMetaData()
     tag = UIResponder.current.reactViewTag
+    self.notification = notification
+    // when keyboard disappears immediately replace the keyboard frame with .zero
+    // since this will be the final frame of the keyboard after animation
+    self.notification?.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] =
+      NSValue(cgRect: CGRect(x: 0, y: 0, width: 0, height: 0))
     self.duration = duration
 
     onRequestAnimation()
@@ -44,10 +49,8 @@ extension KeyboardMovementObserver {
   @objc func keyboardDidAppear(_ notification: Notification) {
     guard !UIResponder.isKeyboardPreloading else { return }
 
-    let timestamp = Date.currentTimeStamp
     let (duration, frame) = notification.keyboardMetaData()
     if let keyboardFrame = frame {
-      let (position, _) = keyboardTrackingView.view.frameTransitionInWindow
       let keyboardHeight = keyboardFrame.cgRectValue.size.height
       tag = UIResponder.current.reactViewTag
       self.keyboardHeight = keyboardHeight
@@ -57,9 +60,7 @@ extension KeyboardMovementObserver {
         return
       }
 
-      // if the event is caught in between it's highly likely that it could be a "resize" event
-      // so we just read actual keyboard frame value in this case
-      let height = timestamp >= didShowDeadline ? self.keyboardHeight : position - KeyboardAreaExtender.shared.offset
+      let height = self.keyboardHeight - KeyboardAreaExtender.shared.offset
       // always limit progress to the maximum possible value
       let progress = min(height / self.keyboardHeight, 1.0)
 
@@ -70,6 +71,10 @@ extension KeyboardMovementObserver {
       removeKeyboardWatcher()
       setupKVObserver()
       animation = nil
+
+      NotificationCenter.default.post(
+        name: .keyboardDidAppear, object: notification, userInfo: nil
+      )
     }
   }
 

package/ios/observers/movement/observer/KeyboardMovementObserver+Watcher.swift

@@ -40,6 +40,9 @@ extension KeyboardMovementObserver {
     prevKeyboardPosition = keyboardPosition
 
     if let animation = animation {
+      if animation.isFinished {
+        return
+      }
       let baseDuration = animation.timingAt(value: keyboardPosition)
 
       #if targetEnvironment(simulator)
@@ -59,6 +62,7 @@ extension KeyboardMovementObserver {
       // but CASpringAnimation can never get to this final destination
       let race: (CGFloat, CGFloat) -> CGFloat = animation.isIncreasing ? max : min
       keyboardPosition = race(position, keyboardPosition)
+      animation.lastValue = keyboardPosition
     }
 
     onEvent(

package/ios/observers/movement/observer/KeyboardMovementObserver.swift

@@ -19,7 +19,30 @@ public class KeyboardMovementObserver: NSObject {
   var onCancelAnimation: () -> Void
   // progress tracker
   @objc public var keyboardTrackingView = KeyboardTrackingView()
-  var animation: KeyboardAnimation?
+  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 prevKeyboardPosition = 0.0
   var displayLink: CADisplayLink!
@@ -32,9 +55,34 @@ public class KeyboardMovementObserver: NSObject {
     set { _keyboardHeight = newValue }
   }
 
-  var duration = 0
+  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 tag: NSNumber = -1
-  var didShowDeadline: Int64 = 0
+  // manual did events
+  var notification: Notification?
+  var keyboardDidTask: DispatchWorkItem?
 
   @objc public init(
     handler: @escaping (NSString, NSNumber, NSNumber, NSNumber, NSNumber) -> Void,

package/ios/views/KeyboardBackgroundViewManager.mm

@@ -14,10 +14,10 @@
 #endif
 
 #ifdef RCT_NEW_ARCH_ENABLED
-#import <react/renderer/components/keyboardcontroller/EventEmitters.h>
-#import <react/renderer/components/keyboardcontroller/Props.h>
-#import <react/renderer/components/keyboardcontroller/RCTComponentViewHelpers.h>
-#import <react/renderer/components/keyboardcontroller/RNKCKeyboardBackgroundViewComponentDescriptor.h>
+#import <react/renderer/components/RNKC/EventEmitters.h>
+#import <react/renderer/components/RNKC/Props.h>
+#import <react/renderer/components/RNKC/RCTComponentViewHelpers.h>
+#import <react/renderer/components/RNKC/RNKCKeyboardBackgroundViewComponentDescriptor.h>
 
 #import "RCTFabricComponentsPlugins.h"
 #endif

package/ios/views/KeyboardControllerView.mm

@@ -20,10 +20,10 @@
 #import <react_native_keyboard_controller/react_native_keyboard_controller-Swift.h>
 #endif
 
-#import <react/renderer/components/keyboardcontroller/EventEmitters.h>
-#import <react/renderer/components/keyboardcontroller/Props.h>
-#import <react/renderer/components/keyboardcontroller/RCTComponentViewHelpers.h>
-#import <react/renderer/components/keyboardcontroller/RNKCKeyboardControllerViewComponentDescriptor.h>
+#import <react/renderer/components/RNKC/EventEmitters.h>
+#import <react/renderer/components/RNKC/Props.h>
+#import <react/renderer/components/RNKC/RCTComponentViewHelpers.h>
+#import <react/renderer/components/RNKC/RNKCKeyboardControllerViewComponentDescriptor.h>
 
 #import "KeyboardControllerModule-Header.h"
 #import "RCTFabricComponentsPlugins.h"

package/ios/views/KeyboardExtenderManager.mm

@@ -16,10 +16,10 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTSurfaceTouchHandler.h>
 
-#import <react/renderer/components/keyboardcontroller/EventEmitters.h>
-#import <react/renderer/components/keyboardcontroller/Props.h>
-#import <react/renderer/components/keyboardcontroller/RCTComponentViewHelpers.h>
-#import <react/renderer/components/keyboardcontroller/RNKCKeyboardExtenderComponentDescriptor.h>
+#import <react/renderer/components/RNKC/EventEmitters.h>
+#import <react/renderer/components/RNKC/Props.h>
+#import <react/renderer/components/RNKC/RCTComponentViewHelpers.h>
+#import <react/renderer/components/RNKC/RNKCKeyboardExtenderComponentDescriptor.h>
 
 #import "RCTFabricComponentsPlugins.h"
 #endif

package/ios/views/KeyboardGestureAreaManager.mm

@@ -14,10 +14,10 @@
 #endif
 
 #ifdef RCT_NEW_ARCH_ENABLED
-#import <react/renderer/components/keyboardcontroller/EventEmitters.h>
-#import <react/renderer/components/keyboardcontroller/Props.h>
-#import <react/renderer/components/keyboardcontroller/RCTComponentViewHelpers.h>
-#import <react/renderer/components/keyboardcontroller/RNKCKeyboardGestureAreaComponentDescriptor.h>
+#import <react/renderer/components/RNKC/EventEmitters.h>
+#import <react/renderer/components/RNKC/Props.h>
+#import <react/renderer/components/RNKC/RCTComponentViewHelpers.h>
+#import <react/renderer/components/RNKC/RNKCKeyboardGestureAreaComponentDescriptor.h>
 
 #import "RCTFabricComponentsPlugins.h"
 #endif

package/ios/views/OverKeyboardViewManager.mm

@@ -16,10 +16,10 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTSurfaceTouchHandler.h>
 
-#import <react/renderer/components/keyboardcontroller/EventEmitters.h>
-#import <react/renderer/components/keyboardcontroller/Props.h>
-#import <react/renderer/components/keyboardcontroller/RCTComponentViewHelpers.h>
-#import <react/renderer/components/keyboardcontroller/RNKCOverKeyboardViewComponentDescriptor.h>
+#import <react/renderer/components/RNKC/EventEmitters.h>
+#import <react/renderer/components/RNKC/Props.h>
+#import <react/renderer/components/RNKC/RCTComponentViewHelpers.h>
+#import <react/renderer/components/RNKC/RNKCOverKeyboardViewComponentDescriptor.h>
 
 #import "RCTFabricComponentsPlugins.h"
 #endif

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-keyboard-controller",
-  "version": "1.20.4",
+  "version": "1.20.6",
   "description": "Keyboard manager which works in identical way on both iOS and Android",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -172,7 +172,7 @@
     ]
   },
   "codegenConfig": {
-    "name": "keyboardcontroller",
+    "name": "RNKC",
     "type": "all",
     "jsSrcsDir": "./src/specs",
     "android": {

package/react-native-keyboard-controller.podspec

@@ -61,7 +61,7 @@ Pod::Spec.new do |s|
   if new_arch_enabled
     s.subspec "common" do |ss|
       ss.source_files         = ["common/cpp/**/*.{cpp,h}"]
-      ss.header_dir           = "react/renderer/components/keyboardcontroller"
+      ss.header_dir           = "react/renderer/components/RNKC"
       ss.private_header_files = "common/cpp/**/*.{h}"
       ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/common/cpp\"" }
     end

package/android/src/main/jni/keyboardcontroller.h

@@ -1,24 +0,0 @@
-#pragma once
-
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
-#include <jsi/jsi.h>
-
-/**
- * Note this import and that it is not present in autogenerated header file
- * under android/build/generated/source/codegen/jni/keyboardcontroller.h
- *
- * Here we are overriding autogenerated component descriptors by prioritizing our custom headers via include path setup.
- */
-#include <react/renderer/components/keyboardcontroller/RNKCKeyboardControllerViewComponentDescriptor.h>
-#include <react/renderer/components/keyboardcontroller/RNKCKeyboardGestureAreaComponentDescriptor.h>
-#include <react/renderer/components/keyboardcontroller/RNKCOverKeyboardViewComponentDescriptor.h>
-#include <react/renderer/components/keyboardcontroller/RNKCKeyboardBackgroundViewComponentDescriptor.h>
-
-#include <memory>
-#include <string>
-
-namespace facebook::react {
-  JSI_EXPORT
-  std::shared_ptr<TurboModule> keyboardcontroller_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
-} // namespace facebook::react