react-native-keyboard-controller 1.12.0 → 1.12.1

package/android/src/main/java/com/reactnativekeyboardcontroller/extensions/EditText.kt

@@ -79,7 +79,7 @@ val EditText.parentScrollViewTarget: Int
       val parentView = currentView.parent as? View
 
       if (parentView is ScrollView) {
-        // If the parent is a ScrollView, return its id
+        // If the parent is a vertical ScrollView, return its id
         return parentView.id
       }
 

package/ios/Extensions.swift

@@ -68,8 +68,14 @@ public extension Optional where Wrapped: UIResponder {
     var currentResponder: UIResponder? = self
 
     while let currentView = currentResponder {
-      // If the current responder is a UIScrollView (excluding UITextView), return its tag
-      if let scrollView = currentView as? UIScrollView, !(currentView is UITextView) {
+      // If the current responder is a vertical UIScrollView (excluding UITextView), return its tag
+      if let scrollView = currentView as? UIScrollView,
+         !(currentView is UITextView),
+         scrollView.contentSize.height > scrollView.frame.size.height
+      // it was fixed in swiftlint https://github.com/realm/SwiftLint/issues/3756 but a new release is not available yet
+      // swiftlint:disable all
+      {
+        // swiftlint:enable all
         return scrollView.reactViewTag
       }
 

package/ios/observers/FocusedInputObserver.swift

@@ -95,7 +95,7 @@ public class FocusedInputObserver: NSObject {
   }
 
   @objc func keyboardWillShow(_: Notification) {
-    let responder = UIResponder.current as? UIView
+    guard let responder = UIResponder.current as? UIView else { return }
     removeObservers(newResponder: responder)
     currentResponder = responder
     currentInput = currentResponder?.superview as UIView?
@@ -126,16 +126,18 @@ public class FocusedInputObserver: NSObject {
     let focusedInput = currentInput
     let globalFrame = focusedInput?.globalFrame
 
+    guard let frame = globalFrame, let input = focusedInput else { return }
+
     let data: [String: Any] = [
       "target": responder.reactViewTag,
       "parentScrollViewTarget": responder.parentScrollViewTarget,
       "layout": [
-        "absoluteX": globalFrame?.origin.x,
-        "absoluteY": globalFrame?.origin.y,
-        "width": focusedInput?.frame.width,
-        "height": focusedInput?.frame.height,
-        "x": focusedInput?.frame.origin.x,
-        "y": focusedInput?.frame.origin.y,
+        "absoluteX": frame.origin.x,
+        "absoluteY": frame.origin.y,
+        "width": input.frame.width,
+        "height": input.frame.height,
+        "x": input.frame.origin.x,
+        "y": input.frame.origin.y,
       ],
     ]
 

package/package.json

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