kirillzyusko · kirillzyusko · Jan 12, 2026 · Dec 16, 2025 · Dec 16, 2025 · Dec 16, 2025
diff --git a/.github/workflows/build-android-fabric-windows.yml b/.github/workflows/build-android-fabric-windows.yml
@@ -0,0 +1,69 @@
+name: 🤖 Build Android Fabric
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - ".github/workflows/build-android-fabric-windows.yml"
+      - "android/**"
+      - "yarn.lock"
+      - "src/specs/**"
+      - "common/**"
+  pull_request:
+    paths:
+      - ".github/workflows/build-android-fabric-windows.yml"
+      - "android/**"
+      - "yarn.lock"
+      - "src/specs/**"
+      - "common/**"
+
+jobs:
+  build:
+    name: 💠 Build Android on Windows
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: "microsoft"
+          java-version: "17"
+      - name: Create sample app
+        run: cd ..\..\ && npx @react-native-community/cli@latest init WindowsWithUnbelievablyHugeAndReallyLongPathName --version 0.83.1
+      - name: Get yarn cache directory path
+        id: fabric-windows-yarn-cache-dir-path
+        shell: pwsh
+        run: |
+          $dir = yarn cache dir
+          echo "dir=$dir" >> $env:GITHUB_OUTPUT
+      - name: Restore node_modules from cache
+        uses: actions/cache@v4
+        id: yarn-cache
+        with:
+          path: ${{ steps.fabric-windows-yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-fabric-windows-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-fabric-windows-yarn-
+      - name: Install node_modules for windows/
+        shell: pwsh
+        run: |
+          cd ..\..\ && yarn install --frozen-lockfile --cwd WindowsWithUnbelievablyHugeAndReallyLongPathName
+      - name: Link keyboard controller
+        shell: pwsh
+        run: cd ..\..\WindowsWithUnbelievablyHugeAndReallyLongPathName && yarn add react-native-keyboard-controller@link:../react-native-keyboard-controller/react-native-keyboard-controller
+      - name: Restore Gradle cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            C:\Users\runneradmin\.gradle\caches
+            C:\Users\runneradmin\.gradle\wrapper
+          key: ${{ runner.os }}-fabric-windows-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-fabric-windows-gradle-
+      - name: Run Gradle Build for windows/android/
+        shell: pwsh
+        run: |
+          cd ..\..\WindowsWithUnbelievablyHugeAndReallyLongPathName\android
+          .\gradlew.bat assembleDebug --build-cache -PreactNativeArchitectures=arm64-v8a
diff --git a/.github/workflows/build-android-fabric.yml b/.github/workflows/build-android-fabric.yml
@@ -26,7 +26,7 @@ on:
 
 jobs:
   build:
-    name: Build Android Fabric Example App
+    name: 🖥️ Build Android Fabric Example App
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/FabricExample/ios/Podfile.lock b/FabricExample/ios/Podfile.lock
@@ -3117,7 +3117,7 @@ SPEC CHECKSUMS:
   React-microtasksnativemodule: 44b44a4d3cd6ffb85d928abf741acdc26722de2e
   react-native-advanced-input-mask: 7e8cb58287774c4447485387661abe946d0e0bb2
   react-native-blur: ba0e9ad6274783c8d45f42da82acae02e25784ad
-  react-native-keyboard-controller: d07a35e49d478d26b2eb44b10aedc4e1d35354d6
+  react-native-keyboard-controller: 0bf45b0ab9c8f2caf632832e80abfd33978d212c
   react-native-safe-area-context: 6d8a7b750e496e37bda47c938320bf2c734d441f
   React-NativeModulesApple: b5d18bc109c45c9a1c6b71664991b5cc3adc4e48
   React-oscompat: 93b5535ea7f7dff46aaee4f78309a70979bdde9d

diff --git a/android/src/main/jni/CMakeLists.txt b/android/src/main/jni/CMakeLists.txt
@@ -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}/../../..)

diff --git a/android/src/main/jni/RNKC.h b/android/src/main/jni/RNKC.h
@@ -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
diff --git a/android/src/main/jni/keyboardcontroller.h b/android/src/main/jni/keyboardcontroller.h
diff --git a/...yboardBackgroundViewComponentDescriptor.h → ...yboardBackgroundViewComponentDescriptor.h b/...yboardBackgroundViewComponentDescriptor.h → ...yboardBackgroundViewComponentDescriptor.h
@@ -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 {

diff --git a/.../RNKCKeyboardBackgroundViewShadowNode.cpp → .../RNKCKeyboardBackgroundViewShadowNode.cpp b/.../RNKCKeyboardBackgroundViewShadowNode.cpp → .../RNKCKeyboardBackgroundViewShadowNode.cpp
diff --git a/...er/RNKCKeyboardBackgroundViewShadowNode.h → ...KC/RNKCKeyboardBackgroundViewShadowNode.h b/...er/RNKCKeyboardBackgroundViewShadowNode.h → ...KC/RNKCKeyboardBackgroundViewShadowNode.h
@@ -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>
 

diff --git a/...troller/RNKCKeyboardBackgroundViewState.h → ...ts/RNKC/RNKCKeyboardBackgroundViewState.h b/...troller/RNKCKeyboardBackgroundViewState.h → ...ts/RNKC/RNKCKeyboardBackgroundViewState.h
diff --git a/...yboardControllerViewComponentDescriptor.h → ...yboardControllerViewComponentDescriptor.h b/...yboardControllerViewComponentDescriptor.h → ...yboardControllerViewComponentDescriptor.h
@@ -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 {

diff --git a/.../RNKCKeyboardControllerViewShadowNode.cpp → .../RNKCKeyboardControllerViewShadowNode.cpp b/.../RNKCKeyboardControllerViewShadowNode.cpp → .../RNKCKeyboardControllerViewShadowNode.cpp
diff --git a/...er/RNKCKeyboardControllerViewShadowNode.h → ...KC/RNKCKeyboardControllerViewShadowNode.h b/...er/RNKCKeyboardControllerViewShadowNode.h → ...KC/RNKCKeyboardControllerViewShadowNode.h
@@ -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>
 

diff --git a/...troller/RNKCKeyboardControllerViewState.h → ...ts/RNKC/RNKCKeyboardControllerViewState.h b/...troller/RNKCKeyboardControllerViewState.h → ...ts/RNKC/RNKCKeyboardControllerViewState.h
diff --git a/...RNKCKeyboardExtenderComponentDescriptor.h → ...RNKCKeyboardExtenderComponentDescriptor.h b/...RNKCKeyboardExtenderComponentDescriptor.h → ...RNKCKeyboardExtenderComponentDescriptor.h
@@ -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 {

diff --git a/...roller/RNKCKeyboardExtenderShadowNode.cpp → ...s/RNKC/RNKCKeyboardExtenderShadowNode.cpp b/...roller/RNKCKeyboardExtenderShadowNode.cpp → ...s/RNKC/RNKCKeyboardExtenderShadowNode.cpp
diff --git a/...ntroller/RNKCKeyboardExtenderShadowNode.h → ...nts/RNKC/RNKCKeyboardExtenderShadowNode.h b/...ntroller/RNKCKeyboardExtenderShadowNode.h → ...nts/RNKC/RNKCKeyboardExtenderShadowNode.h
@@ -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>
 

diff --git a/...ardcontroller/RNKCKeyboardExtenderState.h → ...mponents/RNKC/RNKCKeyboardExtenderState.h b/...ardcontroller/RNKCKeyboardExtenderState.h → ...mponents/RNKC/RNKCKeyboardExtenderState.h
diff --git a/...CKeyboardGestureAreaComponentDescriptor.h → ...CKeyboardGestureAreaComponentDescriptor.h b/...CKeyboardGestureAreaComponentDescriptor.h → ...CKeyboardGestureAreaComponentDescriptor.h
@@ -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 {

diff --git a/...ler/RNKCKeyboardGestureAreaShadowNode.cpp → ...NKC/RNKCKeyboardGestureAreaShadowNode.cpp b/...ler/RNKCKeyboardGestureAreaShadowNode.cpp → ...NKC/RNKCKeyboardGestureAreaShadowNode.cpp
diff --git a/...oller/RNKCKeyboardGestureAreaShadowNode.h → .../RNKC/RNKCKeyboardGestureAreaShadowNode.h b/...oller/RNKCKeyboardGestureAreaShadowNode.h → .../RNKC/RNKCKeyboardGestureAreaShadowNode.h
@@ -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>
 

diff --git a/...controller/RNKCKeyboardGestureAreaState.h → ...nents/RNKC/RNKCKeyboardGestureAreaState.h b/...controller/RNKCKeyboardGestureAreaState.h → ...nents/RNKC/RNKCKeyboardGestureAreaState.h
diff --git a/...RNKCOverKeyboardViewComponentDescriptor.h → ...RNKCOverKeyboardViewComponentDescriptor.h b/...RNKCOverKeyboardViewComponentDescriptor.h → ...RNKCOverKeyboardViewComponentDescriptor.h
@@ -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 {

diff --git a/...roller/RNKCOverKeyboardViewShadowNode.cpp → ...s/RNKC/RNKCOverKeyboardViewShadowNode.cpp b/...roller/RNKCOverKeyboardViewShadowNode.cpp → ...s/RNKC/RNKCOverKeyboardViewShadowNode.cpp
diff --git a/...ntroller/RNKCOverKeyboardViewShadowNode.h → ...nts/RNKC/RNKCOverKeyboardViewShadowNode.h b/...ntroller/RNKCOverKeyboardViewShadowNode.h → ...nts/RNKC/RNKCOverKeyboardViewShadowNode.h
@@ -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>
 

diff --git a/...dcontroller/RNKCOverKeyboardViewState.cpp → ...onents/RNKC/RNKCOverKeyboardViewState.cpp b/...dcontroller/RNKCOverKeyboardViewState.cpp → ...onents/RNKC/RNKCOverKeyboardViewState.cpp
diff --git a/...ardcontroller/RNKCOverKeyboardViewState.h → ...mponents/RNKC/RNKCOverKeyboardViewState.h b/...ardcontroller/RNKCOverKeyboardViewState.h → ...mponents/RNKC/RNKCOverKeyboardViewState.h
diff --git a/ios/KeyboardControllerModule.mm b/ios/KeyboardControllerModule.mm
@@ -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"

diff --git a/ios/views/KeyboardBackgroundViewManager.mm b/ios/views/KeyboardBackgroundViewManager.mm
@@ -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

diff --git a/ios/views/KeyboardControllerView.mm b/ios/views/KeyboardControllerView.mm
@@ -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"

diff --git a/ios/views/KeyboardExtenderManager.mm b/ios/views/KeyboardExtenderManager.mm
@@ -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

diff --git a/ios/views/KeyboardGestureAreaManager.mm b/ios/views/KeyboardGestureAreaManager.mm
@@ -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

diff --git a/ios/views/OverKeyboardViewManager.mm b/ios/views/OverKeyboardViewManager.mm
@@ -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

diff --git a/package.json b/package.json
@@ -172,7 +172,7 @@
     ]
   },
   "codegenConfig": {
-    "name": "keyboardcontroller",
+    "name": "RNKC",
     "type": "all",
     "jsSrcsDir": "./src/specs",
     "android": {

diff --git a/react-native-keyboard-controller.podspec b/react-native-keyboard-controller.podspec
@@ -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