@react-native-ohos/react-native-custom-keyboard 1.0.4-rc.3 → 1.1.0-rc.2

package/LICENSE

@@ -0,0 +1,8 @@
+The MIT License (MIT)
+Copyright © 2025 <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.OpenSource

@@ -0,0 +1,11 @@
+[
+    {
+        "Name": "react-native-custom-keyboard",
+        "License": "MIT License",
+        "License File": "LICENSE",
+        "Version Number": "1.0.3",
+        "Owner" : "xiafeng@huawei.com",
+        "Upstream URL": "https://github.com/reactnativecn/react-native-custom-keyboard",
+        "Description": ""
+    }
+]

package/README.md

@@ -1,16 +1,12 @@
-# @react-native-ohos/react-native-custom-keyboard
+# react-native-custom-keyboard
 
-本项目基于 [react-native-custom-keyboard](https://github.com/reactnativecn/react-native-custom-keyboard)@1.0.3
+本项目基于 [react-native-custom-keyboard](https://github.com/reactnativecn/react-native-custom-keyboard)
 
 ## 文档地址 / Documentation URL 
 
-[中文 / Chinese](https://gitee.com/react-native-oh-library/usage-docs/blob/master/zh-cn/react-native-custom-keyboard.md)
+- [中文](https://gitee.com/react-native-oh-library/usage-docs/blob/master/zh-cn/react-native-custom-keyboard.md)
 
-## Codegen
-
-该库已接入 codegen，具体请查阅文档。
-
-The library has been integrated with codegen. Please refer to the documentation for details.
+- [English](https://gitee.com/react-native-oh-library/usage-docs/blob/master/en/react-native-custom-keyboard.md)
 
 ## 请悉知 / Acknowledgements
 

package/harmony/custom_keyboard/BuildProfile.ets

@@ -1,7 +1,13 @@
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
 /**
  * Use these variables when you tailor your ArkTS code. They must be of the const type.
  */
-export const HAR_VERSION = '1.0.3-0.0.2';
+export const HAR_VERSION = '1.0.4-rc.1';
 export const BUILD_MODE_NAME = 'debug';
 export const DEBUG = true;
 export const TARGET_NAME = 'default';

package/harmony/custom_keyboard/Index.ets

@@ -1,3 +1,7 @@
-import { RNCustomKeyboardPackage as CustomKeyboardPackage } from './src/main/ets/RNCustomKeyboardPackage';
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
 export * from "./ts";
-export default CustomKeyboardPackage;

package/harmony/custom_keyboard/hvigorfile.ts

@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
 import { harTasks } from '@ohos/hvigor-ohos-plugin';
 
 export default {

package/harmony/custom_keyboard/oh-package.json5

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-custom-keyboard",
-  "version": "1.0.4-rc.3",
+  "version": "1.1.0-rc.2",
   "description": "",
   "main": "Index.ets",
   "author": "",

package/harmony/custom_keyboard/src/main/cpp/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
 set(rnoh_custom_keyboard_package_generated_dir "${CMAKE_CURRENT_SOURCE_DIR}/generated")
-file(GLOB_RECURSE rnoh_custom_keyboard_package_generated_SRC "${rnoh_custom_keyboard_package_generated_dir}/**/*.cpp")
+file(GLOB_RECURSE rnoh_custom_keyboard_package_generated_SRC "${rnoh_custom_keyboard_package_generated_dir}/*.cpp")
 file(GLOB rnoh_custom_keyboard_package_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(rnoh_custom_keyboard_package SHARED ${rnoh_custom_keyboard_package_SRC} ${rnoh_custom_keyboard_package_generated_SRC})
 target_include_directories(rnoh_custom_keyboard_package PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${rnoh_custom_keyboard_package_generated_dir})

package/harmony/custom_keyboard/src/main/cpp/CustomKeyboardPackage.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
 #include "CustomKeyboardPackage.h"
 #include "CustomKeyboardTurboModuleSpec.h"
 
@@ -5,8 +11,7 @@ using namespace facebook;
 namespace rnoh {
 class CustomKeyboardTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
 public:
-    SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override
-    {
+    SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override {
         if (name == "CustomKeyboardNativeModule") {
             return std::make_shared<NativeCustomKeyboardTurboModuleSpecJSI>(ctx, name);
         }
@@ -14,8 +19,7 @@ public:
     };
 };
 
-std::unique_ptr<TurboModuleFactoryDelegate> CustomKeyboardPackage::createTurboModuleFactoryDelegate()
-{
+std::unique_ptr<TurboModuleFactoryDelegate> CustomKeyboardPackage::createTurboModuleFactoryDelegate() {
     return std::make_unique<CustomKeyboardTurboModuleFactoryDelegate>();
 }
 } // namespace rnoh

package/harmony/custom_keyboard/src/main/cpp/CustomKeyboardPackage.h

@@ -1,11 +1,17 @@
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
 #pragma once
-#include "generated/RNOH/generated/BaseReactNativeCustomKeyboardPackage.h"
+#include "RNOH/Package.h"
 
 namespace rnoh {
-class CustomKeyboardPackage : public BaseReactNativeCustomKeyboardPackage {
+class CustomKeyboardPackage : public Package {
 
 public:
-    explicit CustomKeyboardPackage(Package::Context ctx) : BaseReactNativeCustomKeyboardPackage(ctx) {}
+    CustomKeyboardPackage(Package::Context ctx) : Package(ctx) {}
 
     std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override;
 };

package/harmony/custom_keyboard/src/main/cpp/CustomKeyboardTurboModuleSpec.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
 // NOTE: This entire file should be codegen'ed.
 #include "CustomKeyboardTurboModuleSpec.h"
 
@@ -6,17 +12,15 @@ using namespace facebook;
 
 static constexpr double HEIGHT = 216;
 static constexpr int AVOIDENCE = 0;
-static constexpr int START_SURFACE_ID = 45;
-static constexpr int CLICK_TARGET_ID = NODE_ON_CLICK + 101;
-NativeCustomKeyboardTurboModuleSpecJSI::~NativeCustomKeyboardTurboModuleSpecJSI()
-{
-    for (const UserData *userData : m_userDatas) {
-        delete userData;
-        userData = nullptr;
+static constexpr int START_SURFACE_ID=45;
+static constexpr int CLICK_TARGET_ID=NODE_ON_CLICK+101;
+NativeCustomKeyboardTurboModuleSpecJSI::~NativeCustomKeyboardTurboModuleSpecJSI() {
+        for (const UserData *userData : m_userDatas) {
+            delete userData;
+            userData = nullptr;
+        }
     }
-}
-TextInputNode *NativeCustomKeyboardTurboModuleSpecJSI::getEditById(int tag)
-{
+TextInputNode *NativeCustomKeyboardTurboModuleSpecJSI::getEditById(int tag) {
     auto weakInstance = m_ctx.instance;
     auto instance = weakInstance.lock();
     if (!instance) {
@@ -39,8 +43,7 @@ TextInputNode *NativeCustomKeyboardTurboModuleSpecJSI::getEditById(int tag)
     return textInputNode;
 }
 
-static std::shared_ptr<RNInstanceCAPI> getInstanceCapi(std::weak_ptr<RNInstance> weakInstance)
-{
+static std::shared_ptr<RNInstanceCAPI> getInstanceCapi(std::weak_ptr<RNInstance> weakInstance) {
     auto instance = weakInstance.lock();
     if (!instance) {
         return nullptr;
@@ -53,8 +56,7 @@ static std::shared_ptr<RNInstanceCAPI> getInstanceCapi(std::weak_ptr<RNInstance>
 }
 
 static void getDevicePhycicalPixels(std::shared_ptr<RNInstanceCAPI> instanceCapi, double &width, double &height,
-                                    double &scale)
-{
+                                    double &scale) {
     auto turboModule = instanceCapi->getTurboModule("DeviceInfo");
     auto deviceInfoTurboModule = std::dynamic_pointer_cast<DeviceInfoTurboModule>(turboModule);
     auto displayMetrics = deviceInfoTurboModule->callSync("getConstants", {});
@@ -67,37 +69,33 @@ static void getDevicePhycicalPixels(std::shared_ptr<RNInstanceCAPI> instanceCapi
     }
 }
 
-static void setTextInputUserData(TextInputNode *textInput, UserData *userData)
-{
+static void setTextInputUserData(TextInputNode *textInput, UserData *userData) {
     ArkUI_NodeHandle view = textInput->getArkUINodeHandle();
     NativeNodeApi::getInstance()->setUserData(view, userData);
 }
 
-static UserData *getTextInputUserData(TextInputNode *textInput)
-{
+static UserData *getTextInputUserData(TextInputNode *textInput) {
     ArkUI_NodeHandle view = textInput->getArkUINodeHandle();
-    auto data = (NativeNodeApi::getInstance()->getUserData(view));
+    auto data=(NativeNodeApi::getInstance()->getUserData(view));
     UserData *userData = reinterpret_cast<UserData*>(data);
     return userData;
 }
 
-static void getTextSelection(TextInputNode* textInput, int32_t &start, int32_t &end)
-{
-    const ArkUI_AttributeItem* item =
-    NativeNodeApi::getInstance()->getAttribute(textInput->getArkUINodeHandle(), NODE_TEXT_INPUT_TEXT_SELECTION);
-    start = item->value[0].i32;
-    end = item->value[1].i32;
+static void getTextSelection(TextInputNode* textInput, int32_t &start, int32_t &end) {
+   const ArkUI_AttributeItem* item =
+   NativeNodeApi::getInstance()->getAttribute(textInput->getArkUINodeHandle(), NODE_TEXT_INPUT_TEXT_SELECTION);
+   start = item->value[0].i32;
+   end = item->value[1].i32;
 }
 
-static void setCustomKeyboard(TextInputNode *textInput, ArkUI_Node* CustomKeyboard, int32_t const &avoidence)
-{
-    ArkUI_NumberValue value = {.i32 = avoidence};
-    ArkUI_AttributeItem item{.object=CustomKeyboard, .value = &value, .size = 1};
-    NativeNodeApi::getInstance()->setAttribute(textInput->getArkUINodeHandle(), NODE_TEXT_INPUT_CUSTOM_KEYBOARD, &item);
+static void setCustomKeyboard(TextInputNode *textInput, ArkUI_Node* CustomKeyboard, int32_t const &avoidence){
+  ArkUI_NumberValue value = {.i32 = avoidence};
+  ArkUI_AttributeItem item{.object=CustomKeyboard,.value=&value,.size=1};
+  NativeNodeApi::getInstance()->setAttribute(
+  textInput->getArkUINodeHandle(), NODE_TEXT_INPUT_CUSTOM_KEYBOARD, &item);
 }
 
-void NativeCustomKeyboardTurboModuleSpecJSI::install(jsi::Runtime &rt, int32_t tag, std::string type)
-{
+void NativeCustomKeyboardTurboModuleSpecJSI::install(jsi::Runtime &rt, int32_t tag, std::string type) {
     this->m_ctx.taskExecutor->runTask(TaskThread::MAIN, [this, tag, type]() {
         auto edit = getEditById(tag);
         if (!edit) {
@@ -108,14 +106,10 @@ void NativeCustomKeyboardTurboModuleSpecJSI::install(jsi::Runtime &rt, int32_t t
             return;
         }
         static int surfaceID = START_SURFACE_ID;
-        while (instanceCapi->findComponentInstanceByTag(surfaceID)) {
-            surfaceID++;
-        }
+        while(instanceCapi->findComponentInstanceByTag(surfaceID)){surfaceID++;}
         instanceCapi->createSurface(surfaceID, "CustomKeyboard");
         folly::dynamic initialProps = folly::dynamic::object("tag", tag)("type", type);
-        double width;
-        double height;
-        double scale;
+        double width, height, scale;
         getDevicePhycicalPixels(instanceCapi, width, height, scale);
         instanceCapi->startSurface(surfaceID, 0.0f, 0.0f, width / scale, HEIGHT, 0.0f, 0.0f, scale, false,
                                    std::move(initialProps));
@@ -126,27 +120,28 @@ void NativeCustomKeyboardTurboModuleSpecJSI::install(jsi::Runtime &rt, int32_t t
         ArkUINode &node = comp->getLocalRootArkUINode();
         ArkUI_NodeHandle uiNode = node.getArkUINodeHandle();
         //空值 说明edit没有绑定点击事件
-        if (!getTextInputUserData(edit)) {
-            NativeNodeApi::getInstance()->registerNodeEvent(edit->getArkUINodeHandle(),
-                                                            NODE_ON_CLICK, CLICK_TARGET_ID,
-                                                            edit->getArkUINodeHandle());
-            auto callback = [](ArkUI_NodeEvent *event) {
+        if(!getTextInputUserData(edit)) {
+                NativeNodeApi::getInstance()->registerNodeEvent(
+                edit->getArkUINodeHandle(), NODE_ON_CLICK, CLICK_TARGET_ID, edit->getArkUINodeHandle());
+                auto callback = [](ArkUI_NodeEvent *event) {
                 if (OH_ArkUI_NodeEvent_GetTargetId(event) == CLICK_TARGET_ID) {
-                    //get textInputNode and userData
-                    ArkUI_NodeHandle textNode = OH_ArkUI_NodeEvent_GetNodeHandle(event);
-                    void* data = (NativeNodeApi::getInstance()->getUserData(textNode));
-                    UserData *userData = reinterpret_cast<UserData*>(data);
-                    if (userData && userData->data && userData->enabled == false) {
-                        userData->enabled = true;
-                        //set customkeyboard
-                        ArkUI_NumberValue value = {.i32 = AVOIDENCE};
-                        ArkUI_AttributeItem item{.object=userData->data, .value=&value, .size=1};
-                        NativeNodeApi::getInstance()->setAttribute(textNode, NODE_TEXT_INPUT_CUSTOM_KEYBOARD, &item);
-                    }
-                }
-            };
-            NativeNodeApi::getInstance()->addNodeEventReceiver(edit->getArkUINodeHandle(), callback);
+                //get textInputNode and userData
+                ArkUI_NodeHandle textNode=OH_ArkUI_NodeEvent_GetNodeHandle(event);
+                void* data=(NativeNodeApi::getInstance()->getUserData(textNode));
+                UserData *userData = reinterpret_cast<UserData*>(data);
+                if (userData && userData->data && userData->enabled == false) {
+                userData->enabled = true;
+                //set customkeyboard
+                ArkUI_NumberValue value = {.i32 = AVOIDENCE};
+                ArkUI_AttributeItem item{.object=userData->data,.value=&value,.size=1};
+                NativeNodeApi::getInstance()->setAttribute(
+                textNode, NODE_TEXT_INPUT_CUSTOM_KEYBOARD, &item);
+        }
+            }
+        };
+        NativeNodeApi::getInstance()->addNodeEventReceiver(edit->getArkUINodeHandle(),callback);            
         }
+        
         setCustomKeyboard(edit, uiNode, AVOIDENCE);
         UserData *userData = new UserData({.data = uiNode, .enabled = true});
         this->m_userDatas.insert(userData);
@@ -154,8 +149,7 @@ void NativeCustomKeyboardTurboModuleSpecJSI::install(jsi::Runtime &rt, int32_t t
     });
 }
 
-void NativeCustomKeyboardTurboModuleSpecJSI::uninstall(jsi::Runtime &rt, int32_t tag)
-{
+void NativeCustomKeyboardTurboModuleSpecJSI::uninstall(jsi::Runtime &rt, int32_t tag) {
     this->m_ctx.taskExecutor->runTask(TaskThread::MAIN, [this, tag]() {
         auto instanceCapi = getInstanceCapi(this->m_ctx.instance);
         if (!instanceCapi) {
@@ -165,7 +159,7 @@ void NativeCustomKeyboardTurboModuleSpecJSI::uninstall(jsi::Runtime &rt, int32_t
         edit->setFocusStatus(false);
         auto error_code =
         NativeNodeApi::getInstance()->resetAttribute(edit->getArkUINodeHandle(), NODE_TEXT_INPUT_CUSTOM_KEYBOARD);
-        if (error_code) {
+        if(error_code){
             DLOG(ERROR)<<"uninstall custom keyboard error"<<std::endl;
             return;
         }
@@ -175,8 +169,7 @@ void NativeCustomKeyboardTurboModuleSpecJSI::uninstall(jsi::Runtime &rt, int32_t
     });
 }
 
-void NativeCustomKeyboardTurboModuleSpecJSI::insertText(jsi::Runtime &rt, int32_t tag, std::string text)
-{
+void NativeCustomKeyboardTurboModuleSpecJSI::insertText(jsi::Runtime &rt, int32_t tag, std::string text) {
     this->m_ctx.taskExecutor->runTask(TaskThread::MAIN, [this, tag, text]() {
         TextInputNode *textInputNode = this->getEditById(tag);
         int start = 0;
@@ -188,8 +181,7 @@ void NativeCustomKeyboardTurboModuleSpecJSI::insertText(jsi::Runtime &rt, int32_
         textInputNode->setTextSelection(start+text.size(), start+text.size());
     });
 }
-void NativeCustomKeyboardTurboModuleSpecJSI::backSpace(jsi::Runtime &rt, int32_t tag)
-{
+void NativeCustomKeyboardTurboModuleSpecJSI::backSpace(jsi::Runtime &rt, int32_t tag) {
     this->m_ctx.taskExecutor->runTask(TaskThread::MAIN, [this, tag]() {
         TextInputNode *textInputNode = this->getEditById(tag);
         int start = 0;
@@ -207,8 +199,7 @@ void NativeCustomKeyboardTurboModuleSpecJSI::backSpace(jsi::Runtime &rt, int32_t
         }
     });
 }
-void NativeCustomKeyboardTurboModuleSpecJSI::doDelete(jsi::Runtime &rt, int32_t tag)
-{
+void NativeCustomKeyboardTurboModuleSpecJSI::doDelete(jsi::Runtime &rt, int32_t tag) {
     this->m_ctx.taskExecutor->runTask(TaskThread::MAIN, [this, tag]() {
         TextInputNode *textInputNode = this->getEditById(tag);
         int start = 0;
@@ -226,8 +217,7 @@ void NativeCustomKeyboardTurboModuleSpecJSI::doDelete(jsi::Runtime &rt, int32_t
         }
     });
 }
-void NativeCustomKeyboardTurboModuleSpecJSI::moveLeft(jsi::Runtime &rt, int32_t tag)
-{
+void NativeCustomKeyboardTurboModuleSpecJSI::moveLeft(jsi::Runtime &rt, int32_t tag) {
     this->m_ctx.taskExecutor->runTask(TaskThread::MAIN, [this, tag]() {
         TextInputNode *textInputNode = this->getEditById(tag);
         int start = 0;
@@ -240,8 +230,7 @@ void NativeCustomKeyboardTurboModuleSpecJSI::moveLeft(jsi::Runtime &rt, int32_t
         }
     });
 }
-void NativeCustomKeyboardTurboModuleSpecJSI::moveRight(jsi::Runtime &rt, int32_t tag)
-{
+void NativeCustomKeyboardTurboModuleSpecJSI::moveRight(jsi::Runtime &rt, int32_t tag) {
     this->m_ctx.taskExecutor->runTask(TaskThread::MAIN, [this, tag]() {
         TextInputNode *textInputNode = this->getEditById(tag);
         int start = 0;
@@ -256,8 +245,7 @@ void NativeCustomKeyboardTurboModuleSpecJSI::moveRight(jsi::Runtime &rt, int32_t
     });
 }
 
-void NativeCustomKeyboardTurboModuleSpecJSI::switchSystemKeyboard(jsi::Runtime &rt, int32_t tag)
-{
+void NativeCustomKeyboardTurboModuleSpecJSI::switchSystemKeyboard(jsi::Runtime &rt, int32_t tag) {
     this->m_ctx.taskExecutor->runTask(TaskThread::MAIN, [this, tag]() {
         auto instanceCapi = getInstanceCapi(this->m_ctx.instance);
         if (!instanceCapi) {
@@ -267,7 +255,7 @@ void NativeCustomKeyboardTurboModuleSpecJSI::switchSystemKeyboard(jsi::Runtime &
         edit->setFocusStatus(false);
         auto error_code =
             NativeNodeApi::getInstance()->resetAttribute(edit->getArkUINodeHandle(), NODE_TEXT_INPUT_CUSTOM_KEYBOARD);
-        if (error_code) {
+        if(error_code){
             DLOG(ERROR)<<"switch system keyboard error"<<std::endl;
             return;
         }
@@ -278,113 +266,101 @@ void NativeCustomKeyboardTurboModuleSpecJSI::switchSystemKeyboard(jsi::Runtime &
 }
 
 // 各个方法的宿主函数定义
-static jsi::Value hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_install(jsi::Runtime &rt,
-                                                                              react::TurboModule &turboModule,
-                                                                              const jsi::Value *args, size_t count)
-{
+static jsi::Value __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_install(jsi::Runtime &rt,
+                                                                                react::TurboModule &turboModule,
+                                                                                const jsi::Value *args, size_t count) {
     static_cast<NativeCustomKeyboardTurboModuleSpecJSI *>(&turboModule)
         ->install(rt, args[0].asNumber(), args[1].asString(rt).utf8(rt));
     return jsi::Value::undefined();
 }
 
-static jsi::Value hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_uninstall(jsi::Runtime &rt,
-                                                                                react::TurboModule &turboModule,
-                                                                                const jsi::Value *args,
-                                                                                size_t count)
-{
+static jsi::Value __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_uninstall(jsi::Runtime &rt,
+                                                                                  react::TurboModule &turboModule,
+                                                                                  const jsi::Value *args,
+                                                                                  size_t count) {
     static_cast<NativeCustomKeyboardTurboModuleSpecJSI *>(&turboModule)->uninstall(rt, args[0].asNumber());
     return jsi::Value::undefined();
 }
 
-static jsi::Value hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_insertText(jsi::Runtime &rt,
-                                                                                 react::TurboModule &turboModule,
-                                                                                 const jsi::Value *args,
-                                                                                 size_t count)
-{
+static jsi::Value __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_insertText(jsi::Runtime &rt,
+                                                                                   react::TurboModule &turboModule,
+                                                                                   const jsi::Value *args,
+                                                                                   size_t count) {
     static_cast<NativeCustomKeyboardTurboModuleSpecJSI *>(&turboModule)
         ->insertText(rt, args[0].asNumber(), args[1].asString(rt).utf8(rt));
     return jsi::Value::undefined();
 }
 
-static jsi::Value hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_backSpace(jsi::Runtime &rt,
-                                                                                react::TurboModule &turboModule,
-                                                                                const jsi::Value *args,
-                                                                                size_t count)
-{
+static jsi::Value __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_backSpace(jsi::Runtime &rt,
+                                                                                  react::TurboModule &turboModule,
+                                                                                  const jsi::Value *args,
+                                                                                  size_t count) {
     static_cast<NativeCustomKeyboardTurboModuleSpecJSI *>(&turboModule)->backSpace(rt, args[0].asNumber());
     return jsi::Value::undefined();
 }
 
-static jsi::Value hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_doDelete(jsi::Runtime &rt,
-                                                                               react::TurboModule &turboModule,
-                                                                               const jsi::Value *args, size_t count)
-{
+static jsi::Value __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_doDelete(jsi::Runtime &rt,
+                                                                                 react::TurboModule &turboModule,
+                                                                                 const jsi::Value *args, size_t count) {
     static_cast<NativeCustomKeyboardTurboModuleSpecJSI *>(&turboModule)->doDelete(rt, args[0].asNumber());
     return jsi::Value::undefined();
 }
 
-static jsi::Value hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_moveLeft(jsi::Runtime &rt,
-                                                                               react::TurboModule &turboModule,
-                                                                               const jsi::Value *args, size_t count)
-{
+static jsi::Value __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_moveLeft(jsi::Runtime &rt,
+                                                                                 react::TurboModule &turboModule,
+                                                                                 const jsi::Value *args, size_t count) {
     static_cast<NativeCustomKeyboardTurboModuleSpecJSI *>(&turboModule)->moveLeft(rt, args[0].asNumber());
     return jsi::Value::undefined();
 }
 
-static jsi::Value hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_moveRight(jsi::Runtime &rt,
-                                                                                react::TurboModule &turboModule,
-                                                                                const jsi::Value *args,
-                                                                                size_t count)
-{
+static jsi::Value __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_moveRight(jsi::Runtime &rt,
+                                                                                  react::TurboModule &turboModule,
+                                                                                  const jsi::Value *args,
+                                                                                  size_t count) {
     static_cast<NativeCustomKeyboardTurboModuleSpecJSI *>(&turboModule)->moveRight(rt, args[0].asNumber());
     return jsi::Value::undefined();
 }
 
-static jsi::Value hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_switchSystemKeyboard(
-    jsi::Runtime &rt, react::TurboModule &turboModule, const jsi::Value *args, size_t count)
-{
+static jsi::Value __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_switchSystemKeyboard(
+    jsi::Runtime &rt, react::TurboModule &turboModule, const jsi::Value *args, size_t count) {
     static_cast<NativeCustomKeyboardTurboModuleSpecJSI *>(&turboModule)->switchSystemKeyboard(rt, args[0].asNumber());
     return jsi::Value::undefined();
 }
 
-static jsi::Value hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_displayRNOHError(
-    jsi::Runtime &rt, react::TurboModule &turboModule, const jsi::Value *args, size_t count)
-{
+static jsi::Value __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_displayRNOHError(
+    jsi::Runtime &rt, react::TurboModule &turboModule, const jsi::Value *args, size_t count) {
     return jsi::Value(static_cast<ArkTSTurboModule &>(turboModule).call(rt, "displayRNOHError", args, count));
 }
 
-static jsi::Value hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_throwExceptionCpp(
-    jsi::Runtime &rt, react::TurboModule &turboModule, const jsi::Value *args, size_t count)
-{
+static jsi::Value __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_throwExceptionCpp(
+    jsi::Runtime &rt, react::TurboModule &turboModule, const jsi::Value *args, size_t count) {
     throw std::runtime_error("Exception thrown from C++");
 }
 
-static jsi::Value hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_throwExceptionArk(
-    jsi::Runtime &rt, react::TurboModule &turboModule, const jsi::Value *args, size_t count)
-{
+static jsi::Value __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_throwExceptionArk(
+    jsi::Runtime &rt, react::TurboModule &turboModule, const jsi::Value *args, size_t count) {
     return jsi::Value(static_cast<ArkTSTurboModule &>(turboModule).call(rt, "throwExceptionArk", args, count));
 }
 
 NativeCustomKeyboardTurboModuleSpecJSI::NativeCustomKeyboardTurboModuleSpecJSI(const ArkTSTurboModule::Context ctx,
                                                                                const std::string name)
-    : ArkTSTurboModule(ctx, name)
-{
+    : ArkTSTurboModule(ctx, name) {
     methodMap_ = {};
 
-    methodMap_["install"] = MethodMetadata{2, hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_install};
-    methodMap_["uninstall"] = MethodMetadata{1, hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_uninstall};
-    methodMap_["insertText"] = MethodMetadata{2, hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_insertText};
-    methodMap_["backSpace"] = MethodMetadata{1, hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_backSpace};
-    methodMap_["doDelete"] = MethodMetadata{1, hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_doDelete};
-    methodMap_["moveLeft"] = MethodMetadata{1, hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_moveLeft};
-    methodMap_["moveRight"] = MethodMetadata{1, hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_moveRight};
+    methodMap_["install"] = MethodMetadata{2, __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_install};
+    methodMap_["uninstall"] = MethodMetadata{1, __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_uninstall};
+    methodMap_["insertText"] = MethodMetadata{2, __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_insertText};
+    methodMap_["backSpace"] = MethodMetadata{1, __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_backSpace};
+    methodMap_["doDelete"] = MethodMetadata{1, __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_doDelete};
+    methodMap_["moveLeft"] = MethodMetadata{1, __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_moveLeft};
+    methodMap_["moveRight"] = MethodMetadata{1, __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_moveRight};
     methodMap_["switchSystemKeyboard"] =
-        MethodMetadata{1, hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_switchSystemKeyboard};
+        MethodMetadata{1, __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_switchSystemKeyboard};
 
     methodMap_["displayRNOHError"] =
-        MethodMetadata{1, hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_displayRNOHError};
+        MethodMetadata{1, __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_displayRNOHError};
     methodMap_["throwExceptionCpp"] =
-        MethodMetadata{0, hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_throwExceptionCpp};
+        MethodMetadata{0, __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_throwExceptionCpp};
     methodMap_["throwExceptionArk"] =
-        MethodMetadata{0, hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_throwExceptionArk};
+        MethodMetadata{0, __hostFunction_NativeCustomKeyboardTurboModuleSpecJSI_throwExceptionArk};
 }

package/harmony/custom_keyboard/src/main/cpp/CustomKeyboardTurboModuleSpec.h

@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+
 // NOTE: This entire file should be codegen'ed.
 #pragma once
 
@@ -11,7 +18,7 @@ using namespace facebook;
 
 namespace rnoh {
 
-typedef struct {
+typedef struct{
     ArkUI_NodeHandle data;
     bool enabled;
 }UserData;

package/harmony/custom_keyboard/src/main/cpp/generated/{RNOH/generated/BaseReactNativeCustomKeyboardPackage.h → custom_keyboard/RNOH/generated/BaseReactNativeOhTplReactNativeCustomKeyboardPackage.h}

@@ -1,5 +1,8 @@
 /**
- * This code was generated by "react-native codegen-lib-harmony"
+ * This code was generated by "react-native codegen-harmony"
+ * 
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
  */
 
 #pragma once
@@ -10,7 +13,7 @@
 
 namespace rnoh {
 
-class BaseReactNativeCustomKeyboardPackageTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
+class BaseReactNativeOhosReactNativeCustomKeyboardPackageTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
   public:
     SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override {
         if (name == "CustomKeyboardNativeModule") {
@@ -20,29 +23,36 @@ class BaseReactNativeCustomKeyboardPackageTurboModuleFactoryDelegate : public Tu
     };
 };
 
-class BaseReactNativeCustomKeyboardPackageEventEmitRequestHandler : public EventEmitRequestHandler {
+class BaseReactNativeOhosReactNativeCustomKeyboardPackageEventEmitRequestHandler : public EventEmitRequestHandler {
   public:
     void handleEvent(Context const &ctx) override {
         auto eventEmitter = ctx.shadowViewRegistry->getEventEmitter<facebook::react::EventEmitter>(ctx.tag);
+        auto componentName = ctx.shadowViewRegistry->getComponentName(ctx.tag);
+
         if (eventEmitter == nullptr) {
             return;
         }
 
+        std::vector<std::string> supportedComponentNames = {
+        };
+
         std::vector<std::string> supportedEventNames = {
         };
-        if (std::find(supportedEventNames.begin(), supportedEventNames.end(), ctx.eventName) != supportedEventNames.end()) {
+
+        if (std::find(supportedComponentNames.begin(), supportedComponentNames.end(), componentName) != supportedComponentNames.end() &&
+            std::find(supportedEventNames.begin(), supportedEventNames.end(), ctx.eventName) != supportedEventNames.end()) {
             eventEmitter->dispatchEvent(ctx.eventName, ArkJS(ctx.env).getDynamic(ctx.payload));
         }    
     }
 };
 
 
-class BaseReactNativeCustomKeyboardPackage : public Package {
+class BaseReactNativeOhosReactNativeCustomKeyboardPackage : public Package {
   public:
-    BaseReactNativeCustomKeyboardPackage(Package::Context ctx) : Package(ctx){};
+    BaseReactNativeOhosReactNativeCustomKeyboardPackage(Package::Context ctx) : Package(ctx){};
 
     std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override {
-        return std::make_unique<BaseReactNativeCustomKeyboardPackageTurboModuleFactoryDelegate>();
+        return std::make_unique<BaseReactNativeOhosReactNativeCustomKeyboardPackageTurboModuleFactoryDelegate>();
     }
 
     std::vector<facebook::react::ComponentDescriptorProvider> createComponentDescriptorProviders() override {
@@ -57,7 +67,7 @@ class BaseReactNativeCustomKeyboardPackage : public Package {
 
     EventEmitRequestHandlers createEventEmitRequestHandlers() override {
         return {
-            std::make_shared<BaseReactNativeCustomKeyboardPackageEventEmitRequestHandler>(),
+            std::make_shared<BaseReactNativeOhosReactNativeCustomKeyboardPackageEventEmitRequestHandler>(),
         };
     }
 };

package/harmony/custom_keyboard/src/main/cpp/generated/{RNOH → custom_keyboard/RNOH}/generated/turbo_modules/CustomKeyboardNativeModule.cpp

@@ -1,5 +1,10 @@
 /**
- * This code was generated by "react-native codegen-lib-harmony"
+ * This code was generated by "react-native codegen-harmony"
+ * 
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
+ * 
+ * @generatorVersion: 2
  */
 
 #include "CustomKeyboardNativeModule.h"

package/harmony/custom_keyboard/src/main/cpp/generated/{RNOH → custom_keyboard/RNOH}/generated/turbo_modules/CustomKeyboardNativeModule.h

@@ -1,5 +1,10 @@
 /**
- * This code was generated by "react-native codegen-lib-harmony"
+ * This code was generated by "react-native codegen-harmony"
+ * 
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
+ * 
+ * @generatorVersion: 2
  */
 
 #pragma once

package/harmony/custom_keyboard/src/main/cpp/generated/{react/renderer/components/react_native_custom_keyboard → custom_keyboard/react/renderer/components/custom_keyboard}/ComponentDescriptors.h

@@ -10,13 +10,15 @@
 
 #pragma once
 
-#include <react/renderer/components/react_native_custom_keyboard/ShadowNodes.h>
+#include "ShadowNodes.h"
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 
 
-} // namespace react
-} // namespace facebook
+void _react_native_ohos_react_native_custom_keyboard_registerComponentDescriptorsFromCodegen(
+  std::shared_ptr<const ComponentDescriptorProviderRegistry> registry);
+
+} // namespace facebook::react

package/harmony/custom_keyboard/src/main/cpp/generated/{react/renderer/components/react_native_custom_keyboard → custom_keyboard/react/renderer/components/custom_keyboard}/EventEmitters.cpp

@@ -8,11 +8,9 @@
  * @generated by codegen project: GenerateEventEmitterCpp.js
  */
 
-#include <react/renderer/components/react_native_custom_keyboard/EventEmitters.h>
+#include "EventEmitters.h"
 
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/custom_keyboard/src/main/cpp/generated/{react/renderer/components/react_native_custom_keyboard → custom_keyboard/react/renderer/components/custom_keyboard}/EventEmitters.h

@@ -12,8 +12,6 @@
 #include <react/renderer/components/view/ViewEventEmitter.h>
 
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/custom_keyboard/src/main/cpp/generated/{react/renderer/components/react_native_custom_keyboard → custom_keyboard/react/renderer/components/custom_keyboard}/Props.cpp

@@ -8,14 +8,12 @@
  * @generated by codegen project: GeneratePropsCpp.js
  */
 
-#include <react/renderer/components/react_native_custom_keyboard/Props.h>
+#include "Props.h"
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/custom_keyboard/src/main/cpp/generated/{react/renderer/components/react_native_custom_keyboard → custom_keyboard/react/renderer/components/custom_keyboard}/Props.h

@@ -11,10 +11,8 @@
 
 
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/custom_keyboard/src/main/cpp/generated/{react/renderer/components/react_native_custom_keyboard → custom_keyboard/react/renderer/components/custom_keyboard}/ShadowNodes.cpp

@@ -8,12 +8,10 @@
  * @generated by codegen project: GenerateShadowNodeCpp.js
  */
 
-#include <react/renderer/components/react_native_custom_keyboard/ShadowNodes.h>
+#include "ShadowNodes.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/custom_keyboard/src/main/cpp/generated/{react/renderer/components/react_native_custom_keyboard → custom_keyboard/react/renderer/components/custom_keyboard}/ShadowNodes.h

@@ -10,16 +10,14 @@
 
 #pragma once
 
-#include <react/renderer/components/react_native_custom_keyboard/EventEmitters.h>
-#include <react/renderer/components/react_native_custom_keyboard/Props.h>
-#include <react/renderer/components/react_native_custom_keyboard/States.h>
+#include "EventEmitters.h"
+#include "Props.h"
+#include "States.h"
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/custom_keyboard/src/main/cpp/generated/{react/renderer/components/react_native_custom_keyboard → custom_keyboard/react/renderer/components/custom_keyboard}/States.cpp

@@ -7,12 +7,10 @@
  *
  * @generated by codegen project: GenerateStateCpp.js
  */
-#include <react/renderer/components/react_native_custom_keyboard/States.h>
+#include "States.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/custom_keyboard/src/main/cpp/generated/{react/renderer/components/react_native_custom_keyboard → custom_keyboard/react/renderer/components/custom_keyboard}/States.h

@@ -10,14 +10,10 @@
 
 #ifdef ANDROID
 #include <folly/dynamic.h>
-#include <react/renderer/mapbuffer/MapBuffer.h>
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/custom_keyboard/src/main/ets/{RNCustomKeyboardPackage.ets → RNCustomKeyboardPackage.ts}

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import { RNOHPackage, TurboModulesFactory } from '@rnoh/react-native-openharmony';
+import { RNPackage, TurboModulesFactory } from '@rnoh/react-native-openharmony/ts';
 import type { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
 import { TM } from './generated/ts'
 import { RNCustomKeyboardTurboModule } from './RNCustomKeyboardTurboModule';
@@ -40,7 +40,7 @@ class RNCustomKeyboardTurboModuleFactory extends TurboModulesFactory {
   }
 }
 
-export class RNCustomKeyboardPackage extends RNOHPackage {
+export class RNCustomKeyboardPackage extends RNPackage {
   createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
     return new RNCustomKeyboardTurboModuleFactory(ctx);
   }

package/harmony/custom_keyboard/src/main/ets/generated/index.ets

@@ -1,5 +1,8 @@
 /**
- * This code was generated by "react-native codegen-lib-harmony"
+ * This code was generated by "react-native codegen-harmony"
+ * 
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
  */
 
 export * from "./ts"

package/harmony/custom_keyboard/src/main/ets/generated/ts.ts

@@ -1,5 +1,8 @@
 /**
- * This code was generated by "react-native codegen-lib-harmony"
+ * This code was generated by "react-native codegen-harmony"
+ * 
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
  */
 
 export * as RNC from "./components/ts"

package/harmony/custom_keyboard/src/main/ets/generated/turboModules/CustomKeyboardNativeModule.ts

@@ -1,8 +1,12 @@
 /**
- * This code was generated by "react-native codegen-lib-harmony"
+ * This code was generated by "react-native codegen-harmony"
+ * 
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
+ * 
+ * @generatorVersion: 2
  */
 
-import { Tag } from "@rnoh/react-native-openharmony/ts"
 
 export namespace CustomKeyboardNativeModule {
   export const NAME = 'CustomKeyboardNativeModule' as const

package/harmony/custom_keyboard/src/main/ets/generated/turboModules/ts.ts

@@ -1,5 +1,8 @@
 /**
- * This code was generated by "react-native codegen-lib-harmony"
+ * This code was generated by "react-native codegen-harmony"
+ * 
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
  */
 
 export * from "./CustomKeyboardNativeModule"

package/harmony/custom_keyboard/ts.ts

@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+export * from './src/main/ets/RNCustomKeyboardPackage';
+export * from "./src/main/ets/RNCustomKeyboardTurboModule";

package/index.d.ts

@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
 declare namespace RNCustomKeyboard {
     function install: (tag: number, type: string) => void;
     function uninstall: (tag: number) => void;

package/index.js

@@ -1,3 +1,4 @@
+
 'use strict'
 import React, { Component } from 'react';
 import { PropTypes } from 'prop-types';
@@ -47,9 +48,9 @@ export class CustomTextInput extends Component {
         ...TextInput.propTypes,
         customKeyboardType: PropTypes.string,
     };
-    componentDidMount() {
+    handleLayout = () => {
         install(findNodeHandle(this.input), this.props.customKeyboardType);
-    }
+    };
     componentDidUpdate(newProps) {
         if (newProps.customKeyboardType !== this.props.customKeyboardType) {
             install(findNodeHandle(this.input), newProps.customKeyboardType);
@@ -60,6 +61,6 @@ export class CustomTextInput extends Component {
     };
     render() {
         const { customKeyboardType, ...others } = this.props;
-        return <TextInput {...others} ref={this.onRef} />;
+        return <TextInput {...others} ref={this.onRef} onLayout={this.handleLayout}/>;
     }
 }

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@react-native-ohos/react-native-custom-keyboard",
-  "version": "1.0.4-rc.3",
+  "version": "1.1.0-rc.2",
   "description": "",
   "nativePackage": true,
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "codegen-lib": "react-native codegen-lib-harmony --no-safety-check --npm-package-name react-native-custom-keyboard --cpp-output-path ./harmony/custom_keyboard/src/main/cpp/generated --ets-output-path ./harmony/custom_keyboard/src/main/ets/generated --turbo-modules-spec-paths ./src --arkts-components-spec-paths ./src"
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
     "type": "git"
@@ -26,17 +25,20 @@
   "devDependencies": {
     "typescript": "^4.6.2"
   },
+  "files": [
+    "src",
+    "img",
+    "harmony",
+    "harmony/custom_keyboard.har",
+    "index.d.ts",
+    "index.harmony.js",
+    "cpp",
+    "!lib/typescript/example",
+    "!**/__tests__",
+    "!**/__fixtures__",
+    "!**/__mocks__"
+  ],
   "harmony": {
-    "alias": "react-native-custom-keyboard",
-    "autolinking": {
-      "etsPackageClassName":"CustomKeyboardPackage",
-      "cppPackageClassName":"CustomKeyboardPackage",
-      "cmakeLibraryTargetName": "rnoh_custom_keyboard_package", 
-      "ohPackageName": "@react-native-ohos/react-native-custom-keyboard"
-    }
-  },
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "alias": "react-native-custom-keyboard"
   }
 }

package/src/specs/v2/NativeCustomKeyboard.ts

@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
 import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
 import { TurboModuleRegistry } from 'react-native';
 

package/OAT.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <oatconfig>
-	    <licensefile>LICENSE</licensefile>
-        <policylist>
-            <policy name="projectPolicy" desc="">
-                <policyitem type="license" name="MIT" path=".*" desc="license under the MIT"/>
-            </policy>
-            <policy name="projectPolicy" desc="">
-                <policyitem type="compatibility" name="GPL-2.0+" path=".*" desc="Process that runs independently, invoked by the X process."/>
-                <policyitem type="compatibility" name="Apache-2.0" path=".*" desc="不影响兼容性"/>
-                <policyitem type="compatibility" name="BSDStyleLicense" path=".*" desc="不影响兼容性" />
-                <policyitem type="compatibility" name="MIT" path=".*" desc="不影响兼容性" />
-                <policyitem type="compatibility" name="GPLStyleLicense" path=".*" desc="不影响兼容性" />
-            </policy>
-        </policylist>
-        <filefilterlist>
-            <filefilter name="defaultFilter" desc="Files not to check">
-
-            </filefilter>
-			<filefilter name="defaultPolicyFilter" desc="Filters for compatibility，license header policies">
-                <filteritem type="filename" name=".prettierrc.js" desc="工程配置文件，不添加许可证头"/>
-                <filteritem type="filename" name="LICENSE" desc="许可证说明文件，不添加版权头"/>
-                <filteritem type="filename" name="babel.config.js" desc="工程配置文件，不添加许可证头"/>
-                <filteritem type="filename" name="app.plugin.js" desc="工程配置文件，不添加许可证头"/>
-                <filteritem type="filename" name="*.ts" desc="工程配置文件，不添加许可证头"/>
-                <filteritem type="filepath" name="harmony/custom_keyboard/gitignore" desc="工程配置文件，不添加许可证头"/>
-                <filteritem type="filename" name="*.h" desc="工程配置文件，不添加许可证头"/>
-                <filteritem type="filename" name="*.cpp" desc="工程配置文件，不添加许可证头"/>
-                <filteritem type="filename" name="*.ets" desc="工程配置文件，不添加许可证头"/>
-
-            </filefilter>
-            <filefilter name="binaryFileTypePolicyFilter" desc="Filters for copyright header policies">
-                <filteritem type="filepath" name="harmony/custom_keyboard.har" desc="项目打包文件"/>
-            </filefilter>
-
-            <filefilter name="copyrightPolicyFilter" desc="Filters for copyright header policies">
-                <filteritem type="filename" name=".prettierrc.js" desc="示例工程配置文件，不添加版权头"/>
-                <filteritem type="filename" name="LICENSE" desc="许可证说明文件，不添加版权头"/>
-                <filteritem type="filename" name="babel.config.js" desc="示例工程配置文件，不添加版权头"/>
-                <filteritem type="filename" name="app.plugin.js" desc="示例工程配置文件，不添加版权头"/>
-                <filteritem type="filename" name="*.cpp" desc="示例工程配置文件，不添加版权头"/>
-                <filteritem type="filename" name="*.ets" desc="示例工程配置文件，不添加版权头"/>
-                <filteritem type="filename" name="*.ts" desc="示例工程配置文件，不添加版权头"/>
-                <filteritem type="filepath" name="harmony/custom_keyboard/gitignore" desc="示例工程配置文件，不添加版权头"/>
-                <filteritem type="filename" name="*.h" desc="示例工程配置文件，不添加版权头"/>
-
-            </filefilter>
-        </filefilterlist>
-    </oatconfig>
-</configuration>

package/harmony/custom_keyboard/oh-package-lock.json5

@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "stableOrder": true
-  },
-  "lockfileVersion": 3,
-  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
-  "specifiers": {
-    "@rnoh/react-native-openharmony@../libs/react_native_openharmony.har": "@rnoh/react-native-openharmony@../libs/react_native_openharmony.har"
-  },
-  "packages": {
-    "@rnoh/react-native-openharmony@../libs/react_native_openharmony.har": {
-      "name": "@react-native-ohos/react-native-openharmony",
-      "version": "0.72.28",
-      "resolved": "../libs/react_native_openharmony.har",
-      "registryType": "local"
-    }
-  }
-}

package/harmony/custom_keyboard/ts.ets

@@ -1,2 +0,0 @@
-export * from './src/main/ets/RNCustomKeyboardPackage';
-export * from "./src/main/ets/RNCustomKeyboardTurboModule";

package/tsconfig.json

@@ -1,13 +0,0 @@
-{
-    "include": ["src/**/*.ts"],
-    "compilerOptions": {
-      "target": "es5",
-      "module": "commonjs",
-      "strict": true,
-      "moduleResolution": "node",
-      "lib": ["es2015", "es2016", "esnext"],
-      "jsx": "react-native",
-      "resolveJsonModule": true
-    },
-    "exclude": ["node_modules"]
-  }