react-native-keyboard-controller 1.13.0 → 1.13.2

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

@@ -1,6 +1,7 @@
 package com.reactnativekeyboardcontroller.views
 
 import android.annotation.SuppressLint
+import android.content.res.Configuration
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
@@ -68,6 +69,10 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
 
     this.removeKeyboardCallbacks()
   }
+
+  override fun onConfigurationChanged(newConfig: Configuration?) {
+    this.reApplyWindowInsets()
+  }
   // endregion
 
   // region State manager helpers
@@ -83,25 +88,23 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
 
         val shouldApplyZeroPaddingTop = !active || this.isStatusBarTranslucent
         val shouldApplyZeroPaddingBottom = !active || this.isNavigationBarTranslucent
+        val navBarInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+        val systemBarInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+
         params.setMargins(
-          0,
+          navBarInsets.left,
           if (shouldApplyZeroPaddingTop) {
             0
           } else {
-            (
-              insets?.getInsets(WindowInsetsCompat.Type.systemBars())?.top
-                ?: 0
-              )
+            systemBarInsets.top
           },
-          0,
+          navBarInsets.right,
           if (shouldApplyZeroPaddingBottom) {
             0
           } else {
-            insets?.getInsets(WindowInsetsCompat.Type.navigationBars())?.bottom
-              ?: 0
+            navBarInsets.bottom
           },
         )
-
         content?.layoutParams = params
 
         val defaultInsets = ViewCompat.onApplyWindowInsets(v, insets)
@@ -164,6 +167,11 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
     // for more details
     Handler(Looper.getMainLooper()).post { view.removeSelf() }
   }
+
+  private fun reApplyWindowInsets() {
+    this.setupWindowInsets()
+    this.requestApplyInsetsWhenAttached()
+  }
   // endregion
 
   // region State managers
@@ -206,8 +214,7 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
   fun forceStatusBarTranslucent(isStatusBarTranslucent: Boolean) {
     if (active && this.isStatusBarTranslucent != isStatusBarTranslucent) {
       this.isStatusBarTranslucent = isStatusBarTranslucent
-      this.setupWindowInsets()
-      this.requestApplyInsetsWhenAttached()
+      this.reApplyWindowInsets()
     }
   }
   // endregion

package/ios/observers/KeyboardMovementObserver.swift

@@ -40,6 +40,7 @@ public class KeyboardMovementObserver: NSObject {
   private var duration = 0
   private var tag: NSNumber = -1
   private var animation: KeyboardAnimation?
+  private var didShowDeadline: Int64 = 0
 
   @objc public init(
     handler: @escaping (NSString, NSNumber, NSNumber, NSNumber, NSNumber) -> Void,
@@ -162,24 +163,17 @@ public class KeyboardMovementObserver: NSObject {
   }
 
   @objc func keyboardWillAppear(_ notification: Notification) {
-    if let keyboardFrame: NSValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue {
+    let (duration, frame) = metaDataFromNotification(notification)
+    if let keyboardFrame = frame {
       tag = UIResponder.current.reactViewTag
       let keyboardHeight = keyboardFrame.cgRectValue.size.height
-      let duration = Int(
-        (notification.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? Double ?? 0) * 1000
-      )
       self.keyboardHeight = keyboardHeight
       self.duration = duration
-
-      var data = [AnyHashable: Any]()
-      data["height"] = keyboardHeight
-      data["duration"] = duration
-      data["timestamp"] = Date.currentTimeStamp
-      data["target"] = tag
+      didShowDeadline = Date.currentTimeStamp + Int64(duration)
 
       onRequestAnimation()
       onEvent("onKeyboardMoveStart", Float(keyboardHeight) as NSNumber, 1, duration as NSNumber, tag)
-      onNotify("KeyboardController::keyboardWillShow", data)
+      onNotify("KeyboardController::keyboardWillShow", getEventParams(keyboardHeight, duration))
 
       setupKeyboardWatcher()
       initializeAnimation(fromValue: prevKeyboardPosition, toValue: keyboardHeight)
@@ -187,21 +181,13 @@ public class KeyboardMovementObserver: NSObject {
   }
 
   @objc func keyboardWillDisappear(_ notification: Notification) {
-    let duration = Int(
-      (notification.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? Double ?? 0) * 1000
-    )
+    let (duration, _) = metaDataFromNotification(notification)
     tag = UIResponder.current.reactViewTag
     self.duration = duration
 
-    var data = [AnyHashable: Any]()
-    data["height"] = 0
-    data["duration"] = duration
-    data["timestamp"] = Date.currentTimeStamp
-    data["target"] = tag
-
     onRequestAnimation()
     onEvent("onKeyboardMoveStart", 0, 0, duration as NSNumber, tag)
-    onNotify("KeyboardController::keyboardWillHide", data)
+    onNotify("KeyboardController::keyboardWillHide", getEventParams(0, duration))
 
     setupKeyboardWatcher()
     removeKVObserver()
@@ -209,26 +195,22 @@ public class KeyboardMovementObserver: NSObject {
   }
 
   @objc func keyboardDidAppear(_ notification: Notification) {
-    if let keyboardFrame: NSValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue {
+    let timestamp = Date.currentTimeStamp
+    let (duration, frame) = metaDataFromNotification(notification)
+    if let keyboardFrame = frame {
       let (position, _) = keyboardView.framePositionInWindow
       let keyboardHeight = keyboardFrame.cgRectValue.size.height
       tag = UIResponder.current.reactViewTag
       self.keyboardHeight = keyboardHeight
-      let duration = Int(
-        (notification.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? Double ?? 0) * 1000
-      )
+      // 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 ? keyboardHeight : position
       // always limit progress to the maximum possible value
-      let progress = min(position / self.keyboardHeight, 1.0)
-
-      var data = [AnyHashable: Any]()
-      data["height"] = position
-      data["duration"] = duration
-      data["timestamp"] = Date.currentTimeStamp
-      data["target"] = tag
+      let progress = min(height / self.keyboardHeight, 1.0)
 
       onCancelAnimation()
-      onEvent("onKeyboardMoveEnd", position as NSNumber, progress as NSNumber, duration as NSNumber, tag)
-      onNotify("KeyboardController::keyboardDidShow", data)
+      onEvent("onKeyboardMoveEnd", height as NSNumber, progress as NSNumber, duration as NSNumber, tag)
+      onNotify("KeyboardController::keyboardDidShow", getEventParams(height, duration))
 
       removeKeyboardWatcher()
       setupKVObserver()
@@ -237,19 +219,12 @@ public class KeyboardMovementObserver: NSObject {
   }
 
   @objc func keyboardDidDisappear(_ notification: Notification) {
-    let duration = Int(
-      (notification.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? Double ?? 0) * 1000
-    )
+    let (duration, _) = metaDataFromNotification(notification)
     tag = UIResponder.current.reactViewTag
-    var data = [AnyHashable: Any]()
-    data["height"] = 0
-    data["duration"] = duration
-    data["timestamp"] = Date.currentTimeStamp
-    data["target"] = tag
 
     onCancelAnimation()
     onEvent("onKeyboardMoveEnd", 0 as NSNumber, 0, duration as NSNumber, tag)
-    onNotify("KeyboardController::keyboardDidHide", data)
+    onNotify("KeyboardController::keyboardDidHide", getEventParams(0, duration))
 
     removeKeyboardWatcher()
     animation = nil
@@ -331,4 +306,23 @@ public class KeyboardMovementObserver: NSObject {
       tag
     )
   }
+
+  private func metaDataFromNotification(_ notification: Notification) -> (Int, NSValue?) {
+    let duration = Int(
+      (notification.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? Double ?? 0) * 1000
+    )
+    let keyboardFrame = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue
+
+    return (duration, keyboardFrame)
+  }
+
+  private func getEventParams(_ height: Double, _ duration: Int) -> [AnyHashable: Any] {
+    var data = [AnyHashable: Any]()
+    data["height"] = height
+    data["duration"] = duration
+    data["timestamp"] = Date.currentTimeStamp
+    data["target"] = tag
+
+    return data
+  }
 }

package/lib/commonjs/event-handler.d.js

@@ -0,0 +1,6 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+//# sourceMappingURL=event-handler.d.js.map

package/lib/commonjs/event-handler.d.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sources":["event-handler.d.ts"],"sourcesContent":["declare function registerEventHandler(\n  handler: (event: never) => void,\n  eventName: string,\n  viewTag: number,\n): number;\ndeclare function unregisterEventHandler(id: number): void;\n\nexport { registerEventHandler, unregisterEventHandler };\n"],"mappings":"","ignoreList":[]}

package/lib/module/event-handler.d.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=event-handler.d.js.map

package/lib/module/event-handler.d.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sources":["event-handler.d.ts"],"sourcesContent":["declare function registerEventHandler(\n  handler: (event: never) => void,\n  eventName: string,\n  viewTag: number,\n): number;\ndeclare function unregisterEventHandler(id: number): void;\n\nexport { registerEventHandler, unregisterEventHandler };\n"],"mappings":"","ignoreList":[]}

package/lib/module/event-handler.js

@@ -1,5 +1,6 @@
-export {};
-//# sourceMappingURL=event-handler.js.map-native-reanimated/src/core");
+let REACore = null;
+try {
+  REACore = require("react-native-reanimated/src/core");
 } catch (e1) {
   try {
     REACore = require("react-native-reanimated/src/reanimated2/core");

package/lib/module/event-handler.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["event-handler.ts"],"sourcesContent":["declare function registerEventHandler(\n  handler: (event: never) => void,\n  eventName: string,\n  viewTag: number,\n): number;\ndeclare function unregisterEventHandler(id: number): void;\n\nexport { registerEventHandler, unregisterEventHandler };\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":["REACore","require","e1","e2","console","warn","registerEventHandler","unregisterEventHandler"],"sources":["event-handler.js"],"sourcesContent":["let REACore = null;\n\ntry {\n  REACore = require(\"react-native-reanimated/src/core\");\n} catch (e1) {\n  try {\n    REACore = require(\"react-native-reanimated/src/reanimated2/core\");\n  } catch (e2) {\n    console.warn(\"Failed to load REACore from both paths\");\n  }\n}\nconst registerEventHandler = REACore.registerEventHandler;\nconst unregisterEventHandler = REACore.unregisterEventHandler;\n\nexport { registerEventHandler, unregisterEventHandler };\n"],"mappings":"AAAA,IAAIA,OAAO,GAAG,IAAI;AAElB,IAAI;EACFA,OAAO,GAAGC,OAAO,CAAC,kCAAkC,CAAC;AACvD,CAAC,CAAC,OAAOC,EAAE,EAAE;EACX,IAAI;IACFF,OAAO,GAAGC,OAAO,CAAC,8CAA8C,CAAC;EACnE,CAAC,CAAC,OAAOE,EAAE,EAAE;IACXC,OAAO,CAACC,IAAI,CAAC,wCAAwC,CAAC;EACxD;AACF;AACA,MAAMC,oBAAoB,GAAGN,OAAO,CAACM,oBAAoB;AACzD,MAAMC,sBAAsB,GAAGP,OAAO,CAACO,sBAAsB;AAE7D,SAASD,oBAAoB,EAAEC,sBAAsB","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-keyboard-controller",
-  "version": "1.13.0",
+  "version": "1.13.2",
   "description": "Keyboard manager which works in identical way on both iOS and Android",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -71,7 +71,7 @@
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^11.0.0",
-    "@react-native/eslint-config": "^0.75.0-rc.6",
+    "@react-native/eslint-config": "^0.75.2",
     "@release-it/conventional-changelog": "^2.0.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@types/jest": "^29.2.1",
@@ -94,7 +94,7 @@
     "pod-install": "^0.1.0",
     "prettier": "^2.8.8",
     "react": "18.3.1",
-    "react-native": "0.75.0-rc.6",
+    "react-native": "0.75.2",
     "react-native-builder-bob": "^0.18.0",
     "react-native-reanimated": "3.15.0",
     "react-test-renderer": "18.2.0",

package/lib/typescript/event-handler.d.ts

@@ -1,3 +0,0 @@
-declare function registerEventHandler(handler: (event: never) => void, eventName: string, viewTag: number): number;
-declare function unregisterEventHandler(id: number): void;
-export { registerEventHandler, unregisterEventHandler };