npm - react-native-keyboard-controller - Versions diffs - 1.20.3 → 1.20.5 - Mend

react-native-keyboard-controller 1.20.3 → 1.20.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (33) hide show

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

@@ -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 ADDED Viewed

@@ -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 RENAMED Viewed

@@ -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 RENAMED Viewed

@@ -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 RENAMED Viewed

@@ -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 RENAMED Viewed

@@ -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 RENAMED Viewed

@@ -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 RENAMED Viewed

@@ -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 RENAMED Viewed

@@ -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 RENAMED Viewed

@@ -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 RENAMED Viewed

@@ -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 RENAMED Viewed

@@ -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 CHANGED Viewed

@@ -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/observers/movement/KeyboardTrackingView.swift CHANGED Viewed

@@ -66,7 +66,14 @@ public final class KeyboardTrackingView: UIView {
   }
   @objc public func attachToTopmostView(toWindow window: UIWindow? = nil) {
-    guard let topView = (window?.rootViewController ?? UIApplication.topViewController())?.view else { return }
+    var topViewController = window?.rootViewController
+    if let rootVC = topViewController, let topView = rootVC.view, topView.window != nil {
+      // ok, attach
+    } else {
+      topViewController = UIApplication.topViewController()
+    }
+    guard let topView = topViewController?.view else { return }
     if currentAttachedView === topView { return }

package/ios/views/KeyboardBackgroundViewManager.mm CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "react-native-keyboard-controller",
-  "version": "1.20.3",
+  "version": "1.20.5",
   "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 CHANGED Viewed

@@ -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 DELETED Viewed

@@ -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