react-native-keyboard-controller 1.9.0 → 1.9.2

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

@@ -110,6 +110,7 @@ class KeyboardAnimationCallback(
    * - we dispatch `keyboardDidShow` (onEnd).
    */
   override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
+    val keyboardHeight = getCurrentKeyboardHeight()
     // when keyboard appears values will be (false && true)
     // when keyboard disappears values will be (true && false)
     val isKeyboardShown = isKeyboardVisible && isKeyboardVisible()
@@ -121,10 +122,17 @@ class KeyboardAnimationCallback(
     // `InteractiveKeyboardProvider.isInteractive` detect case when keyboard moves
     // because of the gesture
     val isMoving = isTransitioning || InteractiveKeyboardProvider.isInteractive
-    if (isKeyboardShown && !isMoving && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-      val keyboardHeight = getCurrentKeyboardHeight()
-      val duration = DEFAULT_ANIMATION_TIME.toInt()
+    val isKeyboardFullyVisible = isKeyboardShown && !isMoving
+    // when keyboard is opened and we trigger a transition from screen A to screen B,
+    // then this method is getting called and we start dispatching events, and later original
+    // `onStart`/`onProgress`/`onEnd` emitting their events (since keyboard is closing) and we
+    // are getting race conditions.
+    //
+    // but in general this check is a must because we are detecting keyboard size changes
+    // in this method
+    val isKeyboardSizeEqual = this.persistentKeyboardHeight == keyboardHeight
 
+    if (isKeyboardFullyVisible && !isKeyboardSizeEqual && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
       layoutObserver?.syncUpLayout()
       this.emitEvent("KeyboardController::keyboardWillShow", getEventParams(keyboardHeight))
       context.dispatchEvent(
@@ -135,7 +143,7 @@ class KeyboardAnimationCallback(
           "topKeyboardMoveStart",
           keyboardHeight,
           1.0,
-          duration,
+          DEFAULT_ANIMATION_TIME,
           viewTagFocused,
         ),
       )
@@ -152,7 +160,7 @@ class KeyboardAnimationCallback(
             "topKeyboardMove",
             toValue.toDouble(),
             toValue.toDouble() / keyboardHeight,
-            duration,
+            DEFAULT_ANIMATION_TIME,
             viewTagFocused,
           ),
         )
@@ -167,12 +175,12 @@ class KeyboardAnimationCallback(
             "topKeyboardMoveEnd",
             keyboardHeight,
             1.0,
-            duration,
+            DEFAULT_ANIMATION_TIME,
             viewTagFocused,
           ),
         )
       }
-      animation.setDuration(DEFAULT_ANIMATION_TIME).startDelay = 0
+      animation.setDuration(DEFAULT_ANIMATION_TIME.toLong()).startDelay = 0
       animation.start()
 
       this.persistentKeyboardHeight = keyboardHeight
@@ -344,6 +352,6 @@ class KeyboardAnimationCallback(
   }
 
   companion object {
-    private const val DEFAULT_ANIMATION_TIME = 250L
+    private const val DEFAULT_ANIMATION_TIME = 250
   }
 }

package/ios/observers/FocusedInputLayoutObserver.swift

@@ -25,6 +25,8 @@ let noFocusedInputEvent: [String: Any] = [
 public class FocusedInputLayoutObserver: NSObject {
   // class members
   var onEvent: (NSDictionary) -> Void
+  // state variables
+  private var isMounted = false
   // input tracking
   private var currentInput: UIView?
   private var hasKVObserver = false
@@ -37,6 +39,12 @@ public class FocusedInputLayoutObserver: NSObject {
   }
 
   @objc public func mount() {
+    if isMounted {
+      return
+    }
+
+    isMounted = true
+
     NotificationCenter.default.addObserver(
       self,
       selector: #selector(keyboardWillShow),
@@ -52,6 +60,7 @@ public class FocusedInputLayoutObserver: NSObject {
   }
 
   @objc public func unmount() {
+    isMounted = false
     // swiftlint:disable:next notification_center_detachment
     NotificationCenter.default.removeObserver(self)
   }

package/ios/observers/KeyboardMovementObserver.swift

@@ -31,6 +31,7 @@ public class KeyboardMovementObserver: NSObject {
   private var prevKeyboardPosition = 0.0
   private var displayLink: CADisplayLink?
   private var hasKVObserver = false
+  private var isMounted = false
   // state variables
   private var keyboardHeight: CGFloat = 0.0
   private var duration = 0
@@ -45,6 +46,12 @@ public class KeyboardMovementObserver: NSObject {
   }
 
   @objc public func mount() {
+    if isMounted {
+      return
+    }
+
+    isMounted = true
+
     NotificationCenter.default.addObserver(
       self,
       selector: #selector(keyboardWillDisappear),
@@ -138,6 +145,7 @@ public class KeyboardMovementObserver: NSObject {
   }
 
   @objc public func unmount() {
+    isMounted = false
     // swiftlint:disable:next notification_center_detachment
     NotificationCenter.default.removeObserver(self)
   }

package/ios/views/KeyboardControllerView.mm

@@ -156,17 +156,36 @@ using namespace facebook::react;
 
   if (newViewProps.enabled != oldViewProps.enabled) {
     if (newViewProps.enabled) {
-      [inputObserver mount];
-      [keyboardObserver mount];
+      [self mount];
     } else {
-      [inputObserver unmount];
-      [keyboardObserver unmount];
+      [self unmount];
     }
   }
 
   [super updateProps:props oldProps:oldProps];
 }
 
+- (void)willMoveToSuperview:(UIView *)newSuperview
+{
+  if (newSuperview == nil) {
+    [self unmount];
+  } else {
+    [self mount];
+  }
+}
+
+- (void)mount
+{
+  [inputObserver mount];
+  [keyboardObserver mount];
+}
+
+- (void)unmount
+{
+  [inputObserver unmount];
+  [keyboardObserver unmount];
+}
+
 Class<RCTComponentViewProtocol> KeyboardControllerViewCls(void)
 {
   return KeyboardControllerView.class;

package/ios/views/KeyboardControllerViewManager.swift

@@ -24,11 +24,9 @@ class KeyboardControllerView: UIView {
   @objc var enabled: ObjCBool = true {
     didSet {
       if enabled.boolValue {
-        inputObserver?.mount()
-        keyboardObserver?.mount()
+        mount()
       } else {
-        inputObserver?.unmount()
-        keyboardObserver?.unmount()
+        unmount()
       }
     }
   }
@@ -37,6 +35,8 @@ class KeyboardControllerView: UIView {
     self.bridge = bridge
     eventDispatcher = bridge.eventDispatcher()
     super.init(frame: frame)
+    inputObserver = FocusedInputLayoutObserver(handler: onInput)
+    keyboardObserver = KeyboardMovementObserver(handler: onEvent, onNotify: onNotify)
   }
 
   @available(*, unavailable)
@@ -44,21 +44,17 @@ class KeyboardControllerView: UIView {
     fatalError("init(coder:) has not been implemented")
   }
 
-  override func willMove(toWindow newWindow: UIWindow?) {
-    if newWindow == nil {
-      // Will be removed from a window
-      inputObserver?.unmount()
-      keyboardObserver?.unmount()
-    }
-  }
+  // for mounting/unmounting observers for lifecycle events we're using willMove(toSuperview) method
+  // not willMove(toWindow)
+  // see https://github.com/kirillzyusko/react-native-keyboard-controller/issues/271
+  override func willMove(toSuperview newSuperview: UIView?) {
+    super.willMove(toSuperview: newSuperview)
 
-  override func didMoveToWindow() {
-    if window != nil {
-      // Added to a window
-      inputObserver = FocusedInputLayoutObserver(handler: onInput)
-      inputObserver?.mount()
-      keyboardObserver = KeyboardMovementObserver(handler: onEvent, onNotify: onNotify)
-      keyboardObserver?.mount()
+    if newSuperview == nil {
+      // The view is about to be removed from its superview (destroyed)
+      unmount()
+    } else {
+      mount()
     }
   }
 
@@ -90,4 +86,14 @@ class KeyboardControllerView: UIView {
   func onNotify(event: String, data: Any) {
     KeyboardController.shared()?.sendEvent(event, body: data)
   }
+
+  private func mount() {
+    inputObserver?.mount()
+    keyboardObserver?.mount()
+  }
+
+  private func unmount() {
+    inputObserver?.unmount()
+    keyboardObserver?.unmount()
+  }
 }

package/package.json

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