Skip to content

fix: shorter codegen name #1251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kirillzyusko merged 2 commits into from
Dec 17, 2025
Merged

fix: shorter codegen name #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef3ee34
fix: shorter codegen name
kirillzyusko Dec 17, 2025
ba36763
fix: cpplint
kirillzyusko Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FabricExample/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3117,7 +3117,7 @@ SPEC CHECKSUMS:
React-microtasksnativemodule: 44b44a4d3cd6ffb85d928abf741acdc26722de2e
react-native-advanced-input-mask: 7e8cb58287774c4447485387661abe946d0e0bb2
react-native-blur: ba0e9ad6274783c8d45f42da82acae02e25784ad
react-native-keyboard-controller: 81aa9e5784da51c8855759b6d17d5d897ccaa0e4
react-native-keyboard-controller: 59e99eb52537287dfc11621263d75b0645120264
react-native-safe-area-context: 6d8a7b750e496e37bda47c938320bf2c734d441f
React-NativeModulesApple: b5d18bc109c45c9a1c6b71664991b5cc3adc4e48
React-oscompat: 93b5535ea7f7dff46aaee4f78309a70979bdde9d
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/jni/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.13)
set(CMAKE_VERBOSE_MAKEFILE ON)

set(LIB_LITERAL reactnativekeyboardcontroller)
set(LIB_LITERAL keyboardcontroller)
set(LIB_TARGET_NAME react_codegen_${LIB_LITERAL})

set(LIB_ANDROID_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
Expand Down
24 changes: 24 additions & 0 deletions android/src/main/jni/keyboardcontroller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/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
24 changes: 0 additions & 24 deletions android/src/main/jni/reactnativekeyboardcontroller.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...yboardBackgroundViewComponentDescriptor.h → ...yboardBackgroundViewComponentDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "RNKCKeyboardBackgroundViewShadowNode.h"

#include <react/debug/react_native_assert.h>
#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
#include <react/renderer/components/keyboardcontroller/Props.h>
#include <react/renderer/core/ConcreteComponentDescriptor.h>

namespace facebook::react {
Expand Down
0 .../RNKCKeyboardBackgroundViewShadowNode.cpp → .../RNKCKeyboardBackgroundViewShadowNode.cpp
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...er/RNKCKeyboardBackgroundViewShadowNode.h → ...er/RNKCKeyboardBackgroundViewShadowNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

#include "RNKCKeyboardBackgroundViewState.h"

#include <react/renderer/components/reactnativekeyboardcontroller/EventEmitters.h>
#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
#include <react/renderer/components/keyboardcontroller/EventEmitters.h>
#include <react/renderer/components/keyboardcontroller/Props.h>
#include <react/renderer/components/view/ConcreteViewShadowNode.h>
#include <jsi/jsi.h>

Expand Down
0 ...troller/RNKCKeyboardBackgroundViewState.h → ...troller/RNKCKeyboardBackgroundViewState.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...yboardControllerViewComponentDescriptor.h → ...yboardControllerViewComponentDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "RNKCKeyboardControllerViewShadowNode.h"

#include <react/debug/react_native_assert.h>
#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
#include <react/renderer/components/keyboardcontroller/Props.h>
#include <react/renderer/core/ConcreteComponentDescriptor.h>

namespace facebook::react {
Expand Down
0 .../RNKCKeyboardControllerViewShadowNode.cpp → .../RNKCKeyboardControllerViewShadowNode.cpp
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...er/RNKCKeyboardControllerViewShadowNode.h → ...er/RNKCKeyboardControllerViewShadowNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include "RNKCKeyboardControllerViewState.h"

#include <react/renderer/components/reactnativekeyboardcontroller/EventEmitters.h>
#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
#include <react/renderer/components/keyboardcontroller/EventEmitters.h>
#include <react/renderer/components/keyboardcontroller/Props.h>
#include <react/renderer/components/view/ConcreteViewShadowNode.h>
#include <jsi/jsi.h>

Expand Down
0 ...troller/RNKCKeyboardControllerViewState.h → ...troller/RNKCKeyboardControllerViewState.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...RNKCKeyboardExtenderComponentDescriptor.h → ...RNKCKeyboardExtenderComponentDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "RNKCKeyboardExtenderShadowNode.h"

#include <react/debug/react_native_assert.h>
#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
#include <react/renderer/components/keyboardcontroller/Props.h>
#include <react/renderer/core/ConcreteComponentDescriptor.h>

namespace facebook::react {
Expand Down
0 ...roller/RNKCKeyboardExtenderShadowNode.cpp → ...roller/RNKCKeyboardExtenderShadowNode.cpp
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ntroller/RNKCKeyboardExtenderShadowNode.h → ...ntroller/RNKCKeyboardExtenderShadowNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

#include "RNKCKeyboardExtenderState.h"

#include <react/renderer/components/reactnativekeyboardcontroller/EventEmitters.h>
#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
#include <react/renderer/components/keyboardcontroller/EventEmitters.h>
#include <react/renderer/components/keyboardcontroller/Props.h>
#include <react/renderer/components/view/ConcreteViewShadowNode.h>
#include <jsi/jsi.h>

Expand Down
0 ...ardcontroller/RNKCKeyboardExtenderState.h → ...ardcontroller/RNKCKeyboardExtenderState.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...CKeyboardGestureAreaComponentDescriptor.h → ...CKeyboardGestureAreaComponentDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "RNKCKeyboardGestureAreaShadowNode.h"

#include <react/debug/react_native_assert.h>
#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
#include <react/renderer/components/keyboardcontroller/Props.h>
#include <react/renderer/core/ConcreteComponentDescriptor.h>

namespace facebook::react {
Expand Down
0 ...ler/RNKCKeyboardGestureAreaShadowNode.cpp → ...ler/RNKCKeyboardGestureAreaShadowNode.cpp
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...oller/RNKCKeyboardGestureAreaShadowNode.h → ...oller/RNKCKeyboardGestureAreaShadowNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include "RNKCKeyboardGestureAreaState.h"

#include <react/renderer/components/reactnativekeyboardcontroller/EventEmitters.h>
#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
#include <react/renderer/components/keyboardcontroller/EventEmitters.h>
#include <react/renderer/components/keyboardcontroller/Props.h>
#include <react/renderer/components/view/ConcreteViewShadowNode.h>
#include <jsi/jsi.h>

Expand Down
0 ...controller/RNKCKeyboardGestureAreaState.h → ...controller/RNKCKeyboardGestureAreaState.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...RNKCOverKeyboardViewComponentDescriptor.h → ...RNKCOverKeyboardViewComponentDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "RNKCOverKeyboardViewShadowNode.h"

#include <react/debug/react_native_assert.h>
#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
#include <react/renderer/components/keyboardcontroller/Props.h>
#include <react/renderer/core/ConcreteComponentDescriptor.h>

namespace facebook::react {
Expand Down
0 ...roller/RNKCOverKeyboardViewShadowNode.cpp → ...roller/RNKCOverKeyboardViewShadowNode.cpp
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ntroller/RNKCOverKeyboardViewShadowNode.h → ...ntroller/RNKCOverKeyboardViewShadowNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include "RNKCOverKeyboardViewState.h"

#include <react/renderer/components/reactnativekeyboardcontroller/EventEmitters.h>
#include <react/renderer/components/reactnativekeyboardcontroller/Props.h>
#include <react/renderer/components/keyboardcontroller/EventEmitters.h>
#include <react/renderer/components/keyboardcontroller/Props.h>
#include <react/renderer/components/view/ConcreteViewShadowNode.h>
#include <jsi/jsi.h>

Expand Down
0 ...dcontroller/RNKCOverKeyboardViewState.cpp → ...dcontroller/RNKCOverKeyboardViewState.cpp
View file
Open in desktop
File renamed without changes.
0 ...ardcontroller/RNKCOverKeyboardViewState.h → ...ardcontroller/RNKCOverKeyboardViewState.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ios/KeyboardControllerModule.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <reactnativekeyboardcontroller/reactnativekeyboardcontroller.h>
#import <keyboardcontroller/keyboardcontroller.h>
#endif

#import "KeyboardControllerModule-Header.h"
Expand Down
8 changes: 4 additions & 4 deletions ios/views/KeyboardBackgroundViewManager.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#endif

#ifdef RCT_NEW_ARCH_ENABLED
#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/RNKCKeyboardBackgroundViewComponentDescriptor.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/RNKCKeyboardBackgroundViewComponentDescriptor.h>

#import "RCTFabricComponentsPlugins.h"
#endif
Expand Down
8 changes: 4 additions & 4 deletions ios/views/KeyboardControllerView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
#import <react_native_keyboard_controller/react_native_keyboard_controller-Swift.h>
#endif

#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 <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 "KeyboardControllerModule-Header.h"
#import "RCTFabricComponentsPlugins.h"
Expand Down
8 changes: 4 additions & 4 deletions ios/views/KeyboardExtenderManager.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
#ifdef RCT_NEW_ARCH_ENABLED
#import <React/RCTSurfaceTouchHandler.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/RNKCKeyboardExtenderComponentDescriptor.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 "RCTFabricComponentsPlugins.h"
#endif
Expand Down
8 changes: 4 additions & 4 deletions ios/views/KeyboardGestureAreaManager.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#endif

#ifdef RCT_NEW_ARCH_ENABLED
#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/RNKCKeyboardGestureAreaComponentDescriptor.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/RNKCKeyboardGestureAreaComponentDescriptor.h>

#import "RCTFabricComponentsPlugins.h"
#endif
Expand Down
8 changes: 4 additions & 4 deletions ios/views/OverKeyboardViewManager.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
#ifdef RCT_NEW_ARCH_ENABLED
#import <React/RCTSurfaceTouchHandler.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/RNKCOverKeyboardViewComponentDescriptor.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 "RCTFabricComponentsPlugins.h"
#endif
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
]
},
"codegenConfig": {
"name": "reactnativekeyboardcontroller",
"name": "keyboardcontroller",
"type": "all",
"jsSrcsDir": "./src/specs",
"android": {
Expand Down
2 changes: 1 addition & 1 deletion react-native-keyboard-controller.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/reactnativekeyboardcontroller"
ss.header_dir = "react/renderer/components/keyboardcontroller"
ss.private_header_files = "common/cpp/**/*.{h}"
ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/common/cpp\"" }
end
Expand Down