@react-native-ohos/react-native-keyboard-controller 1.16.8 → 1.17.0

package/harmony/keyboard_controller/src/main/cpp/ClippingScrollViewJSIBinder.h

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
+ */
+/**
+ * MIT License
+ *
+ * Copyright (C) 2026 Huawei Device Co., Ltd.
+ *
+ * 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.
+ */
+
+#ifndef CLIPPINGSCROLLVIEWJSIBINDER_H
+#define CLIPPINGSCROLLVIEWJSIBINDER_H
+
+#pragma once
+
+#include "RNOHCorePackage/ComponentBinders/ViewComponentJSIBinder.h"
+
+namespace rnoh {
+
+class ClippingScrollViewJSIBinder : public ViewComponentJSIBinder {
+protected:
+    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override {
+        auto object = ViewComponentJSIBinder::createNativeProps(rt);
+        object.setProperty(rt, "contentInsetBottom", "number");
+        object.setProperty(rt, "contentInsetTop", "number");
+        object.setProperty(rt, "applyWorkaroundForContentInsetHitTestBug", "bool");
+        return object;
+    }
+
+    facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override {
+        facebook::jsi::Object events(rt);
+        return events;
+    }
+
+    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override {
+        facebook::jsi::Object events(rt);
+        return events;
+    }
+};
+
+} // namespace rnoh
+
+#endif

package/harmony/keyboard_controller/src/main/cpp/KeyboardControllerViewComponentInstance.cpp

@@ -158,6 +158,10 @@ void KeyboardControllerViewComponentInstance::onCommandReceived(std::string cons
     CppComponentInstance::onCommandReceived(commandName, args);
     if (commandName == "synchronizeFocusedInputLayout") {
         syncUpLayout();
+        auto rnInstancePtr = this->m_deps->rnInstance.lock();
+        if (rnInstancePtr != nullptr) {
+            rnInstancePtr->postMessageToArkTS("layoutDidSynchronize", folly::dynamic::object());
+        }
     }
 }
 
@@ -498,7 +502,10 @@ void KeyboardControllerViewComponentInstance::focusDidSet() {
         this->textInputVector.clear();
         return;
     }
-    this->textInputVector = ViewHierarchyNavigator::getAllInputFields(this->shared_from_this());
+    auto groupAncestor = ViewHierarchyNavigator::findGroupAncestor(focused);
+    ComponentInstance::Shared scanRoot =
+        groupAncestor ? groupAncestor : this->shared_from_this();
+    this->textInputVector = ViewHierarchyNavigator::getAllInputFields(scanRoot);
     int count = static_cast<int>(this->textInputVector.size());
     int currentIndex = -1;
     for (size_t i = 0; i < this->textInputVector.size(); ++i) {

package/harmony/keyboard_controller/src/main/cpp/KeyboardGestureAreaComponentInstance.cpp

@@ -86,7 +86,7 @@ void KeyboardGestureAreaComponentInstance::swipeToDismiss() {
     if (rnInstancePtr != nullptr) {
         auto turboModule = rnInstancePtr->getTurboModule("KeyboardController");
         auto arkTsTurboModule = std::dynamic_pointer_cast<rnoh::ArkTSTurboModule>(turboModule);
-        arkTsTurboModule->callSync("dismiss", {false});
+        arkTsTurboModule->callSync("dismiss", {false, true});
     }
 }
 void KeyboardGestureAreaComponentInstance::swipeToUp() {
@@ -105,4 +105,4 @@ void KeyboardGestureAreaComponentInstance::executeInterpolator() {
 }
 
 } // namespace rnoh
-// namespace rnoh
+// namespace rnoh

package/harmony/keyboard_controller/src/main/cpp/KeyboardToolbarGroupViewComponentDescriptor.h

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
+ */
+
+#ifndef KEYBOARDTOOLBARGROUPVIEWCOMPONENTDESCRIPTOR_H
+#define KEYBOARDTOOLBARGROUPVIEWCOMPONENTDESCRIPTOR_H
+
+#pragma once
+
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook {
+namespace react {
+
+inline const char KeyboardToolbarGroupViewComponentName[] =
+    "KeyboardToolbarGroupView";
+
+class KeyboardToolbarGroupViewProps : public ViewProps {
+public:
+    KeyboardToolbarGroupViewProps() = default;
+    KeyboardToolbarGroupViewProps(
+        const PropsParserContext &context,
+        const KeyboardToolbarGroupViewProps &sourceProps,
+        const RawProps &rawProps)
+        : ViewProps(context, sourceProps, rawProps) {}
+};
+
+using KeyboardToolbarGroupViewShadowNode = ConcreteViewShadowNode<
+    KeyboardToolbarGroupViewComponentName,
+    KeyboardToolbarGroupViewProps,
+    ViewEventEmitter>;
+
+class KeyboardToolbarGroupViewComponentDescriptor final
+    : public ConcreteComponentDescriptor<KeyboardToolbarGroupViewShadowNode> {
+public:
+    KeyboardToolbarGroupViewComponentDescriptor(
+        ComponentDescriptorParameters const &parameters)
+        : ConcreteComponentDescriptor(parameters) {}
+};
+
+} // namespace react
+} // namespace facebook
+
+#endif

package/harmony/keyboard_controller/src/main/cpp/KeyboardToolbarGroupViewComponentInstance.cpp

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
+ */
+
+#include "KeyboardToolbarGroupViewComponentInstance.h"
+
+namespace rnoh {
+
+KeyboardToolbarGroupViewComponentInstance::KeyboardToolbarGroupViewComponentInstance(
+    Context context)
+    : CppComponentInstance(std::move(context)) {
+    m_stackNode.setHitTestMode(ARKUI_HIT_TEST_MODE_DEFAULT);
+}
+
+void KeyboardToolbarGroupViewComponentInstance::onChildInserted(
+    ComponentInstance::Shared const &childComponentInstance,
+    std::size_t index) {
+    CppComponentInstance::onChildInserted(childComponentInstance, index);
+    m_stackNode.insertChild(childComponentInstance->getLocalRootArkUINode(), index);
+}
+
+void KeyboardToolbarGroupViewComponentInstance::onChildRemoved(
+    ComponentInstance::Shared const &childComponentInstance) {
+    CppComponentInstance::onChildRemoved(childComponentInstance);
+    m_stackNode.removeChild(childComponentInstance->getLocalRootArkUINode());
+}
+
+void KeyboardToolbarGroupViewComponentInstance::onPropsChanged(
+    SharedConcreteProps const &props) {
+    CppComponentInstance::onPropsChanged(props);
+}
+
+ArkUINode &KeyboardToolbarGroupViewComponentInstance::getLocalRootArkUINode() {
+    return m_stackNode;
+}
+
+} // namespace rnoh

package/harmony/keyboard_controller/src/main/cpp/KeyboardToolbarGroupViewComponentInstance.h

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
+ */
+
+#ifndef KEYBOARDTOOLBARGROUPVIEWCOMPONENTINSTANCE_H
+#define KEYBOARDTOOLBARGROUPVIEWCOMPONENTINSTANCE_H
+
+#pragma once
+
+#include "KeyboardToolbarGroupViewComponentDescriptor.h"
+#include "RNOH/CppComponentInstance.h"
+#include "RNOH/arkui/StackNode.h"
+
+namespace rnoh {
+
+class KeyboardToolbarGroupViewComponentInstance
+    : public CppComponentInstance<facebook::react::KeyboardToolbarGroupViewShadowNode> {
+public:
+    explicit KeyboardToolbarGroupViewComponentInstance(Context context);
+
+    void onChildInserted(ComponentInstance::Shared const &childComponentInstance, std::size_t index) override;
+    void onChildRemoved(ComponentInstance::Shared const &childComponentInstance) override;
+    void onPropsChanged(SharedConcreteProps const &props) override;
+    ArkUINode &getLocalRootArkUINode() override;
+
+private:
+    StackNode m_stackNode;
+};
+
+} // namespace rnoh
+
+#endif

package/harmony/keyboard_controller/src/main/cpp/KeyboardToolbarGroupViewJSIBinder.h

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
+ */
+
+#ifndef KEYBOARDTOOLBARGROUPVIEWJSIBINDER_H
+#define KEYBOARDTOOLBARGROUPVIEWJSIBINDER_H
+
+#pragma once
+
+#include "RNOHCorePackage/ComponentBinders/ViewComponentJSIBinder.h"
+
+namespace rnoh {
+
+class KeyboardToolbarGroupViewJSIBinder : public ViewComponentJSIBinder {
+protected:
+    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override {
+        return ViewComponentJSIBinder::createNativeProps(rt);
+    }
+};
+
+} // namespace rnoh
+
+#endif

package/harmony/keyboard_controller/src/main/cpp/RNKeyboardController.cpp

@@ -28,6 +28,12 @@
 
 #include "RNKeyboardController.h"
 
+#include <ReactCommon/TurboModuleUtils.h>
+#include <react/renderer/dom/DOM.h>
+#include <react/renderer/uimanager/UIManagerBinding.h>
+
+#include <utility>
+
 namespace rnoh {
 using namespace facebook;
 KeyboardController::KeyboardController(const ArkTSTurboModule::Context ctx, const std::string name) : ArkTSTurboModule(ctx, name)
@@ -36,11 +42,62 @@ KeyboardController::KeyboardController(const ArkTSTurboModule::Context ctx, cons
         ARK_METHOD_METADATA(getConstants, 0),
         ARK_METHOD_METADATA(setInputMode, 1),
         ARK_METHOD_METADATA(setDefaultMode, 0),
-        ARK_METHOD_METADATA(dismiss, 1),
+        ARK_METHOD_METADATA(preload, 0),
+        ARK_METHOD_METADATA(dismiss, 2),
         ARK_METHOD_METADATA(setFocusTo, 1),
         ARK_METHOD_METADATA(addListener, 1),
         ARK_METHOD_METADATA(removeListeners, 1),
     };
+
+    methodMap_["viewPositionInWindow"] = MethodMetadata{
+        1,
+        [](jsi::Runtime& runtime,
+           react::TurboModule&,
+           const jsi::Value* args,
+           size_t count) -> jsi::Value {
+            if (count < 1 || !args[0].isNumber()) {
+                return react::createPromiseAsJSIValue(
+                    runtime,
+                    [](jsi::Runtime&, std::shared_ptr<react::Promise> promise) {
+                        promise->reject("viewPositionInWindow requires a numeric view tag");
+                    });
+            }
+
+            const auto tag = static_cast<react::Tag>(args[0].asNumber());
+            return react::createPromiseAsJSIValue(
+                runtime,
+                [tag](jsi::Runtime& promiseRuntime, std::shared_ptr<react::Promise> promise) {
+                    auto binding = react::UIManagerBinding::getBinding(promiseRuntime);
+                    if (!binding) {
+                        promise->reject("UIManagerBinding is unavailable");
+                        return;
+                    }
+
+                    auto& uiManager = binding->getUIManager();
+                    auto shadowNode = uiManager.findShadowNodeByTag_DEPRECATED(tag);
+                    if (!shadowNode) {
+                        promise->reject("Could not find ShadowNode for tag");
+                        return;
+                    }
+
+                    auto revisionProvider = uiManager.getShadowTreeRevisionProvider();
+                    auto currentRevision = revisionProvider == nullptr
+                        ? nullptr
+                        : revisionProvider->getCurrentRevision(shadowNode->getSurfaceId());
+                    if (!currentRevision) {
+                        promise->reject("Could not find current ShadowTree revision");
+                        return;
+                    }
+
+                    const auto rect = react::dom::measureInWindow(currentRevision, *shadowNode);
+                    jsi::Object result(promiseRuntime);
+                    result.setProperty(promiseRuntime, "x", rect.x);
+                    result.setProperty(promiseRuntime, "y", rect.y);
+                    result.setProperty(promiseRuntime, "width", rect.width);
+                    result.setProperty(promiseRuntime, "height", rect.height);
+                    promise->resolve(jsi::Value(std::move(result)));
+                });
+        }};
 }
 
 } // namespace rnoh

package/harmony/keyboard_controller/src/main/cpp/RNKeyboardControllerPackage.h

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include "keyboardControllerPackage.h"
+
+namespace rnoh {
+
+class RNKeyboardControllerPackage : public KeyboardControllerPackage {
+ public:
+  explicit RNKeyboardControllerPackage(Package::Context ctx)
+      : KeyboardControllerPackage(ctx) {}
+};
+
+} // namespace rnoh

package/harmony/keyboard_controller/src/main/cpp/ViewHierarchyNavigator.cpp

@@ -26,25 +26,60 @@
  */
 
 #include "ViewHierarchyNavigator.h"
-#include <glog/logging.h>
-#include <algorithm>
 
 namespace rnoh {
+
+namespace {
+const char *kToolbarGroupName = "KeyboardToolbarGroupView";
+}
+
+bool ViewHierarchyNavigator::isToolbarGroupComponent(
+    ComponentInstance::Shared component) {
+    return component && component->getComponentName() == kToolbarGroupName;
+}
+
+ComponentInstance::Shared ViewHierarchyNavigator::findGroupAncestor(
+    ComponentInstance::Shared component) {
+    if (!component) {
+        return nullptr;
+    }
+    auto parent = component->getParent().lock();
+    while (parent) {
+        if (isToolbarGroupComponent(parent)) {
+            return parent;
+        }
+        parent = parent->getParent().lock();
+    }
+    return nullptr;
+}
+
 TextInputComponentInstance::Shared ViewHierarchyNavigator::setFocusTo(
     const std::string& direction, ComponentInstance::Shared currentFocus) {
     if (!currentFocus) {
-        DLOG(INFO) << "ViewHierarchyNavigator::setFocusTo - currentFocus is null";
         return nullptr;
     }
-    DLOG(INFO) << "ViewHierarchyNavigator::setFocusTo direction=" << direction
-        << " currentFocus->getTag(): " << currentFocus->getTag();
-    auto textInput = findTextInputInDirection(currentFocus, direction);
-    if (textInput) {
-        DLOG(INFO) << "ViewHierarchyNavigator::setFocusTo - found target input";
-    } else {
-        DLOG(INFO) << "ViewHierarchyNavigator::setFocusTo - no target input found";
+    return findTextInputInDirection(
+        currentFocus,
+        direction == "next" ? 1 : -1);
+}
+
+void ViewHierarchyNavigator::collectInputFields(
+    ComponentInstance::Shared component,
+    std::vector<TextInputComponentInstance::Shared>& out,
+    bool skipGroups) {
+    if (!component) {
+        return;
+    }
+    if (auto textInput = isValidTextInput(component)) {
+        out.push_back(textInput);
+        return;
+    }
+    if (skipGroups && isToolbarGroupComponent(component)) {
+        return;
+    }
+    for (const auto& child : component->getChildren()) {
+        collectInputFields(child, out, skipGroups);
     }
-    return textInput;
 }
 
 std::vector<TextInputComponentInstance::Shared> ViewHierarchyNavigator::getAllInputFields(
@@ -53,35 +88,24 @@ std::vector<TextInputComponentInstance::Shared> ViewHierarchyNavigator::getAllIn
     if (!rootComponent) {
         return textInputs;
     }
-    // 递归查找所有输入框
-    std::function<void(ComponentInstance::Shared)> findTextInputs = 
-        [&textInputs, &findTextInputs](ComponentInstance::Shared component) {
-            if (!component) return;
-            auto textInput = isValidTextInput(component);
-            if (textInput) {
-                textInputs.push_back(textInput);
-            } else {
-                // 递归查找子组件
-                const auto& children = component->getChildren();
-                for (const auto& child : children) {
-                    findTextInputs(child);
-                }
-            }
-        };
-    findTextInputs(rootComponent);
+    if (isToolbarGroupComponent(rootComponent)) {
+        for (const auto& child : rootComponent->getChildren()) {
+            collectInputFields(child, textInputs, true);
+        }
+    } else {
+        collectInputFields(rootComponent, textInputs, true);
+    }
     return textInputs;
 }
 
 TextInputComponentInstance::Shared ViewHierarchyNavigator::findTextInputInDirection(
-    ComponentInstance::Shared currentFocus, const std::string& direction) {
+    ComponentInstance::Shared currentFocus, int direction) {
     if (!currentFocus) {
         return nullptr;
     }
-    DLOG(INFO) << "jjtest currentFocus.name" << currentFocus->getComponentName();
     // 获取父组件
     auto parentComponent = currentFocus->getParent().lock();
     if (!parentComponent) {
-        DLOG(INFO) << "jjtest ViewHierarchyNavigator - no parent found";
         return nullptr;
     }
     // 获取父组件的所有子组件
@@ -94,14 +118,11 @@ TextInputComponentInstance::Shared ViewHierarchyNavigator::findTextInputInDirect
             break;
         }
     }
-    if (currentIndex == -1) {
-        DLOG(INFO) << "ViewHierarchyNavigator - current focus not found in parent's children";
+    if (currentIndex < 0) {
         return nullptr;
     }
-    DLOG(INFO) << "ViewHierarchyNavigator - currentIndex=" << currentIndex
-        << " siblings.size()=" << siblings.size();
     // 根据方向确定遍历范围
-    if (direction == "next") {
+    if (direction > 0) {
         // 向后遍历：从 currentIndex+1 到末尾
         for (size_t i = currentIndex + 1; i < siblings.size(); ++i) {
             auto result = findTextInputOrGoDeeper(siblings[i], direction);
@@ -118,18 +139,21 @@ TextInputComponentInstance::Shared ViewHierarchyNavigator::findTextInputInDirect
             }
         }
     }
+    // Group 是导航边界，组内焦点不能跳转到组外输入框
+    if (isToolbarGroupComponent(parentComponent)) {
+        return nullptr;
+    }
     // 如果同级没找到，递归到父级继续查找
-    DLOG(INFO) << "ViewHierarchyNavigator - searching in parent's parent";
     return findTextInputInDirection(parentComponent, direction);
 }
 
 TextInputComponentInstance::Shared ViewHierarchyNavigator::findTextInputInHierarchy(
-    ComponentInstance::Shared component, const std::string& direction) {
-    if (!component) {
+    ComponentInstance::Shared component, int direction) {
+    if (!component || isToolbarGroupComponent(component)) {
         return nullptr;
     }
     const auto& children = component->getChildren();
-    if (direction == "next") {
+    if (direction > 0) {
         // 正序遍历
         for (const auto& child : children) {
             auto result = findTextInputOrGoDeeper(child, direction);
@@ -150,8 +174,8 @@ TextInputComponentInstance::Shared ViewHierarchyNavigator::findTextInputInHierar
 }
 
 TextInputComponentInstance::Shared ViewHierarchyNavigator::findTextInputOrGoDeeper(
-    ComponentInstance::Shared child, const std::string& direction) {
-    if (!child) {
+    ComponentInstance::Shared child, int direction) {
+    if (!child || isToolbarGroupComponent(child)) {
         return nullptr;
     }
     // 首先检查当前组件是否是有效输入框
@@ -175,9 +199,6 @@ TextInputComponentInstance::Shared ViewHierarchyNavigator::isValidTextInput(
         // 尝试转换为 TextInputComponentInstance
         auto textInput = std::dynamic_pointer_cast<TextInputComponentInstance>(component);
         if (textInput) {
-            // TODO: 可以在这里添加 enabled 状态检查
-            // 类似于 iOS 的 textField.isEnabled 或 textView.isEditable
-            DLOG(INFO) << "ViewHierarchyNavigator - found valid TextInput: " << name;
             return textInput;
         }
     }

package/harmony/keyboard_controller/src/main/cpp/ViewHierarchyNavigator.h

@@ -64,7 +64,20 @@ public:
         ComponentInstance::Shared rootComponent
     );
 
+    /**
+     * 查找距离当前组件最近的 KeyboardToolbar.Group 祖先
+     * @param component 当前组件
+     * @return 最近的 Group 祖先，不在 Group 内时返回 nullptr
+     */
+    static ComponentInstance::Shared findGroupAncestor(
+        ComponentInstance::Shared component
+    );
+
 private:
+    static bool isToolbarGroupComponent(
+        ComponentInstance::Shared component
+    );
+
     /**
      * 根据方向查找输入框
      * @param currentFocus 当前焦点组件
@@ -73,7 +86,7 @@ private:
      */
     static TextInputComponentInstance::Shared findTextInputInDirection(
         ComponentInstance::Shared currentFocus,
-        const std::string& direction
+        int direction
     );
 
     /**
@@ -84,7 +97,7 @@ private:
      */
     static TextInputComponentInstance::Shared findTextInputInHierarchy(
         ComponentInstance::Shared component,
-        const std::string& direction
+        int direction
     );
 
     /**
@@ -95,7 +108,7 @@ private:
      */
     static TextInputComponentInstance::Shared findTextInputOrGoDeeper(
         ComponentInstance::Shared child,
-        const std::string& direction
+        int direction
     );
 
     /**
@@ -106,6 +119,12 @@ private:
     static TextInputComponentInstance::Shared isValidTextInput(
         ComponentInstance::Shared component
     );
+
+    static void collectInputFields(
+        ComponentInstance::Shared component,
+        std::vector<TextInputComponentInstance::Shared>& out,
+        bool skipGroups
+    );
 };
 
 } // namespace rnoh

package/harmony/keyboard_controller/src/main/cpp/keyboardControllerPackage.cpp

@@ -28,8 +28,9 @@
 #include "keyboardControllerPackage.h"
 #include "KeyboardControllerViewJSIBinder.h"
 #include "KeyboardGestureAreaJSIBinder.h"
-
-
+#include "KeyboardToolbarGroupViewJSIBinder.h"
+#include "ClippingScrollViewJSIBinder.h"
+#include "glog/logging.h"
 using namespace facebook;
 using namespace rnoh;
 
@@ -38,11 +39,17 @@ KeyboardControllerPackage::createComponentDescriptorProviders() {
     return {facebook::react::concreteComponentDescriptorProvider<
                 facebook::react::KeyboardControllerViewComponentDescriptor>(),
             facebook::react::concreteComponentDescriptorProvider<
-                facebook::react::KeyboardGestureAreaComponentDescriptor>()};
+                facebook::react::KeyboardGestureAreaComponentDescriptor>(),
+            facebook::react::concreteComponentDescriptorProvider<
+                facebook::react::KeyboardToolbarGroupViewComponentDescriptor>(),
+            facebook::react::concreteComponentDescriptorProvider<
+                facebook::react::ClippingScrollViewDecoratorViewComponentDescriptor>()};
 }
 ComponentJSIBinderByString KeyboardControllerPackage::createComponentJSIBinderByName() {
     return {{"RNKeyboardControllerView", std::make_shared<KeyboardControllerViewJSIBinder>()},
-            {"RNKeyboardGestureArea", std::make_shared<KeyboardGestureAreaJSIBinder>()}};
+            {"RNKeyboardGestureArea", std::make_shared<KeyboardGestureAreaJSIBinder>()},
+            {"KeyboardToolbarGroupView", std::make_shared<KeyboardToolbarGroupViewJSIBinder>()},
+            {"ClippingScrollViewDecoratorView", std::make_shared<ClippingScrollViewJSIBinder>()}};
 }
 
 std::unique_ptr<TurboModuleFactoryDelegate> KeyboardControllerPackage::createTurboModuleFactoryDelegate() {
@@ -60,5 +67,11 @@ ComponentInstance::Shared KeyboardControllerPackage::createComponentInstance(con
     if (ctx.componentName == "RNKeyboardGestureArea") {
         return std::make_shared<KeyboardGestureAreaComponentInstance>(ctx);
     }
+    if (ctx.componentName == "KeyboardToolbarGroupView") {
+        return std::make_shared<KeyboardToolbarGroupViewComponentInstance>(ctx);
+    }
+    if (ctx.componentName == "ClippingScrollViewDecoratorView") {
+        return std::make_shared<ClippingScrollViewComponentInstance>(ctx);
+    }
     return nullptr;
 };

package/harmony/keyboard_controller/src/main/cpp/keyboardControllerPackage.h

@@ -32,6 +32,8 @@
 #define KEYBOARDCONTROLLERPACKAGE_H
 
 #include "KeyboardGestureAreaComponentInstance.h"
+#include "KeyboardToolbarGroupViewComponentInstance.h"
+#include "ClippingScrollViewComponentInstance.h"
 #include "RNOH/Package.h"
 #include "RNKeyboardController.h"
 #include "RNStatusBarManagerCompat.h"
@@ -43,9 +45,15 @@ namespace rnoh {
             if (ctx.componentName == "RNKeyboardControllerView") {
                 return std::make_shared<KeyboardControllerViewComponentInstance>(ctx);
             }
-         if (ctx.componentName == "RNKeyboardGestureArea") {
+            if (ctx.componentName == "RNKeyboardGestureArea") {
                 return std::make_shared<KeyboardGestureAreaComponentInstance>(ctx);
             }
+            if (ctx.componentName == "KeyboardToolbarGroupView") {
+                return std::make_shared<KeyboardToolbarGroupViewComponentInstance>(ctx);
+            }
+            if (ctx.componentName == "ClippingScrollViewDecoratorView") {
+                return std::make_shared<ClippingScrollViewComponentInstance>(ctx);
+            }
             return nullptr;
         }
     };