react-native-keyboard-controller 1.16.8 → 1.17.1

package/README.md

@@ -22,17 +22,11 @@ Keyboard manager which works in identical way on both iOS and Android.
 
 ## Installation
 
-Install `react-native-keyboard-controller` package from npm:
-
-```shell
-yarn add react-native-keyboard-controller
-# or
-npm install react-native-keyboard-controller --save
-```
+Check out the [installation](https://kirillzyusko.github.io/react-native-keyboard-controller/docs/installation) section of docs for the detailed installation instructions.
 
 ## Documentation
 
-Check out our dedicated documentation page for info about this library, API reference and more: [https://kirillzyusko.github.io/react-native-keyboard-controller/](https://kirillzyusko.github.io/react-native-keyboard-controller/)
+Check out the dedicated documentation page for information about this library, API reference and more: [https://kirillzyusko.github.io/react-native-keyboard-controller/](https://kirillzyusko.github.io/react-native-keyboard-controller/)
 
 ## Contributing
 

package/android/src/fabric/java/com/reactnativekeyboardcontroller/OverKeyboardViewManager.kt

@@ -2,6 +2,8 @@ package com.reactnativekeyboardcontroller
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.LayoutShadowNode
+import com.facebook.react.uimanager.ReactStylesDiffMap
+import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
@@ -30,6 +32,15 @@ class OverKeyboardViewManager(
 
   override fun getShadowNodeClass(): Class<out LayoutShadowNode> = OverKeyboardHostShadowNode::class.java
 
+  override fun updateState(
+    view: OverKeyboardHostView,
+    props: ReactStylesDiffMap,
+    stateWrapper: StateWrapper,
+  ): Any? {
+    view.stateWrapper = stateWrapper
+    return null
+  }
+
   @ReactProp(name = "visible")
   override fun setVisible(
     view: OverKeyboardHostView,

package/android/src/main/java/com/reactnativekeyboardcontroller/views/overlay/OverKeyboardViewGroup.kt

@@ -7,12 +7,20 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.WindowManager
 import com.facebook.react.bridge.UiThreadUtil
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.config.ReactFeatureFlags
 import com.facebook.react.uimanager.JSTouchDispatcher
+import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.views.view.ReactViewGroup
+import com.reactnativekeyboardcontroller.extensions.dp
+import com.reactnativekeyboardcontroller.extensions.getDisplaySize
+import com.reactnativekeyboardcontroller.log.Logger
+
+private val TAG = OverKeyboardHostView::class.qualifiedName
 
 @SuppressLint("ViewConstructor")
 class OverKeyboardHostView(
@@ -22,6 +30,12 @@ class OverKeyboardHostView(
   private var windowManager: WindowManager = reactContext.getSystemService(Context.WINDOW_SERVICE) as WindowManager
   private var hostView: OverKeyboardRootViewGroup = OverKeyboardRootViewGroup(reactContext)
 
+  var stateWrapper: StateWrapper?
+    get() = hostView.stateWrapper
+    set(stateWrapper) {
+      hostView.stateWrapper = stateWrapper
+    }
+
   init {
     hostView.eventDispatcher = dispatcher
   }
@@ -100,6 +114,7 @@ class OverKeyboardRootViewGroup(
   private val jsTouchDispatcher: JSTouchDispatcher = JSTouchDispatcher(this)
   private var jsPointerDispatcher: JSPointerDispatcherCompat? = null
   internal var eventDispatcher: EventDispatcher? = null
+  internal var stateWrapper: StateWrapper? = null
   internal var isAttached = false
 
   init {
@@ -111,20 +126,40 @@ class OverKeyboardRootViewGroup(
   // region life cycles
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
+    val displaySize = reactContext.getDisplaySize()
+    stretchTo(width = displaySize.x, height = displaySize.y)
     isAttached = true
   }
 
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
+    stretchTo(width = 0, height = 0)
     isAttached = false
   }
+
+  override fun onSizeChanged(
+    width: Int,
+    height: Int,
+    oldWidth: Int,
+    oldHeight: Int,
+  ) {
+    super.onSizeChanged(width, height, oldWidth, oldHeight)
+    stretchTo(width, height)
+  }
+
   // endregion
 
   // region Touch events handling
   override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
     eventDispatcher?.let { eventDispatcher ->
-      jsTouchDispatcher.handleTouchEvent(event, eventDispatcher)
-      jsPointerDispatcher?.handleMotionEventCompat(event, eventDispatcher, true)
+      try {
+        jsTouchDispatcher.handleTouchEvent(event, eventDispatcher)
+        jsPointerDispatcher?.handleMotionEventCompat(event, eventDispatcher, true)
+      } catch (
+        @Suppress("detekt:TooGenericExceptionCaught") e: RuntimeException,
+      ) {
+        Logger.w(TAG, "Can not handle touch event", e)
+      }
     }
     return super.onInterceptTouchEvent(event)
   }
@@ -132,8 +167,14 @@ class OverKeyboardRootViewGroup(
   @SuppressLint("ClickableViewAccessibility")
   override fun onTouchEvent(event: MotionEvent): Boolean {
     eventDispatcher?.let { eventDispatcher ->
-      jsTouchDispatcher.handleTouchEvent(event, eventDispatcher)
-      jsPointerDispatcher?.handleMotionEventCompat(event, eventDispatcher, false)
+      try {
+        jsTouchDispatcher.handleTouchEvent(event, eventDispatcher)
+        jsPointerDispatcher?.handleMotionEventCompat(event, eventDispatcher, false)
+      } catch (
+        @Suppress("detekt:TooGenericExceptionCaught") e: RuntimeException,
+      ) {
+        Logger.w(TAG, "Can not handle touch event", e)
+      }
     }
     super.onTouchEvent(event)
     // In case when there is no children interested in handling touch event, we return true from
@@ -184,4 +225,14 @@ class OverKeyboardRootViewGroup(
     reactContext.reactApplicationContext.handleException(RuntimeException(t))
   }
   // endregion
+
+  private fun stretchTo(
+    width: Int,
+    height: Int,
+  ) {
+    val newStateData: WritableMap = WritableNativeMap()
+    newStateData.putDouble("screenWidth", width.toFloat().dp)
+    newStateData.putDouble("screenHeight", height.toFloat().dp)
+    stateWrapper?.updateState(newStateData)
+  }
 }

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

@@ -0,0 +1,85 @@
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
+set(LIB_LITERAL reactnativekeyboardcontroller)
+set(LIB_TARGET_NAME react_codegen_${LIB_LITERAL})
+
+set(LIB_ANDROID_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
+set(LIB_COMMON_DIR ${LIB_ANDROID_DIR}/../common/cpp)
+set(LIB_COMMON_COMPONENTS_DIR ${LIB_COMMON_DIR}/react/renderer/components/${LIB_LITERAL})
+set(LIB_ANDROID_GENERATED_JNI_DIR ${LIB_ANDROID_DIR}/build/generated/source/codegen/jni)
+set(LIB_ANDROID_GENERATED_COMPONENTS_DIR ${LIB_ANDROID_GENERATED_JNI_DIR}/react/renderer/components/${LIB_LITERAL})
+
+add_compile_options(
+  -fexceptions
+  -frtti
+  -std=c++20
+  -Wall
+  -Wpedantic
+  -Wno-gnu-zero-variadic-macro-arguments
+  -Wno-dollar-in-identifier-extension
+)
+
+file(GLOB LIB_CUSTOM_SRCS CONFIGURE_DEPENDS *.cpp ${LIB_COMMON_COMPONENTS_DIR}/*.cpp)
+file(GLOB LIB_CODEGEN_SRCS CONFIGURE_DEPENDS ${LIB_ANDROID_GENERATED_JNI_DIR}/*.cpp ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}/*.cpp)
+
+add_library(
+  ${LIB_TARGET_NAME}
+  SHARED
+  ${LIB_CUSTOM_SRCS}
+  ${LIB_CODEGEN_SRCS}
+)
+
+target_include_directories(
+  ${LIB_TARGET_NAME}
+  PUBLIC
+  .
+  ${LIB_COMMON_DIR}
+  ${LIB_ANDROID_GENERATED_JNI_DIR}
+  ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}
+)
+
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+  target_link_libraries(
+    ${LIB_TARGET_NAME}
+    ReactAndroid::reactnative
+    ReactAndroid::jsi
+    fbjni::fbjni
+  )
+else()
+  target_link_libraries(
+    ${LIB_TARGET_NAME}
+    fbjni
+    folly_runtime
+    glog
+    jsi
+    react_codegen_rncore
+    react_debug
+    react_nativemodule_core
+    react_render_core
+    react_render_debug
+    react_render_graphics
+    react_render_mapbuffer
+    react_render_componentregistry
+    react_utils
+    rrc_view
+    turbomodulejsijni
+    yoga
+  )
+endif()
+
+target_compile_options(
+  ${LIB_TARGET_NAME}
+  PRIVATE
+  -DLOG_TAG=\"ReactNative\"
+  -fexceptions
+  -frtti
+  -std=c++20
+  -Wall
+)
+
+target_include_directories(
+ ${CMAKE_PROJECT_NAME}
+ PUBLIC
+ ${CMAKE_CURRENT_SOURCE_DIR}
+)

package/android/src/main/jni/reactnativekeyboardcontroller.h

@@ -0,0 +1,23 @@
+#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/reactnativekeyboardcontroller.h
+ *
+ * Here we are overriding autogenerated component descriptors by prioritizing our custom headers via include path setup.
+ */
+#include <react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardControllerViewComponentDescriptor.h>
+#include <react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardGestureAreaComponentDescriptor.h>
+#include <react/renderer/components/reactnativekeyboardcontroller/RNKCOverKeyboardViewComponentDescriptor.h>
+
+#include <memory>
+#include <string>
+
+namespace facebook::react {
+JSI_EXPORT
+std::shared_ptr<TurboModule> reactnativekeyboardcontroller_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardControllerViewComponentDescriptor.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "RNKCKeyboardControllerViewShadowNode.h"
+
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook::react {
+
+class KeyboardControllerViewComponentDescriptor final
+    : public ConcreteComponentDescriptor<KeyboardControllerViewShadowNode> {
+ public:
+  using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+  void adopt(ShadowNode &shadowNode) const override {
+    react_native_assert(dynamic_cast<KeyboardControllerViewShadowNode *>(&shadowNode));
+    ConcreteComponentDescriptor::adopt(shadowNode);
+  }
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardControllerViewShadowNode.cpp

@@ -0,0 +1,7 @@
+#include "RNKCKeyboardControllerViewShadowNode.h"
+
+namespace facebook::react {
+
+extern const char KeyboardControllerViewComponentName[] = "KeyboardControllerView";
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardControllerViewShadowNode.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include "RNKCKeyboardControllerViewState.h"
+
+#include <react/renderer/components/reactnativekeyboardcontroller/EventEmitters.h>
+#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <jsi/jsi.h>
+
+namespace facebook::react {
+
+JSI_EXPORT extern const char KeyboardControllerViewComponentName[];
+
+/*
+ * `ShadowNode` for <KeyboardControllerView> component.
+ */
+using KeyboardControllerViewShadowNode = ConcreteViewShadowNode<
+    KeyboardControllerViewComponentName,
+    KeyboardControllerViewProps,
+    KeyboardControllerViewEventEmitter,
+    KeyboardControllerViewState>;
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardControllerViewState.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#endif
+
+namespace facebook::react {
+
+class KeyboardControllerViewState {
+ public:
+  KeyboardControllerViewState() = default;
+
+#ifdef ANDROID
+  KeyboardControllerViewState(KeyboardControllerViewState const &previousState, folly::dynamic data) {}
+  folly::dynamic getDynamic() const {
+    return {};
+  }
+#endif
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardGestureAreaComponentDescriptor.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include "RNKCKeyboardGestureAreaShadowNode.h"
+
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook::react {
+class KeyboardGestureAreaComponentDescriptor final
+    : public ConcreteComponentDescriptor<KeyboardGestureAreaShadowNode> {
+ public:
+  using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+  void adopt(ShadowNode &shadowNode) const override {
+    react_native_assert(dynamic_cast<KeyboardGestureAreaShadowNode *>(&shadowNode));
+    ConcreteComponentDescriptor::adopt(shadowNode);
+  }
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardGestureAreaShadowNode.cpp

@@ -0,0 +1,7 @@
+#include "RNKCKeyboardGestureAreaShadowNode.h"
+
+namespace facebook::react {
+
+extern const char KeyboardGestureAreaComponentName[] = "KeyboardGestureArea";
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardGestureAreaShadowNode.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include "RNKCKeyboardGestureAreaState.h"
+
+#include <react/renderer/components/reactnativekeyboardcontroller/EventEmitters.h>
+#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <jsi/jsi.h>
+
+namespace facebook::react {
+
+JSI_EXPORT extern const char KeyboardGestureAreaComponentName[];
+
+/*
+ * `ShadowNode` for <KeyboardGestureArea> component.
+ */
+using KeyboardGestureAreaShadowNode = ConcreteViewShadowNode<
+    KeyboardGestureAreaComponentName,
+    KeyboardGestureAreaProps,
+    KeyboardGestureAreaEventEmitter,
+    KeyboardGestureAreaState>;
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardGestureAreaState.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#endif
+
+namespace facebook::react {
+
+class KeyboardGestureAreaState {
+ public:
+  KeyboardGestureAreaState() = default;
+
+#ifdef ANDROID
+  KeyboardGestureAreaState(KeyboardGestureAreaState const &previousState, folly::dynamic data) {}
+  folly::dynamic getDynamic() const {
+    return {};
+  }
+#endif
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCOverKeyboardViewComponentDescriptor.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#include "RNKCOverKeyboardViewShadowNode.h"
+
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook::react {
+
+class OverKeyboardViewComponentDescriptor final
+    : public ConcreteComponentDescriptor<OverKeyboardViewShadowNode> {
+ public:
+  using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+  void adopt(ShadowNode &shadowNode) const override {
+    auto& layoutableShadowNode =
+        static_cast<YogaLayoutableShadowNode&>(shadowNode);
+    auto& stateData =
+        static_cast<const OverKeyboardViewShadowNode::ConcreteState&>(
+            *shadowNode.getState())
+            .getData();
+
+    layoutableShadowNode.setSize(
+        Size{stateData.screenSize.width, stateData.screenSize.height});
+    layoutableShadowNode.setPositionType(YGPositionTypeAbsolute);
+
+    ConcreteComponentDescriptor::adopt(shadowNode);
+  }
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCOverKeyboardViewShadowNode.cpp

@@ -0,0 +1,7 @@
+#include "RNKCOverKeyboardViewShadowNode.h"
+
+namespace facebook::react {
+
+extern const char OverKeyboardViewComponentName[] = "OverKeyboardView";
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCOverKeyboardViewShadowNode.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include "RNKCOverKeyboardViewState.h"
+
+#include <react/renderer/components/reactnativekeyboardcontroller/EventEmitters.h>
+#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <jsi/jsi.h>
+
+namespace facebook::react {
+
+JSI_EXPORT extern const char OverKeyboardViewComponentName[];
+
+/*
+ * `ShadowNode` for <OverKeyboardView> component.
+ */
+using OverKeyboardViewShadowNode = ConcreteViewShadowNode<
+    OverKeyboardViewComponentName,
+    OverKeyboardViewProps,
+    OverKeyboardViewEventEmitter,
+    OverKeyboardViewState>;
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCOverKeyboardViewState.cpp

@@ -0,0 +1,12 @@
+#include "RNKCOverKeyboardViewState.h"
+
+namespace facebook::react {
+
+#ifdef ANDROID
+folly::dynamic OverKeyboardViewState::getDynamic() const {
+  return folly::dynamic::object("screenWidth", screenSize.width)(
+      "screenHeight", screenSize.height);
+}
+#endif
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/reactnativekeyboardcontroller/RNKCOverKeyboardViewState.h

@@ -0,0 +1,43 @@
+#pragma once
+
+#include <react/renderer/core/graphicsConversions.h>
+#include <react/renderer/graphics/Float.h>
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#endif
+
+#include <memory>
+
+namespace facebook::react {
+
+/*
+ * State for <OverKeyboardViewState> component.
+ */
+class OverKeyboardViewState final {
+ public:
+  using Shared = std::shared_ptr<const OverKeyboardViewState>;
+
+
+  OverKeyboardViewState() {}
+  OverKeyboardViewState(Size screenSize_) : screenSize(screenSize_) {}
+
+#ifdef ANDROID
+  OverKeyboardViewState(
+      const OverKeyboardViewState& previousState,
+      folly::dynamic data)
+      : screenSize(Size{
+            (Float)data["screenWidth"].getDouble(),
+            (Float)data["screenHeight"].getDouble()}) {}
+#endif
+
+  const Size screenSize{};
+
+#ifdef ANDROID
+  folly::dynamic getDynamic() const;
+#endif
+
+#pragma mark - Getters
+};
+
+} // namespace facebook::react

package/ios/KeyboardController-Bridging-Header.h

@@ -1,4 +1,3 @@
 #import <React/RCTTouchHandler.h>
 #import <React/RCTUIManager.h>
-#import <React/RCTUITextView.h>
 #import <React/RCTViewManager.h>

package/ios/delegates/KCTextInputCompositeDelegate.swift

@@ -65,7 +65,7 @@ class KCTextInputCompositeDelegate: NSObject, UITextViewDelegate, UITextFieldDel
   // MARK: setters/getters
 
   public func setTextViewDelegate(delegate: UITextViewDelegate?) {
-    // remove KVO from any old textField
+    // remove KVO from any old textView
     if let oldTextField = observedTextFieldForSelection {
       removeSelectionRangeObserver(from: oldTextField)
     }
@@ -96,6 +96,21 @@ class KCTextInputCompositeDelegate: NSObject, UITextViewDelegate, UITextFieldDel
     }
   }
 
+  public func canSubstituteTextFieldDelegate(delegate: UITextFieldDelegate?) -> Bool {
+    let type = String(describing: delegate)
+    if type.range(of: "SQIPTextFieldInputModifier") != nil {
+      // SQIPTextFieldInputModifier is a private class used internally by Square.
+      // It forwards input events to the keyboard-controller delegate.
+      // To prevent an infinite loop, we avoid setting our delegate in this case.
+      // Since Square's SDK is used imperatively and doesn't allow adding custom components,
+      // keyboard-controller components cannot be used in this context,
+      // so it's safe to skip replacing the delegate.
+      return false
+    }
+
+    return true
+  }
+
   // Getter for the active delegate
   public var activeDelegate: AnyObject? {
     return textViewDelegate ?? textFieldDelegate

package/ios/objc/{RCTUITextView+DelegateManager.h → UITextView+DelegateManager.h}

@@ -1,13 +1,11 @@
 //
-//  RCTTextView+DelegateManager.h
+//  UITextView+DelegateManager.h
 //  react-native-keyboard-controller
 //
 //  Created by Kiryl Ziusko on 24/04/2024.
 //
 
-#import <React/RCTUITextView.h>
-
-@interface RCTUITextView (DelegateManager)
+@interface UITextView (DelegateManager)
 
 - (void)setForceDelegate:(id<UITextViewDelegate>)delegate;
 

package/ios/objc/{RCTUITextView+DelegateManager.m → UITextView+DelegateManager.m}

@@ -1,14 +1,14 @@
 //
-//  RCTUITextView+DelegateManager.m
+//  UITextView+DelegateManager.m
 //  react-native-keyboard-controller
 //
 //  Created by Kiryl Ziusko on 24/04/2024.
 //
 
 #import <objc/runtime.h>
-#import "RCTUITextView+DelegateManager.h"
+#import "UITextView+DelegateManager.h"
 
-@implementation RCTUITextView (DelegateManager)
+@implementation UITextView (DelegateManager)
 
 /**
  * We are aware that delegate is set by RN on mount and we can not re-define it

package/ios/observers/FocusedInputObserver.swift

@@ -228,14 +228,16 @@ public class FocusedInputObserver: NSObject {
 
   private func substituteDelegate(_ input: UIResponder?) {
     if let textField = input as? UITextField {
-      if !(textField.delegate is KCTextInputCompositeDelegate) {
+      if !(textField.delegate is KCTextInputCompositeDelegate),
+         delegate.canSubstituteTextFieldDelegate(delegate: textField.delegate)
+      {
         delegate.setTextFieldDelegate(delegate: textField.delegate, textField: textField)
         textField.delegate = delegate
       }
     } else if let textView = input as? UITextView {
       if !(textView.delegate is KCTextInputCompositeDelegate) {
         delegate.setTextViewDelegate(delegate: textView.delegate)
-        (textView as? RCTUITextView)?.setForceDelegate(delegate)
+        textView.setForceDelegate(delegate)
       }
     }
     // dispatch onSelectionChange on focus
@@ -248,7 +250,7 @@ public class FocusedInputObserver: NSObject {
     if let textField = input as? UITextField, let oldDelegate = delegate.activeDelegate as? UITextFieldDelegate {
       textField.delegate = oldDelegate
     } else if let textView = input as? UITextView, let oldDelegate = delegate.activeDelegate as? UITextViewDelegate {
-      (textView as? RCTUITextView)?.setForceDelegate(oldDelegate)
+      textView.setForceDelegate(oldDelegate)
     }
   }
 

package/ios/views/KeyboardControllerView.mm

@@ -20,10 +20,10 @@
 #import <react_native_keyboard_controller/react_native_keyboard_controller-Swift.h>
 #endif
 
-#import <react/renderer/components/reactnativekeyboardcontroller/ComponentDescriptors.h>
 #import <react/renderer/components/reactnativekeyboardcontroller/EventEmitters.h>
 #import <react/renderer/components/reactnativekeyboardcontroller/Props.h>
 #import <react/renderer/components/reactnativekeyboardcontroller/RCTComponentViewHelpers.h>
+#import <react/renderer/components/reactnativekeyboardcontroller/RNKCKeyboardControllerViewComponentDescriptor.h>
 
 #import "KeyboardControllerModule-Header.h"
 #import "RCTFabricComponentsPlugins.h"