react-native-keyboard-controller 1.21.0-beta.0 → 1.21.0-beta.1

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

@@ -49,6 +49,8 @@ extension KeyboardMovementObserver {
 
     prevKeyboardPosition = position
 
+    keyboardDidTask?.cancel()
+
     onEvent(
       "onKeyboardMoveInteractive",
       position as NSNumber,

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

@@ -7,7 +7,7 @@
 
 extension KeyboardMovementObserver {
   @objc func keyboardWillAppear(_ notification: Notification) {
-    guard !KeyboardEventsIgnorer.shared.shouldIgnore, !UIResponder.isKeyboardPreloading else { return }
+    guard !UIResponder.isKeyboardPreloading else { return }
 
     let (duration, frame) = notification.keyboardMetaData()
     if let keyboardFrame = frame {
@@ -15,6 +15,12 @@ extension KeyboardMovementObserver {
       let keyboardHeight = keyboardFrame.cgRectValue.size.height
       self.keyboardHeight = keyboardHeight
       self.notification = notification
+
+      guard !KeyboardEventsIgnorer.shared.shouldIgnore else {
+        KeyboardEventsIgnorer.shared.shouldIgnoreKeyboardEvents = false
+        return
+      }
+
       self.duration = duration
 
       onRequestAnimation()
@@ -23,6 +29,7 @@ extension KeyboardMovementObserver {
 
       setupKeyboardWatcher()
       initializeAnimation(fromValue: prevKeyboardPosition, toValue: self.keyboardHeight)
+      scheduleDidEvent(height: self.keyboardHeight, duration: animation?.duration ?? CGFloat(duration) / 1000)
     }
   }
 
@@ -44,6 +51,7 @@ extension KeyboardMovementObserver {
     setupKeyboardWatcher()
     removeKVObserver()
     initializeAnimation(fromValue: prevKeyboardPosition, toValue: 0)
+    scheduleDidEvent(height: 0, duration: animation?.duration ?? CGFloat(duration) / 1000)
   }
 
   @objc func keyboardDidAppear(_ notification: Notification) {
@@ -55,12 +63,7 @@ extension KeyboardMovementObserver {
       tag = UIResponder.current.reactViewTag
       self.keyboardHeight = keyboardHeight
 
-      guard !KeyboardEventsIgnorer.shared.shouldIgnore else {
-        KeyboardEventsIgnorer.shared.shouldIgnoreKeyboardEvents = false
-        return
-      }
-
-      let height = self.keyboardHeight - KeyboardAreaExtender.shared.offset
+      let height = self.keyboardHeight
       // always limit progress to the maximum possible value
       let progress = min(height / self.keyboardHeight, 1.0)
 
@@ -90,4 +93,24 @@ extension KeyboardMovementObserver {
     removeKeyboardWatcher()
     animation = nil
   }
+
+  @objc func scheduleDidEvent(height: CGFloat, duration: CGFloat) {
+    keyboardDidTask?.cancel()
+
+    guard let notification = notification 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() + duration, execute: task)
+  }
 }

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-keyboard-controller",
-  "version": "1.21.0-beta.0",
+  "version": "1.21.0-beta.1",
   "description": "Keyboard manager which works in identical way on both iOS and Android",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -187,6 +187,5 @@
         "KeyboardExtender": "KeyboardExtender"
       }
     }
-  },
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  }
 }